Update to upstream version 3.2.2

2014-06-18 18:05:08 +02:00 · 2014-06-18 18:05:08 +02:00 · 34f885c43e
commit 34f885c43e
parent 0073213b52
9 changed files with 45 additions and 146 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@
 /apache-maven-3.1.1-src.tar.gz
 /apache-maven-3.2.0-src.tar.gz
 /apache-maven-3.2.1-src.tar.gz
+/apache-maven-3.2.2-src.tar.gz
--- a/0001-Use-generics-in-modello-generated-code.patch
+++ b/0001-Use-generics-in-modello-generated-code.patch
@ -1,7 +1,7 @@
-From 351830b1c83b308e554f48c355f252f62afb3c2c Mon Sep 17 00:00:00 2001
+From 6e5054ceaf1db425324548d2f62931df7733eb0e Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@redhat.com>
 Date: Tue, 31 Jan 2012 13:12:32 +0100
-Subject: [PATCH 1/6] Use generics in modello generated code
+Subject: [PATCH 1/4] Use generics in modello generated code

 ---
 maven-model/pom.xml | 2 ++
@ -9,7 +9,7 @@ Subject: [PATCH 1/6] Use generics in modello generated code
 2 files changed, 5 insertions(+)

 diff --git a/maven-model/pom.xml b/maven-model/pom.xml
-index e538c1a..27c92bb 100644
+index c290ab5..e2e14fb 100644
 --- a/maven-model/pom.xml
 +++ b/maven-model/pom.xml
@@ -56,6 +56,7 @@ under the License.
@ -29,10 +29,10 @@ index e538c1a..27c92bb 100644
               </execution>
             </executions>
 diff --git a/pom.xml b/pom.xml
-index 57ac319..7e0c305 100644
+index 6576a25..ccf6f36 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -389,6 +389,9 @@
+@@ -399,6 +399,9 @@
           <groupId>org.codehaus.modello</groupId>
           <artifactId>modello-maven-plugin</artifactId>
           <version>${modelloVersion}</version>
@ -43,5 +43,5 @@ index 57ac319..7e0c305 100644
             <execution>
               <id>site-docs</id>
 -- 
-1.9.0
+1.9.3

--- a/0002-Migrate-from-easymock-1-to-easymock-3.patch
+++ b/0002-Migrate-from-easymock-1-to-easymock-3.patch
@ -1,7 +1,7 @@
-From b7282fd199d9ff4169ca62d50606fbe94086f2de Mon Sep 17 00:00:00 2001
+From 3d875b067847d00519f960bf83469b85685a4ec5 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Thu, 29 Aug 2013 10:11:48 +0200
-Subject: [PATCH 2/6] Migrate from easymock 1 to easymock 3
+Subject: [PATCH 2/4] Migrate from easymock 1 to easymock 3

 ---
 maven-compat/pom.xml                               |  2 +-
@ -12,7 +12,7 @@ Subject: [PATCH 2/6] Migrate from easymock 1 to easymock 3
 delete mode 100644 maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java

 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
-index ff75433..7ee01a0 100644
+index 9758d79..be2a927 100644
 --- a/maven-compat/pom.xml
 +++ b/maven-compat/pom.xml
@@ -83,7 +83,7 @@
@ -120,11 +120,11 @@ index bcda50a..37a281c 100644
 
     private Artifact createTestPomArtifact( String directory )
 diff --git a/pom.xml b/pom.xml
-index 7e0c305..b3f710f 100644
+index ccf6f36..760e6c2 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -44,7 +44,7 @@
-   <properties>
+@@ -46,7 +46,7 @@
+     <maven.compiler.target>1.6</maven.compiler.target>    
     <classWorldsVersion>2.5.1</classWorldsVersion>
     <commonsCliVersion>1.2</commonsCliVersion>
 -    <easyMockVersion>1.2_Java1.3</easyMockVersion>
@ -132,7 +132,7 @@ index 7e0c305..b3f710f 100644
     <junitVersion>3.8.2</junitVersion>
     <plexusVersion>1.5.5</plexusVersion>
     <plexusInterpolationVersion>1.19</plexusInterpolationVersion>
