diff -Nru maven-3.3.9/debian/changelog maven-3.3.9/debian/changelog --- maven-3.3.9/debian/changelog 2015-11-27 10:58:38.000000000 +0000 +++ maven-3.3.9/debian/changelog 2015-12-09 17:12:21.000000000 +0000 @@ -1,3 +1,18 @@ +maven (3.3.9-3) unstable; urgency=medium + + * Team upload. + * Raised the priority for the /usr/bin/mvn alternative over Maven 2 + (Closes: #740955) + * Declare that Maven 3.3.9 breaks gradle (<< 2.7-4) (Closes: #805985) + * Updated the versions of the plugins in the super pom: + - 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 Wed, 09 Dec 2015 18:12:19 +0100 + maven (3.3.9-2) unstable; urgency=medium * Team upload. @@ -122,7 +137,7 @@ [ tony mancill ] * Apply patch from Bas Couwenberg to bump plugin versions to - match version in Debian. (Closes: #770608) + match version in Debian. (Closes: #770608, #712100) -- tony mancill Sat, 20 Dec 2014 08:52:09 -0800 diff -Nru maven-3.3.9/debian/control maven-3.3.9/debian/control --- maven-3.3.9/debian/control 2015-11-27 10:10:24.000000000 +0000 +++ maven-3.3.9/debian/control 2015-12-09 15:07:00.000000000 +0000 @@ -18,7 +18,7 @@ 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), @@ -79,7 +79,7 @@ libwagon2-java (>= 2.2-2), ${misc:Depends} Replaces: maven (<< 3.0.5-7) -Breaks: maven (<< 3.0.5-7) +Breaks: maven (<< 3.0.5-7), gradle (<< 2.7-4) Description: Core libraries for Maven 3 Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, diff -Nru maven-3.3.9/debian/maven.postinst maven-3.3.9/debian/maven.postinst --- maven-3.3.9/debian/maven.postinst 2015-11-19 09:07:22.000000000 +0000 +++ maven-3.3.9/debian/maven.postinst 2015-12-09 12:13:57.000000000 +0000 @@ -3,7 +3,7 @@ set -e basedir=/usr/share/maven -priority=150 +priority=300 case "$1" in configure) diff -Nru maven-3.3.9/debian/patches/plugins_version.diff maven-3.3.9/debian/patches/plugins_version.diff --- maven-3.3.9/debian/patches/plugins_version.diff 2015-11-27 09:59:40.000000000 +0000 +++ maven-3.3.9/debian/patches/plugins_version.diff 2015-12-09 14:51:36.000000000 +0000 @@ -15,20 +15,15 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -67,25 +67,25 @@ - - - -- 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 - 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-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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile @@ -47,20 +42,15 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -111,25 +111,25 @@ - - - -- 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 - 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-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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile @@ -71,8 +61,7 @@ + org.apache.maven.plugins:maven-surefire-plugin:2.17:test -- org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb -+ org.apache.maven.plugins:maven-ejb-plugin:2.2:ejb + org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb - org.apache.maven.plugins:maven-install-plugin:2.4:install @@ -80,12 +69,8 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -155,29 +155,29 @@ - - - -- 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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:compile @@ -96,8 +81,7 @@ + org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor -- 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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile @@ -118,20 +102,15 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -203,25 +203,25 @@ - - - -- 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 - 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-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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile @@ -142,8 +121,7 @@ + org.apache.maven.plugins:maven-surefire-plugin:2.17:test -- org.apache.maven.plugins:maven-war-plugin:2.2:war -+ org.apache.maven.plugins:maven-war-plugin:2.1.1:war + org.apache.maven.plugins:maven-war-plugin:2.2:war - org.apache.maven.plugins:maven-install-plugin:2.4:install @@ -151,20 +129,8 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -247,16 +247,16 @@ - - - -- org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml -+ org.apache.maven.plugins:maven-ear-plugin:2.3.2:generate-application-xml - - -- org.apache.maven.plugins:maven-resources-plugin:2.6:resources -+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources - - -- org.apache.maven.plugins:maven-ear-plugin:2.8:ear -+ org.apache.maven.plugins:maven-ear-plugin:2.3.2:ear +@@ -256,7 +256,7 @@ + org.apache.maven.plugins:maven-ear-plugin:2.8:ear - org.apache.maven.plugins:maven-install-plugin:2.4:install @@ -172,20 +138,15 @@ org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -282,25 +282,25 @@ - - - -- 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 - 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-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 - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile @@ -216,7 +177,7 @@ --- 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,15 +74,15 @@ +@@ -74,11 +74,11 @@ maven-antrun-plugin @@ -230,8 +191,3 @@ maven-dependency-plugin -- 2.8 -+ 2.7 - - - maven-release-plugin