diff --git a/0002-Migrate-from-easymock-1-to-easymock-3.patch b/0001-MNG-5696-Remove-dependency-on-Easymock.patch similarity index 77% rename from 0002-Migrate-from-easymock-1-to-easymock-3.patch rename to 0001-MNG-5696-Remove-dependency-on-Easymock.patch index 86ba5ec..62df034 100644 --- a/0002-Migrate-from-easymock-1-to-easymock-3.patch +++ b/0001-MNG-5696-Remove-dependency-on-Easymock.patch @@ -1,29 +1,33 @@ -From 3d875b067847d00519f960bf83469b85685a4ec5 Mon Sep 17 00:00:00 2001 +From 44bd2d20c196427c66577236ec62aaa77ecbd974 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Aug 2013 10:11:48 +0200 -Subject: [PATCH 2/4] Migrate from easymock 1 to easymock 3 +Subject: [PATCH 1/3] [MNG-5696] Remove dependency on Easymock +Easymock is not really used for anything, so it can be removed. --- - maven-compat/pom.xml | 2 +- + maven-compat/pom.xml | 5 -- .../maven/artifact/testutils/MockManager.java | 58 ---------------------- - .../repository/legacy/DefaultWagonManagerTest.java | 7 ++- - pom.xml | 4 +- - 4 files changed, 6 insertions(+), 65 deletions(-) + .../repository/legacy/DefaultWagonManagerTest.java | 6 --- + pom.xml | 9 ---- + 4 files changed, 78 deletions(-) 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 9758d79..be2a927 100644 +index 02ac0d3..28db8ba 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml -@@ -83,7 +83,7 @@ +@@ -82,11 +82,6 @@ + aether-connector-wagon test - +- - easymock -+ org.easymock - easymock - test - +- easymock +- test +- + + + diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java deleted file mode 100644 index 4b6f637..0000000 @@ -89,58 +93,60 @@ index 4b6f637..0000000 - -} diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java -index bcda50a..37a281c 100644 +index bcda50a..068c0e0 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java -@@ -45,7 +45,7 @@ +@@ -45,7 +45,6 @@ import org.apache.maven.wagon.observers.Debug; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; -import org.easymock.MockControl; -+import org.easymock.EasyMock; /** * @author Michal Maczka -@@ -162,15 +162,14 @@ public void testGetRemoteJar() +@@ -162,15 +161,10 @@ public void testGetRemoteJar() StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" ); wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" ); - MockControl control = MockControl.createControl( UpdateCheckManager.class ); - control.replay(); -+ EasyMock.replay(); - +- wagonManager.getArtifact( artifact, repo, null, false ); assertTrue( artifact.getFile().exists() ); assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) ); - +- - control.verify(); -+ EasyMock.verify(); } private Artifact createTestPomArtifact( String directory ) diff --git a/pom.xml b/pom.xml -index ccf6f36..760e6c2 100644 +index 6015e4d..b4c5ebf 100644 --- a/pom.xml +++ b/pom.xml -@@ -46,7 +46,7 @@ +@@ -46,7 +46,6 @@ 1.6 2.5.1 1.2 - 1.2_Java1.3 -+ 3.2 3.8.2 1.5.5 1.19 -@@ -344,7 +344,7 @@ +@@ -342,14 +341,6 @@ + plexus-cipher + ${cipherVersion} - - +- +- - easymock -+ org.easymock - easymock - ${easyMockVersion} - test +- easymock +- ${easyMockVersion} +- test +- +- + + + -- 1.9.3 diff --git a/0001-Use-generics-in-modello-generated-code.patch b/0001-Use-generics-in-modello-generated-code.patch deleted file mode 100644 index cc26ae1..0000000 --- a/0001-Use-generics-in-modello-generated-code.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6e5054ceaf1db425324548d2f62931df7733eb0e Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 31 Jan 2012 13:12:32 +0100 -Subject: [PATCH 1/4] Use generics in modello generated code - ---- - maven-model/pom.xml | 2 ++ - pom.xml | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/maven-model/pom.xml b/maven-model/pom.xml -index c290ab5..e2e14fb 100644 ---- a/maven-model/pom.xml -+++ b/maven-model/pom.xml -@@ -56,6 +56,7 @@ under the License. - - src/main/mdo/maven.mdo - -+ true - - - -@@ -103,6 +104,7 @@ under the License. - - 3.0.0 - true -+ true - - - -diff --git a/pom.xml b/pom.xml -index 6576a25..ccf6f36 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -399,6 +399,9 @@ - org.codehaus.modello - modello-maven-plugin - ${modelloVersion} -+ -+ true -+ - - - site-docs --- -1.9.3 - diff --git a/0003-Update-Aether-to-0.9.0.M3.patch b/0002-Update-Aether-to-0.9.0.M3.patch similarity index 91% rename from 0003-Update-Aether-to-0.9.0.M3.patch rename to 0002-Update-Aether-to-0.9.0.M3.patch index 25e6140..6a15ad5 100644 --- a/0003-Update-Aether-to-0.9.0.M3.patch +++ b/0002-Update-Aether-to-0.9.0.M3.patch @@ -1,7 +1,7 @@ -From ff559645842bf21e3bfee6810ed2808657120396 Mon Sep 17 00:00:00 2001 +From d1a44fdad163b1bd4a052979f824ffd4522b0780 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Aug 2013 08:49:19 +0200 -Subject: [PATCH 3/4] Update Aether to 0.9.0.M3 +Subject: [PATCH 2/3] Update Aether to 0.9.0.M3 --- apache-maven/pom.xml | 6 +++++- @@ -11,7 +11,7 @@ Subject: [PATCH 3/4] 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 738c6e5..9c77d18 100644 +index 1def243..2923435 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -87,7 +87,11 @@ @@ -28,7 +28,7 @@ index 738c6e5..9c77d18 100644 org.slf4j diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index 74a7c71..ed264ab 100644 +index 130805c..801f9fb 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 74a7c71..ed264ab 100644 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index be2a927..afeab8c 100644 +index 28db8ba..348ce29 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -79,7 +79,12 @@ @@ -62,12 +62,12 @@ index be2a927..afeab8c 100644 + aether-connector-basic test - + diff --git a/pom.xml b/pom.xml -index 760e6c2..148b8ce 100644 +index b4c5ebf..9d858fa 100644 --- a/pom.xml +++ b/pom.xml -@@ -60,7 +60,7 @@ +@@ -59,7 +59,7 @@ 1.7 1.8.1 1.3 @@ -76,7 +76,7 @@ index 760e6c2..148b8ce 100644 1.7.5 true -@@ -308,7 +308,12 @@ +@@ -307,7 +307,12 @@ org.eclipse.aether diff --git a/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch b/0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch similarity index 94% rename from 0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch rename to 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch index f619111..f941124 100644 --- a/0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch +++ b/0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch @@ -1,7 +1,7 @@ -From b6c25c221f9020a5bc3cfc28bc627a4fff10ff73 Mon Sep 17 00:00:00 2001 +From e3eb56ada370c18c1539e29b929139598a366611 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 13 Nov 2013 14:32:23 +0100 -Subject: [PATCH 4/4] Update to Sisu 0.1.0 and Guice 3.1.6 +Subject: [PATCH 3/3] 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 9c77d18..10339e9 100644 +index 2923435..16393cb 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -57,6 +57,18 @@ @@ -41,7 +41,7 @@ index 9c77d18..10339e9 100644 commons-cli diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index ed264ab..a44404c 100644 +index 801f9fb..4fbca7d 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 ed264ab..a44404c 100644 org.eclipse.aether diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index afeab8c..a67e35f 100644 +index 348ce29..7884159 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -64,6 +64,18 @@ @@ -88,7 +88,7 @@ index afeab8c..a67e35f 100644 plexus-component-annotations diff --git a/maven-core/pom.xml b/maven-core/pom.xml -index 5e5c2c1..eb7220e 100644 +index fae2904..dc788d2 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -82,6 +82,17 @@ @@ -110,7 +110,7 @@ index 5e5c2c1..eb7220e 100644 plexus-interpolation diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml -index 6f99129..7e6efee 100644 +index 2da52a9..f246fe1 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -65,6 +65,17 @@ @@ -132,7 +132,7 @@ index 6f99129..7e6efee 100644 plexus-component-annotations diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml -index 2b5b1a2..a560a2b 100644 +index 81cd9d9..c1ca303 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -54,6 +54,18 @@ @@ -155,7 +155,7 @@ index 2b5b1a2..a560a2b 100644 xmlunit 1.3 diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml -index fafb0b4..e8bb273 100644 +index 1019ae4..e018cc0 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 fafb0b4..e8bb273 100644 diff --git a/pom.xml b/pom.xml -index 148b8ce..58727df 100644 +index 9d858fa..3787a42 100644 --- a/pom.xml +++ b/pom.xml -@@ -53,8 +53,8 @@ +@@ -52,8 +52,8 @@ 3.0.17 14.0.1 diff --git a/maven.spec b/maven.spec index 271eda3..abceee6 100644 --- a/maven.spec +++ b/maven.spec @@ -1,25 +1,22 @@ Name: maven Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java project management and project comprehension tool License: ASL 2.0 URL: http://maven.apache.org/ +BuildArch: noarch Source0: http://archive.apache.org/dist/%{name}/%{name}-3/%{version}/source/apache-%{name}-%{version}-src.tar.gz Source1: maven-bash-completion Source2: mvn.1 Source200: %{name}-script -# Could be upstreamed probably -Patch0001: 0001-Use-generics-in-modello-generated-code.patch -# Could be upstreamed probably -Patch0002: 0002-Migrate-from-easymock-1-to-easymock-3.patch +# Forwarded upstream (MNG-5696) +Patch0001: 0001-MNG-5696-Remove-dependency-on-Easymock.patch # Merged upstream (MNG-5502) -Patch0003: 0003-Update-Aether-to-0.9.0.M3.patch +Patch0002: 0002-Update-Aether-to-0.9.0.M3.patch # Merged upstream (MNG-5534) -Patch0004: 0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch - -BuildArch: noarch +Patch0003: 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch # If XMvn is part of the same RPM transaction then it should be # installed first to avoid triggering rhbz#1014355. @@ -148,7 +145,6 @@ Group: Documentation %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 -%patch0004 -p1 # not really used during build, but a precaution rm maven-ant-tasks-*.jar @@ -274,6 +270,9 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Mon Sep 29 2014 Mikolaj Izdebski - 3.2.3-2 +- Update patches + * Fri Aug 22 2014 Michal Srb - 3.2.3-1 - Update to upstream version 3.2.3