-@@ -324,7 +324,7 @@
+@@ -344,7 +344,7 @@
       </dependency>
       <!--bootstrap-start-comment-->
       <dependency>
@ -142,5 +142,5 @@ index 7e0c305..b3f710f 100644
         <version>${easyMockVersion}</version>
         <scope>test</scope>
 -- 
-1.9.0
+1.9.3

--- a/0003-Update-Aether-to-0.9.0.M3.patch
+++ b/0003-Update-Aether-to-0.9.0.M3.patch
@ -1,7 +1,7 @@
-From f287858ef2b0a2cc924e902298eea66ed7c6b82e Mon Sep 17 00:00:00 2001
+From ff559645842bf21e3bfee6810ed2808657120396 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 12 Aug 2013 08:49:19 +0200
-Subject: [PATCH 3/6] Update Aether to 0.9.0.M3
+Subject: [PATCH 3/4] Update Aether to 0.9.0.M3

 ---
 apache-maven/pom.xml          | 6 +++++-
@ -11,7 +11,7 @@ Subject: [PATCH 3/6] Update Aether to 0.9.0.M3
 4 files changed, 24 insertions(+), 5 deletions(-)

 diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
-index 0ff2e9a..26c6a82 100644
+index 738c6e5..9c77d18 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
@@ -87,7 +87,11 @@
@ -28,7 +28,7 @@ index 0ff2e9a..26c6a82 100644
     <dependency>
       <groupId>org.slf4j</groupId>
 diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
-index f9f1673..6273e66 100644
+index 74a7c71..ed264ab 100644
 --- a/maven-aether-provider/pom.xml
 +++ b/maven-aether-provider/pom.xml
@@ -91,7 +91,12 @@ under the License.
@ -46,7 +46,7 @@ index f9f1673..6273e66 100644
     </dependency>
     <dependency>
 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
-index 7ee01a0..e075387 100644
+index be2a927..afeab8c 100644
 --- a/maven-compat/pom.xml
 +++ b/maven-compat/pom.xml
@@ -79,7 +79,12 @@
@ -64,10 +64,10 @@ index 7ee01a0..e075387 100644
     </dependency>
     <dependency>
 diff --git a/pom.xml b/pom.xml
-index b3f710f..04a6e4c 100644
+index 760e6c2..148b8ce 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -58,7 +58,7 @@
+@@ -60,7 +60,7 @@
     <cipherVersion>1.7</cipherVersion>
     <modelloVersion>1.8.1</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
@ -76,7 +76,7 @@ index b3f710f..04a6e4c 100644
     <slf4jVersion>1.7.5</slf4jVersion>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <!-- Control the name of the distribution and information output by mvn -->
-@@ -288,7 +288,12 @@
+@@ -308,7 +308,12 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.aether</groupId>
@ -91,5 +91,5 @@ index b3f710f..04a6e4c 100644
       </dependency>
       <!--  Commons -->
 -- 
-1.9.0
+1.9.3

--- a/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
+++ b/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
@ -1,7 +1,7 @@
-From 0e95fa0a988f4b910969d1d5cfd2daf0c968f257 Mon Sep 17 00:00:00 2001
+From b6c25c221f9020a5bc3cfc28bc627a4fff10ff73 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 13 Nov 2013 14:32:23 +0100
-Subject: [PATCH 4/6] Update to Sisu 0.1.0 and Guice 3.1.6
+Subject: [PATCH 4/4] Update to Sisu 0.1.0 and Guice 3.1.6

 Sisu depends on Guice, but dependency scope changed from "compile" to
 "provided" in Sisu 0.1.0.  As a Sisu user, Maven needs to have runtime
@ -18,7 +18,7 @@ dependency on Guice.
 8 files changed, 77 insertions(+), 3 deletions(-)

 diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
-index 26c6a82..b866692 100644
+index 9c77d18..10339e9 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
@@ -57,6 +57,18 @@
@ -41,7 +41,7 @@ index 26c6a82..b866692 100644
     <dependency>
       <groupId>commons-cli</groupId>
 diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
