[maven] 01/02: apply patch for #770608
Tony Mancill
tmancill at moszumanska.debian.org
Sat Dec 20 17:46:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository maven.
commit 2c399a2290036e9f6b59219866155e334e7f0d8b
Author: tony mancill <tmancill at debian.org>
Date: Sat Dec 20 08:31:52 2014 -0800
apply patch for #770608
---
debian/changelog | 5 +++
debian/maven.buildRules | 4 +-
debian/maven.rules | 4 +-
debian/patches/plugins_version.diff | 80 ++++++++++++++++++-------------------
4 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e110115..7138e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
maven (3.0.5-2) UNRELEASED; urgency=medium
+ [ Emmanuel Bourg ]
* Team upload.
* Standards-Version updated to 3.9.6 (no changes)
+ [ tony mancill ]
+ * Apply patch from Bas Couwenberg to bump plugin versions to
+ match version in Debian. (Closes: #770608)
+
-- Emmanuel Bourg <ebourg at apache.org> Fri, 14 Feb 2014 09:43:05 +0100
maven (3.0.5-1) unstable; urgency=low
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index 0f42dae..c57477f 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -17,8 +17,8 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
org.apache.maven.plugins maven-clean-plugin * s/.*/2.3/ * *
org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
-org.apache.maven.plugins maven-jar-plugin * s/.*/2.2/ * *
-org.apache.maven.plugins maven-compiler-plugin * s/.*/2.0.2/ * *
+org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
+org.apache.maven.plugins maven-compiler-plugin * s/.*/2.5.1/ * *
org.apache.maven apache-maven pom s/.*/3.0.5/ * *
org.apache.maven maven-aether-provider jar s/.*/3.0.5/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index c4b1e67..24eac4c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,8 +17,8 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
org.apache.maven.plugins maven-clean-plugin * s/.*/2.3/ * *
org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
-org.apache.maven.plugins maven-jar-plugin * s/.*/2.2/ * *
-org.apache.maven.plugins maven-compiler-plugin * s/.*/2.0.2/ * *
+org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
+org.apache.maven.plugins maven-compiler-plugin * s/.*/2.5.1/ * *
org.apache.maven apache-maven pom s/.*/3.x/ * *
org.apache.maven maven-aether-provider jar s/.*/3.x/ * *
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index e7cf9e0..2a356f1 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -6,16 +6,16 @@ Last-Update: 2012-01-21
Forwarded: not-needed
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ problem.
<!-- START SNIPPET: pom-lifecycle -->
<phases>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -91,25 +91,25 @@
+@@ -91,25 +91,25 @@ problem.
<!-- START SNIPPET: jar-lifecycle -->
<phases>
<process-resources>
@@ -24,7 +24,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -32,22 +32,22 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.3.2:jar
-+ org.apache.maven.plugins:maven-jar-plugin:2.2:jar
++ org.apache.maven.plugins:maven-jar-plugin:2.4:jar
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -146,16 +146,16 @@
+@@ -146,16 +146,16 @@ problem.
<!-- START SNIPPET: ejb-lifecycle -->
<phases>
<process-resources>
@@ -56,7 +56,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -64,20 +64,20 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ problem.
org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -210,16 +210,16 @@
+@@ -210,16 +210,16 @@ problem.
<!-- START SNIPPET: ejb3-lifecycle -->
<phases>
<process-resources>
@@ -86,7 +86,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -94,20 +94,20 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ problem.
org.apache.maven.plugins:maven-ejb3-plugin:ejb3
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -285,26 +285,26 @@
+@@ -285,26 +285,26 @@ problem.
org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor
</generate-resources>
<process-resources>
@@ -116,7 +116,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -124,23 +124,23 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar,
-+ org.apache.maven.plugins:maven-jar-plugin:2.2:jar,
++ org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
org.apache.maven.plugins:maven-plugin-plugin:2.9:addPluginArtifactMetadata
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -373,16 +373,16 @@
+@@ -373,16 +373,16 @@ problem.
<!-- START SNIPPET: war-lifecycle -->
<phases>
<process-resources>
@@ -149,7 +149,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -157,20 +157,20 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -391,7 +391,7 @@
+@@ -391,7 +391,7 @@ problem.
org.apache.maven.plugins:maven-war-plugin:2.1.1:war
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -431,13 +431,13 @@
+@@ -431,13 +431,13 @@ problem.
org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml
</generate-resources>
<process-resources>
@@ -182,11 +182,11 @@ Forwarded: not-needed
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -474,16 +474,16 @@
+@@ -474,16 +474,16 @@ problem.
<!-- START SNIPPET: rar-lifecycle -->
<phases>
<process-resources>
@@ -195,7 +195,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -203,20 +203,20 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -492,7 +492,7 @@
+@@ -492,7 +492,7 @@ problem.
org.apache.maven.plugins:maven-rar-plugin:2.2:rar
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -529,16 +529,16 @@
+@@ -529,16 +529,16 @@ problem.
<!-- START SNIPPET: par-lifecycle -->
<phases>
<process-resources>
@@ -225,7 +225,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -233,22 +233,22 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.0.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -547,7 +547,7 @@
+@@ -547,7 +547,7 @@ problem.
org.apache.maven.plugins:maven-par-plugin:par
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.3.1:install
-+ org.apache.maven.plugins:maven-install-plugin:2.3:install
++ org.apache.maven.plugins:maven-install-plugin:2.4:install
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ under the License.
</phases>
<default-phases>
<clean>
--
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