Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Dear Release Team: Please consider unblocking package maven. This upload addreses #770608, an RC FTBFS bug caused by dependent library updates since the previous upload of maven. In addition to maven itself, this upload addresses other pending auto-removals from jessie: saxonhe java-comment-preprocessor jaxb polyglot-maven sisu-maven-plugin gradle resteasy lucene4 elasticsearch eclipse-aether multiverse-core The debdiff against the current version of the package in testing is attached. Thank you, tony (on behalf of the Debian Java team) unblock maven/3.0.5-2 -- System Information: Debian Release: 8.0 APT prefers testing APT policy: (900, 'testing'), (300, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru maven-3.0.5/debian/changelog maven-3.0.5/debian/changelog
--- maven-3.0.5/debian/changelog 2013-10-21 13:50:14.000000000 -0700
+++ maven-3.0.5/debian/changelog 2014-12-20 08:52:22.000000000 -0800
@@ -1,3 +1,16 @@
+maven (3.0.5-2) unstable; urgency=medium
+
+ [ Emmanuel Bourg ]
+ * Team upload.
+ * Standards-Version updated to 3.9.6 (no changes)
+ * Update Vcs-Browser and Homepage fields.
+
+ [ tony mancill ]
+ * Apply patch from Bas Couwenberg to bump plugin versions to
+ match version in Debian. (Closes: #770608)
+
+ -- tony mancill <tmancill@debian.org> Sat, 20 Dec 2014 08:52:09 -0800
+
maven (3.0.5-1) unstable; urgency=low
* Team upload.
diff -Nru maven-3.0.5/debian/control maven-3.0.5/debian/control
--- maven-3.0.5/debian/control 2013-10-21 13:50:14.000000000 -0700
+++ maven-3.0.5/debian/control 2014-12-20 08:52:22.000000000 -0800
@@ -27,10 +27,10 @@
maven-ant-helper,
maven-repo-helper
Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
-Standards-Version: 3.9.4
-Homepage: http://maven.apache.org/
+Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/maven.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/maven.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven.git
+Homepage: http://maven.apache.org
Package: maven
Architecture: all
diff -Nru maven-3.0.5/debian/maven.buildRules maven-3.0.5/debian/maven.buildRules
--- maven-3.0.5/debian/maven.buildRules 2013-10-21 13:50:14.000000000 -0700
+++ maven-3.0.5/debian/maven.buildRules 2014-12-20 08:52:22.000000000 -0800
@@ -17,8 +17,8 @@
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 -Nru maven-3.0.5/debian/maven.rules maven-3.0.5/debian/maven.rules
--- maven-3.0.5/debian/maven.rules 2013-10-21 13:50:14.000000000 -0700
+++ maven-3.0.5/debian/maven.rules 2014-12-20 08:52:22.000000000 -0800
@@ -17,8 +17,8 @@
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 -Nru maven-3.0.5/debian/patches/plugins_version.diff maven-3.0.5/debian/patches/plugins_version.diff
--- maven-3.0.5/debian/patches/plugins_version.diff 2013-10-21 13:50:14.000000000 -0700
+++ maven-3.0.5/debian/patches/plugins_version.diff 2014-12-20 08:52:22.000000000 -0800
@@ -6,16 +6,16 @@
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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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 @@
</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>
Attachment:
signature.asc
Description: Digital signature