[maven] 01/04: Removed the patch changing the default version of the core plugins
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 7 07:53:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit 821e2de38788dc4688d54a88e48abf9dc6b58c77
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 7 01:13:35 2017 +0200
Removed the patch changing the default version of the core plugins
---
debian/changelog | 4 +
debian/patches/plugins_version.diff | 193 ------------------------------------
debian/patches/series | 1 -
3 files changed, 4 insertions(+), 194 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 168fd00..11978a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
maven (3.5.0-6) UNRELEASED; urgency=medium
* Team upload.
+ * Removed the patch changing the default version of the core plugins.
+ This ensures that the maven package is on par with the upstream
+ distribution. Plugin packages are now responsible for redirecting
+ the default version used by Maven to the current one.
* Depend on maven-parent 27 and removed modello-configuration.patch
* Removed the unused dependency on libeclipse-aether-java
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
deleted file mode 100644
index 12dc7df..0000000
--- a/debian/patches/plugins_version.diff
+++ /dev/null
@@ -1,193 +0,0 @@
-Description: Set default plugins versions to match packages in Debian.
- We should find a way to conform to actual upstream standards (maybe
- multiple maven plugins versions)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-21
-Forwarded: not-needed
---- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
-+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
-@@ -41,7 +41,7 @@
- <!-- START SNIPPET: pom-lifecycle -->
- <phases>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -70,22 +70,22 @@
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
- </process-resources>
- <compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
- </compile>
- <process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
- </process-test-resources>
- <test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
- </test-compile>
- <test>
-- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
-+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test
- </test>
- <package>
- org.apache.maven.plugins:maven-jar-plugin:2.4:jar
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -114,22 +114,22 @@
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
- </process-resources>
- <compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
- </compile>
- <process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
- </process-test-resources>
- <test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
- </test-compile>
- <test>
-- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
-+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test
- </test>
- <package>
- org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -158,26 +158,26 @@
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
- </process-resources>
- <compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
- </compile>
- <process-classes>
-- org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
-+ org.apache.maven.plugins:maven-plugin-plugin:3.5:descriptor
- </process-classes>
- <process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
- </process-test-resources>
- <test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
- </test-compile>
- <test>
-- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
-+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test
- </test>
- <package>
- org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
-- org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata
-+ org.apache.maven.plugins:maven-plugin-plugin:3.5:addPluginArtifactMetadata
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -206,22 +206,22 @@
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
- </process-resources>
- <compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
- </compile>
- <process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
- </process-test-resources>
- <test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
- </test-compile>
- <test>
-- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
-+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test
- </test>
- <package>
- org.apache.maven.plugins:maven-war-plugin:2.2:war
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -256,7 +256,7 @@
- org.apache.maven.plugins:maven-ear-plugin:2.8:ear
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -285,22 +285,22 @@
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
- </process-resources>
- <compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile
- </compile>
- <process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
- </process-test-resources>
- <test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile
- </test-compile>
- <test>
-- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
-+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test
- </test>
- <package>
- org.apache.maven.plugins:maven-rar-plugin:2.2:rar
- </package>
- <install>
-- org.apache.maven.plugins:maven-install-plugin:2.4:install
-+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
- </install>
- <deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
---- a/pom.xml
-+++ b/pom.xml
-@@ -691,6 +691,7 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-+ <version>2.17</version>
- <configuration>
- <systemProperties combine.children="append">
- <property>
---- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
-+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
-@@ -74,11 +74,11 @@
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
-- <version>1.3</version>
-+ <version>1.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
-- <version>2.2-beta-5</version>
-+ <version>2.4.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index da48e0f..f3a0635 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-plugins_version.diff
reproducible-build-timestamp.patch
slf4j-compatibility.patch
qdox-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list