From 34f885c43e98fef63aebd9bb912486a22fba272f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 18 Jun 2014 18:05:08 +0200 Subject: [PATCH] Update to upstream version 3.2.2 --- .gitignore | 1 + ...e-generics-in-modello-generated-code.patch | 12 ++-- ...igrate-from-easymock-1-to-easymock-3.patch | 16 ++--- 0003-Update-Aether-to-0.9.0.M3.patch | 18 +++--- ...Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch | 24 +++---- ...ctor-hint-for-reactor-WorkspaceReade.patch | 64 ------------------- ...lPointerException-when-error-occur-d.patch | 34 ---------- maven.spec | 20 +++--- sources | 2 +- 9 files changed, 45 insertions(+), 146 deletions(-) delete mode 100644 0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch delete mode 100644 0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch diff --git a/.gitignore b/.gitignore index 529dfe2..430a4fa 100644 --- 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 diff --git a/0001-Use-generics-in-modello-generated-code.patch b/0001-Use-generics-in-modello-generated-code.patch index 18bf467..cc26ae1 100644 --- 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 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 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 @@ org.codehaus.modello modello-maven-plugin ${modelloVersion} @@ -43,5 +43,5 @@ index 57ac319..7e0c305 100644 site-docs -- -1.9.0 +1.9.3 diff --git a/0002-Migrate-from-easymock-1-to-easymock-3.patch b/0002-Migrate-from-easymock-1-to-easymock-3.patch index 4dd1ec7..86ba5ec 100644 --- 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 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 @@ - +@@ -46,7 +46,7 @@ + 1.6 2.5.1 1.2 - 1.2_Java1.3 @@ -132,7 +132,7 @@ index 7e0c305..b3f710f 100644 3.8.2 1.5.5 1.19 -@@ -324,7 +324,7 @@ +@@ -344,7 +344,7 @@ @@ -142,5 +142,5 @@ index 7e0c305..b3f710f 100644 ${easyMockVersion} test -- -1.9.0 +1.9.3 diff --git a/0003-Update-Aether-to-0.9.0.M3.patch b/0003-Update-Aether-to-0.9.0.M3.patch index 00624c9..25e6140 100644 --- 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 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 org.slf4j 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 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 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 @@ 1.7 1.8.1 1.3 @@ -76,7 +76,7 @@ index b3f710f..04a6e4c 100644 1.7.5 true -@@ -288,7 +288,12 @@ +@@ -308,7 +308,12 @@ org.eclipse.aether @@ -91,5 +91,5 @@ index b3f710f..04a6e4c 100644 -- -1.9.0 +1.9.3 diff --git 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 index 799f0a6..f619111 100644 --- 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 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 commons-cli 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 org.eclipse.aether 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 plexus-component-annotations 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 plexus-interpolation 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 plexus-component-annotations 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 xmlunit 1.3 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 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 @@ 3.0.17 14.0.1 @@ -193,5 +193,5 @@ index 04a6e4c..bb9a88b 100644 1.3 1.7 -- -1.9.0 +1.9.3 diff --git a/0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch b/0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch deleted file mode 100644 index 007c362..0000000 --- a/0005-MNG-5591-use-reactor-hint-for-reactor-WorkspaceReade.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12946e910f70efbe5f8d44e3f94cf5c59fd653d1 Mon Sep 17 00:00:00 2001 -From: Igor Fedorenko -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 ---- - 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 COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); - - private Map projectsByGAV; --- -1.9.0 - diff --git a/0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch b/0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch deleted file mode 100644 index dce94e2..0000000 --- a/0006-MNG-5613-fix-NullPointerException-when-error-occur-d.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 750f5f97fd4d630987e9d4ce32073aad845b3c23 Mon Sep 17 00:00:00 2001 -From: Jason van Zyl -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 - 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 - diff --git a/maven.spec b/maven.spec index 4ff0002..67f5741 100644 --- 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 - 3.2.2-1 +- Update to upstream version 3.2.2 + * Sat Jun 07 2014 Fedora Release Engineering - 3.2.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 7eb49f3..fc341a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92753b8a1076637ad7c0907f1ec9f1b6 apache-maven-3.2.1-src.tar.gz +dc3c7042348859fd2358ff31648da923 apache-maven-3.2.2-src.tar.gz