-index 6273e66..3ff5929 100644
+index ed264ab..a44404c 100644
 --- a/maven-aether-provider/pom.xml
 +++ b/maven-aether-provider/pom.xml
@@ -80,7 +80,6 @@ under the License.
@ -65,7 +65,7 @@ index 6273e66..3ff5929 100644
     <dependency>
       <groupId>org.eclipse.aether</groupId>
 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
-index e075387..9810fd9 100644
+index afeab8c..a67e35f 100644
 --- a/maven-compat/pom.xml
 +++ b/maven-compat/pom.xml
@@ -64,6 +64,18 @@
@ -88,7 +88,7 @@ index e075387..9810fd9 100644
       <artifactId>plexus-component-annotations</artifactId>
     </dependency>
 diff --git a/maven-core/pom.xml b/maven-core/pom.xml
-index f88ca9f..55cb370 100644
+index 5e5c2c1..eb7220e 100644
 --- a/maven-core/pom.xml
 +++ b/maven-core/pom.xml
@@ -82,6 +82,17 @@
@ -110,7 +110,7 @@ index f88ca9f..55cb370 100644
       <artifactId>plexus-interpolation</artifactId>
     </dependency>
 diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
-index d4db510..7b85c58 100644
+index 6f99129..7e6efee 100644
 --- a/maven-embedder/pom.xml
 +++ b/maven-embedder/pom.xml
@@ -65,6 +65,17 @@
@ -132,7 +132,7 @@ index d4db510..7b85c58 100644
       <artifactId>plexus-component-annotations</artifactId>
     </dependency>
 diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
-index 053c86c..ef9df33 100644
+index 2b5b1a2..a560a2b 100644
 --- a/maven-model-builder/pom.xml
 +++ b/maven-model-builder/pom.xml
@@ -54,6 +54,18 @@
@ -155,7 +155,7 @@ index 053c86c..ef9df33 100644
       <artifactId>xmlunit</artifactId>
       <version>1.3</version>
 diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
-index 319243e..85f0718 100644
+index fafb0b4..e8bb273 100644
 --- a/maven-plugin-api/pom.xml
 +++ b/maven-plugin-api/pom.xml
@@ -58,6 +58,18 @@ under the License.
@ -178,10 +178,10 @@ index 319243e..85f0718 100644
 
   <build>
 diff --git a/pom.xml b/pom.xml
-index 04a6e4c..bb9a88b 100644
+index 148b8ce..58727df 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -51,8 +51,8 @@
+@@ -53,8 +53,8 @@
     <plexusUtilsVersion>3.0.17</plexusUtilsVersion>
     <!-- Latest version of Guava that works with Sisu -->
     <guavaVersion>14.0.1</guavaVersion>
@ -193,5 +193,5 @@ index 04a6e4c..bb9a88b 100644
     <securityDispatcherVersion>1.3</securityDispatcherVersion>
     <cipherVersion>1.7</cipherVersion>
 -- 
-1.9.0
+1.9.3

