[maven] 07/08: Updated the version of the maven-resources-plugin to 2.6 in the super pom
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 9 17:16:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit dac6916ee5b246060f37457512da6f711120d526
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 9 15:53:27 2015 +0100
Updated the version of the maven-resources-plugin to 2.6 in the super pom
---
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/plugins_version.diff | 64 ++++++++++---------------------------
3 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 340984e..7c75ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ maven (3.3.9-3) UNRELEASED; urgency=medium
- maven-dependency-plugin: 2.7 -> 2.8 (Closes: #807437)
- maven-ear-plugin: 2.3.2 -> 2.8
- maven-ejb-plugin: 2.2 -> 2.3
+ - maven-resources-plugin: 2.3 -> 2.6
- maven-war-plugin: 2.1.1 -> 2.2
-- Emmanuel Bourg <ebourg at apache.org> Wed, 09 Dec 2015 13:05:07 +0100
diff --git a/debian/control b/debian/control
index e2b7501..69fde3b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends-Indep: ant-optional,
libmaven-install-plugin-java,
libmaven-jar-plugin-java,
libmaven-parent-java,
- libmaven-resources-plugin-java,
+ libmaven-resources-plugin-java (>= 2.6),
libmockito-java,
libmodello-maven-plugin-java (>= 1.8),
libplexus-classworlds2-java (>= 2.4),
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index e136e4d..7161fc2 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -15,20 +15,15 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -67,25 +67,25 @@
- <!-- START SNIPPET: jar-lifecycle -->
- <phases>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
+@@ -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.2:compile
</compile>
<process-test-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
+ 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
@@ -47,20 +42,15 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -111,25 +111,25 @@
- <!-- START SNIPPET: ejb-lifecycle -->
- <phases>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
+@@ -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.2:compile
</compile>
<process-test-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
+ 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
@@ -79,12 +69,8 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -155,29 +155,29 @@
- <!-- START SNIPPET: maven-plugin-lifecycle -->
- <phases>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
+@@ -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
@@ -95,8 +81,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor
</process-classes>
<process-test-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
+ 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
@@ -117,20 +102,15 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -203,25 +203,25 @@
- <!-- START SNIPPET: war-lifecycle -->
- <phases>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
+@@ -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.2:compile
</compile>
<process-test-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
+ 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
@@ -149,14 +129,7 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -250,13 +250,13 @@
- org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
- </generate-resources>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
- </process-resources>
- <package>
+@@ -256,7 +256,7 @@
org.apache.maven.plugins:maven-ear-plugin:2.8:ear
</package>
<install>
@@ -165,20 +138,15 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -282,25 +282,25 @@
- <!-- START SNIPPET: rar-lifecycle -->
- <phases>
- <process-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
+@@ -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.2:compile
</compile>
<process-test-resources>
-- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
-+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
+ 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
--
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