[maven] 02/07: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven.

commit e8d185fa10dadf01b84aba0d57e8a32945cbc84c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 9 09:14:33 2015 +0200

    Refreshed the patches
---
 debian/changelog                           |  2 +-
 debian/patches/add_dependencies.diff       |  2 +-
 debian/patches/dep_versions.diff           | 14 +++++++-------
 debian/patches/modello-configuration.patch |  2 +-
 debian/patches/plugins_version.diff        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dd519b..7e30a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven (3.2.5-1) UNRELEASED; urgency=medium
+maven (3.3.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index ad8b749..802596f 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
-@@ -238,6 +238,11 @@
+@@ -244,6 +244,11 @@
        </dependency>
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index bac304c..e3d5c60 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -7,8 +7,8 @@ Forwarded: not-needed
 +++ b/pom.xml
 @@ -44,23 +44,23 @@
    <properties>
-     <maven.compiler.source>1.6</maven.compiler.source>
-     <maven.compiler.target>1.6</maven.compiler.target>
+     <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>
 -    <junitVersion>4.11</junitVersion>
@@ -23,17 +23,17 @@ Forwarded: not-needed
      <!-- Latest version of Guava that works with Sisu -->
 -    <guavaVersion>18.0</guavaVersion>
 +    <guavaVersion>debian</guavaVersion>
-     <guiceVersion>3.2.3</guiceVersion>
--    <sisuInjectVersion>0.3.0.M1</sisuInjectVersion>
--    <wagonVersion>2.8</wagonVersion>
+     <guiceVersion>3.2.5</guiceVersion>
+-    <sisuInjectVersion>0.3.0</sisuInjectVersion>
+-    <wagonVersion>2.9</wagonVersion> <!-- Verify SNAPSHOT for MNG-5605 -->
 -    <securityDispatcherVersion>1.3</securityDispatcherVersion>
 -    <cipherVersion>1.7</cipherVersion>
 -    <modelloVersion>1.8.1</modelloVersion>
 -    <jxpathVersion>1.3</jxpathVersion>
--    <aetherVersion>1.0.0.v20140518</aetherVersion>
+-    <aetherVersion>1.0.2.v20150114</aetherVersion>
 -    <slf4jVersion>1.7.5</slf4jVersion>
 +    <sisuInjectVersion>debian</sisuInjectVersion>
-+    <wagonVersion>2.x</wagonVersion>
++    <wagonVersion>2.x</wagonVersion> <!-- Verify SNAPSHOT for MNG-5605 -->
 +    <securityDispatcherVersion>debian</securityDispatcherVersion>
 +    <cipherVersion>debian</cipherVersion>
 +    <modelloVersion>1.8.3</modelloVersion>
diff --git a/debian/patches/modello-configuration.patch b/debian/patches/modello-configuration.patch
index 5365318..0325116 100644
--- a/debian/patches/modello-configuration.patch
+++ b/debian/patches/modello-configuration.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -402,6 +402,9 @@
+@@ -421,6 +421,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 5101eed..e0be172 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -268,7 +268,7 @@ Forwarded: not-needed
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
 --- a/pom.xml
 +++ b/pom.xml
-@@ -611,6 +611,7 @@
+@@ -637,6 +637,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