[maven] 01/01: Rebuild for jessie-backports
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Apr 17 23:53:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/3.3.9-3_bpo8+1
in repository maven.
commit 2947f2f67b0ad5c49bd20d61be73932380e390ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Apr 14 23:53:54 2016 +0200
Rebuild for jessie-backports
---
debian/changelog | 6 ++
debian/control | 13 ++--
debian/maven.buildRules | 2 +-
debian/maven.rules | 2 +-
debian/patches/plugins_version.diff | 144 ++++++++++++++++--------------------
5 files changed, 80 insertions(+), 87 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 533d249..1602888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maven (3.3.9-3~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 14 Apr 2016 23:25:00 +0200
+
maven (3.3.9-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 69fde3b..9deb11d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,20 +14,22 @@ Build-Depends-Indep: ant-optional,
liblogback-java,
libmaven-ant-tasks-java (>= 2.1.3-2),
libmaven-clean-plugin-java (>= 2.5),
- libmaven-compiler-plugin-java (>= 3.2),
+ libmaven-compiler-plugin-java,
libmaven-install-plugin-java,
libmaven-jar-plugin-java,
libmaven-parent-java,
- libmaven-resources-plugin-java (>= 2.6),
+ libmaven-resources-plugin-java,
libmockito-java,
+ libmodello-java (>= 1.8),
libmodello-maven-plugin-java (>= 1.8),
libplexus-classworlds2-java (>= 2.4),
- libplexus-containers1.5-java (>= 1.6),
+ libplexus-containers1.5-java,
libplexus-utils2-java (>= 3.0.15),
libsisu-maven-plugin-java,
+ libsisu-inject-java (>= 0.3.0),
libsisu-plexus-java (>= 0.3.0),
libslf4j-java,
- libsurefire-java (>= 2.17),
+ libsurefire-java,
libwagon2-java (>= 2.2-2),
libxmlunit-java,
maven-ant-helper,
@@ -70,10 +72,11 @@ Depends: libeclipse-aether-java (>= 1.0),
libguice-java (>= 4.0),
libplexus-cipher-java,
libplexus-classworlds2-java (>= 2.4),
- libplexus-containers1.5-java (>= 1.6),
+ libplexus-containers1.5-java,
libplexus-interpolation-java,
libplexus-sec-dispatcher-java,
libplexus-utils2-java,
+ libsisu-inject-java (>= 0.3.0),
libsisu-plexus-java (>= 0.3.0),
libslf4j-java,
libwagon2-java (>= 2.2-2),
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index d85c360..7d68030 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -18,7 +18,7 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
org.apache.maven.plugins maven-clean-plugin * s/.*/2.5/ * *
org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
-org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ * *
+org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 750633a..6de263e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,7 +16,7 @@ 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.17/ * *
+org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 7161fc2..5565d78 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -6,90 +6,82 @@ 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 -->
+@@ -67,19 +67,19 @@
+ <!-- START SNIPPET: jar-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>
+- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.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.6:testResources
+- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.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
++ org.apache.maven.plugins:maven-surefire-plugin:2.10: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
+@@ -111,19 +111,19 @@
+ <!-- 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
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.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.6:testResources
+- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.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
++ org.apache.maven.plugins:maven-surefire-plugin:2.10: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
+@@ -155,26 +155,26 @@
+ <!-- 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
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
</compile>
<process-classes>
- org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
+ 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.6:testResources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.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
++ org.apache.maven.plugins:maven-surefire-plugin:2.10:test
</test>
<package>
org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
@@ -97,81 +89,73 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-plugin-plugin:3.3: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
+ org.apache.maven.plugins:maven-install-plugin:2.4:install
+@@ -203,19 +203,19 @@
+ <!-- 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
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.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.6:testResources
+- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.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
++ org.apache.maven.plugins:maven-surefire-plugin:2.10: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 @@
+@@ -250,7 +250,7 @@
+ 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>
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
+@@ -282,19 +282,19 @@
+ <!-- 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
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.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.6:testResources
+- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
++ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:2.5.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
++ org.apache.maven.plugins:maven-surefire-plugin:2.10: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
@@ -660,6 +660,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
-+ <version>2.17</version>
++ <version>2.10</version>
<configuration>
<systemProperties combine.children="append">
<property>
--
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