[maven] 02/16: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 8 06:47:38 UTC 2015


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

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

commit 398d7a7768c69be2e586ca170751e266779d49eb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 30 13:15:29 2014 +0200

    Refreshed the patches
---
 debian/changelog                                |   4 +-
 debian/patches/add_dependencies.diff            |  18 +--
 debian/patches/dep_versions.diff                |  27 ++--
 debian/patches/force_java15_compiler.diff       |   6 +-
 debian/patches/modello.diff                     |   6 +-
 debian/patches/no_maven_assembly.diff           |   6 +-
 debian/patches/plugins_version.diff             | 186 ++++++++++++------------
 debian/patches/secure-maven-central-access.diff |   8 +-
 8 files changed, 124 insertions(+), 137 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20bf6d4..9fc3dc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven (3.0.5-7) UNRELEASED; urgency=medium
+maven (3.1.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index 1522bd0..6204572 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/maven-model-builder/pom.xml
 +++ b/maven-model-builder/pom.xml
-@@ -38,6 +38,10 @@
+@@ -44,6 +44,10 @@
        <artifactId>plexus-component-annotations</artifactId>
      </dependency>
      <dependency>
@@ -16,23 +16,9 @@ Forwarded: no
        <groupId>org.apache.maven</groupId>
        <artifactId>maven-model</artifactId>
      </dependency>
---- a/maven-plugin-api/pom.xml
-+++ b/maven-plugin-api/pom.xml
-@@ -49,6 +49,11 @@
-       </exclusions>
-     </dependency>
-     <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>${plexusVersion}</version>
-+    </dependency>
-+    <dependency>
-       <groupId>org.sonatype.sisu</groupId>
-       <artifactId>sisu-inject-plexus</artifactId>
-     </dependency>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -274,6 +274,11 @@
+@@ -213,6 +213,11 @@
        </dependency>
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index 93303e1..f33ef7b 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -5,11 +5,11 @@ Last-Update: 2012-01-21
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -42,20 +42,20 @@
+@@ -42,24 +42,24 @@
    <inceptionYear>2001</inceptionYear>
  
    <properties>
--    <classWorldsVersion>2.4</classWorldsVersion>
+-    <classWorldsVersion>2.5.1</classWorldsVersion>
 -    <commonsCliVersion>1.2</commonsCliVersion>
 -    <easyMockVersion>1.2_Java1.3</easyMockVersion>
 -    <junitVersion>3.8.2</junitVersion>
@@ -18,23 +18,30 @@ Forwarded: not-needed
 +    <easyMockVersion>debian</easyMockVersion>
 +    <junitVersion>3.x</junitVersion>
      <plexusVersion>1.5.5</plexusVersion>
--    <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
--    <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
--    <sisuInjectVersion>2.3.0</sisuInjectVersion>
+-    <plexusInterpolationVersion>1.19</plexusInterpolationVersion>
+-    <plexusUtilsVersion>3.0.15</plexusUtilsVersion>
++    <plexusInterpolationVersion>debian</plexusInterpolationVersion>
++    <plexusUtilsVersion>2.x</plexusUtilsVersion>
+     <!-- last Java5 release of Guava -->
+-    <guavaVersion>11.0.2</guavaVersion>
++    <guavaVersion>debian</guavaVersion>
+     <guiceVersion>3.1.3</guiceVersion>
+-    <sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
 -    <wagonVersion>2.4</wagonVersion>
 -    <securityDispatcherVersion>1.3</securityDispatcherVersion>
 -    <cipherVersion>1.7</cipherVersion>
-+    <plexusInterpolationVersion>debian</plexusInterpolationVersion>
-+    <plexusUtilsVersion>2.x</plexusUtilsVersion>
+-    <modelloVersion>1.8.1</modelloVersion>
+-    <jxpathVersion>1.3</jxpathVersion>
+-    <aetherVersion>0.9.0.M2</aetherVersion>
+-    <slf4jVersion>1.7.5</slf4jVersion>
 +    <sisuInjectVersion>debian</sisuInjectVersion>
 +    <wagonVersion>2.x</wagonVersion>
 +    <securityDispatcherVersion>debian</securityDispatcherVersion>
 +    <cipherVersion>debian</cipherVersion>
-     <modelloVersion>1.4.1</modelloVersion>
--    <jxpathVersion>1.3</jxpathVersion>
--    <aetherVersion>1.13.1</aetherVersion>
++    <modelloVersion>1.4.x</modelloVersion>
 +    <jxpathVersion>debian</jxpathVersion>
 +    <aetherVersion>debian</aetherVersion>
++    <slf4jVersion>debian</slf4jVersion>
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
      <!-- Control the name of the distribution and information output by mvn -->
      <distributionId>apache-maven</distributionId>
diff --git a/debian/patches/force_java15_compiler.diff b/debian/patches/force_java15_compiler.diff
index a9a583c..2f262b1 100644
--- a/debian/patches/force_java15_compiler.diff
+++ b/debian/patches/force_java15_compiler.diff
@@ -4,7 +4,7 @@ Last-Update: 2012-01-21
 Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -431,6 +431,9 @@
+@@ -387,6 +387,9 @@
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-maven-plugin</artifactId>
            <version>${modelloVersion}</version>
@@ -14,8 +14,8 @@ Forwarded: no
            <executions>
              <execution>
                <id>site-docs</id>
-@@ -475,6 +478,15 @@
-             <tryUpdate>true</tryUpdate>
+@@ -449,6 +452,15 @@
+             </excludes>
            </configuration>
          </plugin>
 +      <plugin>
diff --git a/debian/patches/modello.diff b/debian/patches/modello.diff
index 7083d39..e32679f 100644
--- a/debian/patches/modello.diff
+++ b/debian/patches/modello.diff
@@ -5,7 +5,7 @@ Last-Update: 2012-01-21
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -111,12 +111,6 @@
+@@ -114,12 +114,6 @@
      </artifact:dependencies>
      <delete file="${basedir}/dependencies.xml" />
  
@@ -18,7 +18,7 @@ Forwarded: not-needed
      <!-- Pull the dependencies for the MetadataGenerator CLI -->
      <artifact:dependencies pathId="pmdg.pathid" filesetId="pmdg.fileset">
        <localRepository path="${maven.repo.local}" />
-@@ -155,6 +149,24 @@
+@@ -158,6 +152,24 @@
    <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
      <mkdir dir="bootstrap/target" />
      <mkdir dir="bootstrap/target/generated-sources" />
@@ -43,7 +43,7 @@ Forwarded: not-needed
  
      <macrodef name="modello-single-mode">
        <attribute name="file" />
-@@ -191,7 +203,7 @@
+@@ -194,7 +206,7 @@
          <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer" />
        </sequential>
      </macrodef>
diff --git a/debian/patches/no_maven_assembly.diff b/debian/patches/no_maven_assembly.diff
index fe2cff0..c8df0c7 100644
--- a/debian/patches/no_maven_assembly.diff
+++ b/debian/patches/no_maven_assembly.diff
@@ -1,6 +1,6 @@
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
-@@ -120,6 +120,7 @@
+@@ -148,6 +148,7 @@
            </execution>
          </executions>
        </plugin>
@@ -8,7 +8,7 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-assembly-plugin</artifactId>
-@@ -138,6 +139,7 @@
+@@ -166,6 +167,7 @@
            </execution>
          </executions>
        </plugin>
@@ -18,7 +18,7 @@
  
 --- a/pom.xml
 +++ b/pom.xml
-@@ -458,11 +458,13 @@
+@@ -414,11 +414,13 @@
            <artifactId>maven-bundle-plugin</artifactId>
            <version>1.0.0</version>
          </plugin>
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 0ff2546..4cb3a6f 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -4,274 +4,286 @@ Description: Set default plugins versions to match packages in Debian.
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2012-01-21
 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 @@
+--- 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 -->
              <phases>
                <install>
--                org.apache.maven.plugins:maven-install-plugin:2.3.1: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
-@@ -91,25 +91,25 @@
+@@ -67,25 +67,25 @@
              <!-- START SNIPPET: jar-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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-jar-plugin:2.3.2:jar
-+                org.apache.maven.plugins:maven-jar-plugin:2.4: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.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
-@@ -146,25 +146,25 @@
+@@ -111,25 +111,25 @@
              <!-- START SNIPPET: ejb-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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-ejb-plugin:2.3:ejb
+-                org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
++                org.apache.maven.plugins:maven-ejb-plugin:2.2:ejb
                </package>
                <install>
--                org.apache.maven.plugins:maven-install-plugin:2.3.1: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
-@@ -210,25 +210,25 @@
+@@ -151,25 +151,25 @@
              <!-- START SNIPPET: ejb3-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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.3.1: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,26 +285,26 @@
-                 org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor
+@@ -198,26 +198,26 @@
+                 org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
                </generate-resources>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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-jar-plugin:2.3.1:jar,
-+                org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
-                 org.apache.maven.plugins:maven-plugin-plugin:2.9:addPluginArtifactMetadata
+                 org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
+                 org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata
                </package>
                <install>
--                org.apache.maven.plugins:maven-install-plugin:2.3.1: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
-@@ -373,25 +373,25 @@
+@@ -243,25 +243,25 @@
              <!-- START SNIPPET: war-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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-war-plugin:2.1.1:war
+-                org.apache.maven.plugins:maven-war-plugin:2.2:war
++                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.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
-@@ -431,13 +431,13 @@
-                 org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml
+@@ -287,16 +287,16 @@
+             <!-- START SNIPPET: ear-lifecycle -->
+             <phases>
+               <generate-resources>
+-                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
                </generate-resources>
                <process-resources>
 -                org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources
 +                org.apache.maven.plugins:maven-resources-plugin:2.3:resources
                </process-resources>
                <package>
-                 org.apache.maven.plugins:maven-ear-plugin:2.6:ear
+-                org.apache.maven.plugins:maven-ear-plugin:2.8:ear
++                org.apache.maven.plugins:maven-ear-plugin:2.3.2:ear
                </package>
                <install>
--                org.apache.maven.plugins:maven-install-plugin:2.3.1: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
-@@ -474,25 +474,25 @@
+@@ -322,25 +322,25 @@
              <!-- START SNIPPET: rar-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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-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.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
-@@ -529,25 +529,25 @@
+@@ -366,25 +366,25 @@
              <!-- START SNIPPET: par-lifecycle -->
              <phases>
                <process-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:compile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
                </compile>
                <process-test-resources>
--                org.apache.maven.plugins:maven-resources-plugin:2.5: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:2.3.2:testCompile
+-                org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
--                org.apache.maven.plugins:maven-surefire-plugin:2.10: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.3.1: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/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 @@
-         </phases>
-         <default-phases>
-           <clean>
--            org.apache.maven.plugins:maven-clean-plugin:2.4.1:clean
-+            org.apache.maven.plugins:maven-clean-plugin:2.5:clean
-           </clean>
-         </default-phases>
-         <!-- END SNIPPET: clean -->
 --- a/pom.xml
 +++ b/pom.xml
-@@ -593,6 +593,7 @@
+@@ -360,7 +360,7 @@
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-compiler-plugin</artifactId>
+-          <version>2.5.1</version>
++          <version>3.2</version>
+         </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+@@ -373,7 +373,7 @@
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-surefire-plugin</artifactId>
+-          <version>2.12</version>
++          <version>2.17</version>
+           <configuration>
+             <argLine>-Xmx256m</argLine>
+           </configuration>
+@@ -611,6 +611,7 @@
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-surefire-plugin</artifactId>
@@ -279,23 +291,3 @@ Forwarded: not-needed
              <configuration>
                <systemProperties combine.children="append">
                  <property>
---- 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,7 +74,7 @@
-       <plugins>
-         <plugin>
-           <artifactId>maven-antrun-plugin</artifactId>
--          <version>1.3</version>
-+          <version>1.7</version>
-         </plugin>
-         <plugin>
-           <artifactId>maven-assembly-plugin</artifactId>
-@@ -82,7 +82,7 @@
-         </plugin>
-         <plugin>
-           <artifactId>maven-dependency-plugin</artifactId>
--          <version>2.1</version>
-+          <version>2.7</version>
-         </plugin>
-         <plugin>
-           <artifactId>maven-release-plugin</artifactId>
diff --git a/debian/patches/secure-maven-central-access.diff b/debian/patches/secure-maven-central-access.diff
index 1bce53d..303e9d8 100644
--- a/debian/patches/secure-maven-central-access.diff
+++ b/debian/patches/secure-maven-central-access.diff
@@ -2,12 +2,12 @@ Description: Download artifacts from Maven central using https by default
 Origin: backport, https://github.com/apache/maven/commit/9216191
 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
 +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
  
-     final String DEFAULT_REMOTE_REPO_ID = "central";
+     String DEFAULT_REMOTE_REPO_ID = "central";
  
--    final String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2";
-+    final String DEFAULT_REMOTE_REPO_URL = "https://repo.maven.apache.org/maven2";
+-    String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2";
++    String DEFAULT_REMOTE_REPO_URL = "https://repo.maven.apache.org/maven2";
  
      Artifact createArtifact( String groupId, String artifactId, String version, String packaging );
  

-- 
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