This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven.
commit 7d87f3cdfa1613520501ca0a4e4eb4a7af6c2cdd Author: Emmanuel Bourg <[email protected]> Date: Thu Nov 19 10:28:46 2015 +0100 Refreshed the patches --- debian/changelog | 8 ++++ debian/patches/add_dependencies.diff | 2 +- debian/patches/dep_versions.diff | 27 ++++++----- debian/patches/modello-configuration.patch | 2 +- debian/patches/plugins_version.diff | 76 +++--------------------------- 5 files changed, 30 insertions(+), 85 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1220c6f..1604c96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +maven (3.3.9-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Thu, 19 Nov 2015 10:28:12 +0100 + maven (3.3.3-4) unstable; urgency=medium * Team upload. diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff index 802596f..d424dab 100644 --- a/debian/patches/add_dependencies.diff +++ b/debian/patches/add_dependencies.diff @@ -5,7 +5,7 @@ Last-Update: 2012-01-21 Forwarded: no --- a/pom.xml +++ b/pom.xml -@@ -244,6 +244,11 @@ +@@ -258,6 +258,11 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff index e3d5c60..dfabd75 100644 --- a/debian/patches/dep_versions.diff +++ b/debian/patches/dep_versions.diff @@ -5,38 +5,39 @@ Last-Update: 2012-01-21 Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -44,23 +44,23 @@ - <properties> +@@ -45,24 +45,24 @@ + <maven.version>3.0.5</maven.version> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> - <classWorldsVersion>2.5.2</classWorldsVersion> - <commonsCliVersion>1.2</commonsCliVersion> +- <commonsLangVersion>3.4</commonsLangVersion> - <junitVersion>4.11</junitVersion> + <classWorldsVersion>2.x</classWorldsVersion> + <commonsCliVersion>debian</commonsCliVersion> ++ <commonsLangVersion>debian</commonsLangVersion> + <junitVersion>4.x</junitVersion> - <plexusVersion>1.5.5</plexusVersion> + <plexusVersion>1.6</plexusVersion> - <plexusInterpolationVersion>1.21</plexusInterpolationVersion> -- <plexusUtilsVersion>3.0.20</plexusUtilsVersion> +- <plexusUtilsVersion>3.0.22</plexusUtilsVersion> + <plexusInterpolationVersion>debian</plexusInterpolationVersion> + <plexusUtilsVersion>2.x</plexusUtilsVersion> <!-- Latest version of Guava that works with Sisu --> - <guavaVersion>18.0</guavaVersion> + <guavaVersion>debian</guavaVersion> - <guiceVersion>3.2.5</guiceVersion> -- <sisuInjectVersion>0.3.0</sisuInjectVersion> -- <wagonVersion>2.9</wagonVersion> <!-- Verify SNAPSHOT for MNG-5605 --> + <guiceVersion>4.0</guiceVersion> +- <sisuInjectVersion>0.3.2</sisuInjectVersion> +- <wagonVersion>2.10</wagonVersion> - <securityDispatcherVersion>1.3</securityDispatcherVersion> - <cipherVersion>1.7</cipherVersion> -- <modelloVersion>1.8.1</modelloVersion> -- <jxpathVersion>1.3</jxpathVersion> -- <aetherVersion>1.0.2.v20150114</aetherVersion> -- <slf4jVersion>1.7.5</slf4jVersion> + <sisuInjectVersion>debian</sisuInjectVersion> -+ <wagonVersion>2.x</wagonVersion> <!-- Verify SNAPSHOT for MNG-5605 --> ++ <wagonVersion>2.x</wagonVersion> + <securityDispatcherVersion>debian</securityDispatcherVersion> + <cipherVersion>debian</cipherVersion> -+ <modelloVersion>1.8.3</modelloVersion> + <modelloVersion>1.8.3</modelloVersion> +- <jxpathVersion>1.3</jxpathVersion> +- <aetherVersion>1.0.2.v20150114</aetherVersion> +- <slf4jVersion>1.7.5</slf4jVersion> + <jxpathVersion>debian</jxpathVersion> + <aetherVersion>debian</aetherVersion> + <slf4jVersion>debian</slf4jVersion> diff --git a/debian/patches/modello-configuration.patch b/debian/patches/modello-configuration.patch index 0325116..ab44d08 100644 --- a/debian/patches/modello-configuration.patch +++ b/debian/patches/modello-configuration.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -421,6 +421,9 @@ +@@ -440,6 +440,9 @@ <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> <version>${modelloVersion}</version> diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff index ef42e33..4cf8126 100644 --- a/debian/patches/plugins_version.diff +++ b/debian/patches/plugins_version.diff @@ -80,39 +80,7 @@ Forwarded: not-needed </install> <deploy> org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -151,25 +151,25 @@ - <!-- START SNIPPET: ejb3-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 - </compile> - <process-test-resources> -- 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 - </test-compile> - <test> -- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test -+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test - </test> - <package> - org.apache.maven.plugins:maven-ejb3-plugin:ejb3 - </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 -@@ -195,29 +195,29 @@ +@@ -155,29 +155,29 @@ <!-- START SNIPPET: maven-plugin-lifecycle --> <phases> <process-resources> @@ -150,7 +118,7 @@ Forwarded: not-needed </install> <deploy> org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -243,25 +243,25 @@ +@@ -203,25 +203,25 @@ <!-- START SNIPPET: war-lifecycle --> <phases> <process-resources> @@ -183,7 +151,7 @@ Forwarded: not-needed </install> <deploy> org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -287,16 +287,16 @@ +@@ -247,16 +247,16 @@ <!-- START SNIPPET: ear-lifecycle --> <phases> <generate-resources> @@ -191,7 +159,7 @@ Forwarded: not-needed + org.apache.maven.plugins:maven-ear-plugin:2.3.2:generate-application-xml </generate-resources> <process-resources> -- org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources +- org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:2.3:resources </process-resources> <package> @@ -204,7 +172,7 @@ Forwarded: not-needed </install> <deploy> org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -322,25 +322,25 @@ +@@ -282,25 +282,25 @@ <!-- START SNIPPET: rar-lifecycle --> <phases> <process-resources> @@ -236,41 +204,9 @@ Forwarded: not-needed </install> <deploy> org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy -@@ -366,25 +366,25 @@ - <!-- START SNIPPET: par-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 - </compile> - <process-test-resources> -- 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 - </test-compile> - <test> -- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test -+ org.apache.maven.plugins:maven-surefire-plugin:2.17:test - </test> - <package> - org.apache.maven.plugins:maven-par-plugin:par - </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 -@@ -637,6 +637,7 @@ +@@ -660,6 +660,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