--- a/0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch
+++ b/0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch
@ -1,64 +0,0 @@
-From 12946e910f70efbe5f8d44e3f94cf5c59fd653d1 Mon Sep 17 00:00:00 2001
-From: Igor Fedorenko <ifedorenko@apache.org>
-Date: Fri, 28 Feb 2014 23:54:45 -0500
-Subject: [PATCH 5/6] MNG-5591 use 'reactor' hint for reactor WorkspaceReader
-
-When maven is invoked from m2e, container.lookup(WorkspaceReader.class)
-returns component with role-hint=ide, which I believe is a bug in Susi
-or Guice (or at least well misunderstood feature). This masks
-ReactorReader workspace reader implementation and breaks reactor
-dependency resolution.
-
-The solution is to use explicit "reactor" role hint for ReactorReader.
-This avoids fuzzy default component lookup logic and guarantees reactor
-reader is always used regardless of presence of other workspace readers.
-
-Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
---
- maven-core/src/main/java/org/apache/maven/DefaultMaven.java  | 2 +-
- maven-core/src/main/java/org/apache/maven/ReactorReader.java | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-index 58c536c..6328819 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-@@ -288,7 +288,7 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request )
-         sessionScope.seed( MavenSession.class, session );
-         try
-         {
-            reactorWorkspace = container.lookup( WorkspaceReader.class );
-+            reactorWorkspace = container.lookup( WorkspaceReader.class, ReactorReader.HINT );
-         }
-         catch ( ComponentLookupException e )
-         {
-diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
-index 9aa8385..e7b1f42 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
-+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
-@@ -31,7 +31,6 @@
- 
- import javax.inject.Inject;
- import javax.inject.Named;
-import javax.inject.Singleton;
- 
- import org.apache.maven.artifact.ArtifactUtils;
- import org.apache.maven.execution.MavenSession;
-@@ -46,11 +45,13 @@
-  * 
-  * @author Jason van Zyl
-  */
-@Named
-+@Named( ReactorReader.HINT )
- @SessionScoped
- class ReactorReader
-     implements WorkspaceReader
- {
-+    public static final String HINT = "reactor";
-+    
-     private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" );
- 
-     private Map<String, MavenProject> projectsByGAV;
-- 
-1.9.0
-
--- a/0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch
+++ b/0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch
@ -1,34 +0,0 @@
-From 750f5f97fd4d630987e9d4ce32073aad845b3c23 Mon Sep 17 00:00:00 2001
-From: Jason van Zyl <jason@tesla.io>
-Date: Tue, 20 May 2014 20:26:27 -0400
-Subject: [PATCH 6/6] [MNG-5613] fix NullPointerException when error occur
- during project dependency graph creation Submitted by: Sebastian Le Merdy
- <sebastian.lemerdy@gmail.com> From: https://github.com/apache/maven/pull/13
-
---
- maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-index 6328819..ab47efd 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
-@@ -267,13 +267,13 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request )
-         //
-         ProjectDependencyGraph projectDependencyGraph = createProjectDependencyGraph( projects, request, result, true );
- 
-        session.setProjects( projectDependencyGraph.getSortedProjects() );
-        
-         if ( result.hasExceptions() )
-         {
-             return result;
-         }
- 
-+        session.setProjects( projectDependencyGraph.getSortedProjects() );
-+
-         try
-         {
-             session.setProjectMap( getProjectMap( session.getProjects() ) );
-- 
-1.9.0
-
--- a/maven.spec
+++ b/maven.spec
@ -1,6 +1,6 @@
 Name:           maven
-Version:        3.2.1
-Release:        11%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        Java project management and project comprehension tool
 License:        ASL 2.0
 URL:            http://maven.apache.org/
@ -18,10 +18,6 @@ Patch0002:      0002-Migrate-from-easymock-1-to-easymock-3.patch
 Patch0003:      0003-Update-Aether-to-0.9.0.M3.patch
 # Forwarded upstream (MNG-5534)
 Patch0004:      0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
-# Forwarded upstream (MNG-5591, accepted)
-Patch0005:      0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch
-# Backported from upstream commit bef7fac
-Patch0006:      0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch

 BuildArch:      noarch

@ -153,8 +149,6 @@ Group:          Documentation
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1

 # not really used during build, but a precaution
 rm maven-ant-tasks-*.jar
@ -172,11 +166,10 @@ sed -i 's:\r::' apache-maven/src/conf/settings.xml
 sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath "${M2_HOME}"/boot/plexus-classworlds.jar':g \
        apache-maven/src/bin/mvn*

-# Disable animal-sniffer on RHEL
-# Temporarily disabled for fedora to solve asm & asm4 clashing on classpath
-#if [ %{?rhel} ]; then
+# Disable QA plugins which are not useful for us
 %pom_remove_plugin :animal-sniffer-maven-plugin
-#fi
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :apache-rat-plugin

 # logback is not really needed by maven in typical use cases, so set
 # its scope to provided
@ -281,6 +274,9 @@ ln -sf $(build-classpath plexus/classworlds) \


 %changelog
+* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-1
+- Update to upstream version 3.2.2
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-92753b8a1076637ad7c0907f1ec9f1b6  apache-maven-3.2.1-src.tar.gz
+dc3c7042348859fd2358ff31648da923  apache-maven-3.2.2-src.tar.gz