From 9b71af330db4448b0c9d6e2e35648fa850fdc8ed Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 7 Oct 2013 10:45:52 +0200 Subject: [PATCH 1/5] Update to upstream version 3.1.1 --- .gitignore | 1 + ...igrate-from-easymock-1-to-easymock-3.patch | 22 ++++++++--------- 0001-Update-Aether-to-0.9.0.M3.patch | 24 +++++++++---------- ...e-generics-in-modello-generated-code.patch | 22 ++++++++--------- maven.spec | 17 ++++++------- sources | 2 +- 6 files changed, 45 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 35592b5..f92c160 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /apache-maven-3.0.4-src.tar.gz /apache-maven-3.0.5-src.tar.gz /apache-maven-3.1.0-src.tar.gz +/apache-maven-3.1.1-src.tar.gz diff --git a/0001-Migrate-from-easymock-1-to-easymock-3.patch b/0001-Migrate-from-easymock-1-to-easymock-3.patch index 0d4ddd4..5a6a706 100644 --- a/0001-Migrate-from-easymock-1-to-easymock-3.patch +++ b/0001-Migrate-from-easymock-1-to-easymock-3.patch @@ -1,7 +1,7 @@ -From cb3b8016fa74d1684029034793c0605b36491b60 Mon Sep 17 00:00:00 2001 +From 13b48a2b020ced6858e90c4d596f6804989844b9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Aug 2013 10:11:48 +0200 -Subject: [PATCH] Migrate from easymock 1 to easymock 3 +Subject: [PATCH 2/3] Migrate from easymock 1 to easymock 3 --- maven-compat/pom.xml | 2 +- @@ -12,10 +12,10 @@ Subject: [PATCH] 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 21270b7..e07855b 100644 +index dbb4155..f4cd5a9 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml -@@ -77,7 +77,7 @@ +@@ -83,7 +83,7 @@ test @@ -89,10 +89,10 @@ 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..6823ae2 100644 +index bcda50a..37a281c 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 @@ import org.apache.maven.wagon.observers.AbstractTransferListener; +@@ -45,7 +45,7 @@ import org.apache.maven.wagon.observers.Debug; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -101,7 +101,7 @@ index bcda50a..6823ae2 100644 /** * @author Michal Maczka -@@ -162,15 +162,14 @@ public class DefaultWagonManagerTest +@@ -162,15 +162,14 @@ public void testGetRemoteJar() StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" ); wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" ); @@ -120,18 +120,18 @@ index bcda50a..6823ae2 100644 private Artifact createTestPomArtifact( String directory ) diff --git a/pom.xml b/pom.xml -index 19edb60..06e6256 100644 +index 701e727..71e6d5a 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ - 2.4.2 + 2.5.1 1.2 - 1.2_Java1.3 + 3.2 3.8.2 1.5.5 - 1.16 + 1.19 @@ -320,7 +320,7 @@ @@ -142,5 +142,5 @@ index 19edb60..06e6256 100644 ${easyMockVersion} test -- -1.8.3.1 +1.8.1.4 diff --git a/0001-Update-Aether-to-0.9.0.M3.patch b/0001-Update-Aether-to-0.9.0.M3.patch index 37b31ef..f39e1fc 100644 --- a/0001-Update-Aether-to-0.9.0.M3.patch +++ b/0001-Update-Aether-to-0.9.0.M3.patch @@ -1,7 +1,7 @@ -From 51bc34848a46cca087fa7872b92af12a89415708 Mon Sep 17 00:00:00 2001 +From 9874d5c9fb80c779682ffc5f8dd45435a17546ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 12 Aug 2013 08:49:19 +0200 -Subject: [PATCH] Update Aether to 0.9.0.M3 +Subject: [PATCH 3/3] Update Aether to 0.9.0.M3 --- apache-maven/pom.xml | 6 +++++- @@ -11,10 +11,10 @@ Subject: [PATCH] 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 49ab2e9..9ecc868 100644 +index 4a53643..0b56fa8 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml -@@ -81,7 +81,11 @@ +@@ -87,7 +87,11 @@ org.eclipse.aether @@ -28,11 +28,11 @@ index 49ab2e9..9ecc868 100644 org.slf4j diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml -index 1bb1126..90aa2a2 100644 +index a5c460a..62ce127 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml -@@ -64,7 +64,12 @@ under the License. - +@@ -91,7 +91,12 @@ under the License. + org.eclipse.aether - aether-connector-wagon @@ -46,10 +46,10 @@ index 1bb1126..90aa2a2 100644 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml -index 21270b7..74551c9 100644 +index f4cd5a9..ee6ace7 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml -@@ -73,7 +73,12 @@ +@@ -79,7 +79,12 @@ org.eclipse.aether @@ -64,16 +64,16 @@ index 21270b7..74551c9 100644 diff --git a/pom.xml b/pom.xml -index 19edb60..c4f724c 100644 +index 71e6d5a..889ba1d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.7 - 1.7 + 1.8.1 1.3 - 0.9.0.M2 + 0.9.0.M3 - 1.7.4 + 1.7.5 true @@ -284,7 +284,12 @@ diff --git a/0005-Use-generics-in-modello-generated-code.patch b/0005-Use-generics-in-modello-generated-code.patch index b2d3310..abf1519 100644 --- a/0005-Use-generics-in-modello-generated-code.patch +++ b/0005-Use-generics-in-modello-generated-code.patch @@ -1,18 +1,18 @@ -From 1c572bcc5083b79307ab0c0e4ee9ba15e334c7d3 Mon Sep 17 00:00:00 2001 +From a19f7488a64486c5d9ace8c681a963da92b9e269 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 31 Jan 2012 13:12:32 +0100 -Subject: [PATCH 5/6] Use generics in modello generated code +Subject: [PATCH 1/3] Use generics in modello generated code --- - maven-model/pom.xml | 2 ++ - pom.xml | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 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 63b2d23..951cd57 100644 +index 7fd718f..b8781b6 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml -@@ -50,6 +50,7 @@ under the License. +@@ -56,6 +56,7 @@ under the License. src/main/mdo/maven.mdo @@ -20,7 +20,7 @@ index 63b2d23..951cd57 100644 -@@ -97,6 +98,7 @@ under the License. +@@ -103,6 +104,7 @@ under the License. 3.0.0 true @@ -29,10 +29,10 @@ index 63b2d23..951cd57 100644 diff --git a/pom.xml b/pom.xml -index 8cba9cc..c55f33c 100644 +index 922976f..701e727 100644 --- a/pom.xml +++ b/pom.xml -@@ -424,6 +424,9 @@ +@@ -382,6 +382,9 @@ org.codehaus.modello modello-maven-plugin ${modelloVersion} @@ -43,5 +43,5 @@ index 8cba9cc..c55f33c 100644 site-docs -- -1.7.7.6 +1.8.1.4 diff --git a/maven.spec b/maven.spec index c9c6c44..5dadf3f 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven -Version: 3.1.0 -Release: 9%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -20,9 +20,6 @@ Patch101: 0001-Migrate-from-easymock-1-to-easymock-3.patch # Forwarded upstream (MNG-5502) Patch200: 0001-Update-Aether-to-0.9.0.M3.patch -# Taken from upstream git (commit 11f46bd, MNG-5503) -Patch300: 0001-MNG-5503-Fix-for-the-issue-where-Maven-3.1.0-fails-t.patch - BuildArch: noarch BuildRequires: maven-local @@ -71,6 +68,7 @@ BuildRequires: sisu-plexus >= 1:0 BuildRequires: slf4j BuildRequires: xmlunit BuildRequires: mvn(ch.qos.logback:logback-classic) +BuildRequires: mvn(org.mockito:mockito-core) # Theoretically Maven might be usable with just JRE, but typical Maven # workflow requires full JDK, wso we require it here. @@ -104,7 +102,6 @@ Group: Documentation %patch100 -p1 %patch101 -p1 %patch200 -p1 -%patch300 -p1 # not really used during build, but a precaution rm maven-ant-tasks-*.jar @@ -206,7 +203,7 @@ ln -sf $(build-classpath plexus/classworlds) \ %files -f .mfiles -%doc LICENSE.txt NOTICE.txt README.txt +%doc LICENSE NOTICE README.txt %{_datadir}/%{name} %{_bindir}/mvn %dir %{_javadir}/%{name} @@ -219,10 +216,14 @@ ln -sf $(build-classpath plexus/classworlds) \ %{_mandir}/man1/mvn.1.gz %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%doc LICENSE NOTICE %changelog +* Mon Oct 7 2013 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 +- Remove patch for MNG-5503 (included upstream) + * Mon Sep 23 2013 Mikolaj Izdebski - 3.1.0-9 - Synchronize JAR list in lib/ with upstream release - Remove test dependencies on aopalliance and cglib diff --git a/sources b/sources index c1050a8..2517a95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c1acfb942763cf190eb5ce3742f6ba3 apache-maven-3.1.0-src.tar.gz +46e0b798750df60aa157d7b38a10265c apache-maven-3.1.1-src.tar.gz From 81679b6327747d924a2194ab907e21d71d7ad2af Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 21 Oct 2013 13:18:23 +0200 Subject: [PATCH 2/5] Add dependencies of wagon-http-shaded to plexus.core - Remove objectweb-asm from plexus.core --- maven.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/maven.spec b/maven.spec index 5dadf3f..9e0a76f 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -32,7 +32,9 @@ BuildRequires: aether-util >= 1:0 BuildRequires: aether-transport-wagon >= 1:0 BuildRequires: aopalliance BuildRequires: apache-commons-cli +BuildRequires: apache-commons-codec BuildRequires: apache-commons-jxpath +BuildRequires: apache-commons-logging BuildRequires: apache-resource-bundles BuildRequires: atinject BuildRequires: buildnumber-maven-plugin @@ -40,6 +42,8 @@ BuildRequires: cglib BuildRequires: easymock3 BuildRequires: google-guice >= 3.0 BuildRequires: hamcrest +BuildRequires: httpcomponents-core +BuildRequires: httpcomponents-client BuildRequires: jsr-305 BuildRequires: junit BuildRequires: maven-assembly-plugin @@ -54,7 +58,6 @@ BuildRequires: maven-site-plugin BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-wagon >= 2.5-2 -BuildRequires: objectweb-asm BuildRequires: plexus-cipher BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations @@ -173,13 +176,11 @@ ln -sf $(build-classpath plexus/classworlds) \ (cd %{buildroot}%{_datadir}/%{name}/lib build-jar-repository -s -p . \ aether/aether-api \ - aether/aether-connector-basic \ + aether/aether-connector-basic aether/aether-transport-wagon \ aether/aether-impl \ aether/aether-spi \ aether/aether-util \ - aether/aether-transport-wagon \ aopalliance \ - objectweb-asm \ cdi-api \ commons-cli \ guava \ @@ -199,6 +200,11 @@ ln -sf $(build-classpath plexus/classworlds) \ maven-wagon/file \ maven-wagon/http-shaded \ maven-wagon/provider-api \ + \ + httpcomponents/httpclient \ + httpcomponents/httpcore \ + commons-logging \ + commons-codec \ ) @@ -220,6 +226,10 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Mon Oct 21 2013 Mikolaj Izdebski - 3.1.1-2 +- Add dependencies of wagon-http-shaded to plexus.core +- Remove objectweb-asm from plexus.core + * Mon Oct 7 2013 Mikolaj Izdebski - 3.1.1-1 - Update to upstream version 3.1.1 - Remove patch for MNG-5503 (included upstream) From a104903f93923002b8a53fdd6dbd724dfef70cb1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Oct 2013 11:15:50 +0200 Subject: [PATCH 3/5] Rebuild to regenerate broken POM files - Related: rhbz#1021484 --- maven.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maven.spec b/maven.spec index 9e0a76f..59e0a50 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -226,6 +226,10 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Wed Oct 23 2013 Mikolaj Izdebski - 3.1.1-3 +- Rebuild to regenerate broken POM files +- Related: rhbz#1021484 + * Mon Oct 21 2013 Mikolaj Izdebski - 3.1.1-2 - Add dependencies of wagon-http-shaded to plexus.core - Remove objectweb-asm from plexus.core From 995d31535b3499271bd6fdbc6f4e923b9ec3bd8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 29 Oct 2013 12:38:41 +0100 Subject: [PATCH 4/5] Add explicit requires --- maven.spec | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/maven.spec b/maven.spec index 59e0a50..a2c2b6a 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -77,6 +77,40 @@ BuildRequires: mvn(org.mockito:mockito-core) # workflow requires full JDK, wso we require it here. Requires: java-devel +# XMvn does generate auto-requires, but explicit requires are still +# needed because some symlinked JARs are not present in Maven POMs or +# their dependency scope prevents them from being added automatically +# by XMvn. It would be possible to explicitly specify only +# dependencies which are not generated automatically, but adding +# everything seems to be easier. +Requires: aether-api +Requires: aether-connector-basic +Requires: aether-impl +Requires: aether-spi +Requires: aether-transport-wagon +Requires: aether-util +Requires: aopalliance +Requires: apache-commons-cli +Requires: apache-commons-codec +Requires: apache-commons-logging +Requires: atinject +Requires: geronimo-annotation +Requires: google-guice +Requires: guava +Requires: httpcomponents-client +Requires: httpcomponents-core +Requires: jsr-305 +Requires: maven-wagon +Requires: plexus-cipher +Requires: plexus-classworlds +Requires: plexus-containers-component-annotations +Requires: plexus-interpolation +Requires: plexus-sec-dispatcher +Requires: plexus-utils +Requires: sisu-inject +Requires: sisu-plexus +Requires: slf4j + # for noarch->arch change Obsoletes: %{name} < 0:%{version}-%{release} @@ -226,6 +260,9 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Tue Oct 29 2013 Mikolaj Izdebski - 3.1.1-4 +- Add explicit requires + * Wed Oct 23 2013 Mikolaj Izdebski - 3.1.1-3 - Rebuild to regenerate broken POM files - Related: rhbz#1021484 From 5f933c9f1c73b539f69128995517feaa01df0e13 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2013 17:10:31 +0100 Subject: [PATCH 5/5] Add OrderWithRequires: xmvn - Related: rhbz#1014355 --- maven.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/maven.spec b/maven.spec index a2c2b6a..533fa4f 100644 --- a/maven.spec +++ b/maven.spec @@ -1,6 +1,6 @@ Name: maven Version: 3.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java project management and project comprehension tool Group: Development/Tools @@ -22,6 +22,10 @@ Patch200: 0001-Update-Aether-to-0.9.0.M3.patch BuildArch: noarch +# If XMvn is part of the same RPM transaction then it should be +# installed first to avoid triggering rhbz#1014355. +OrderWithRequires: xmvn + BuildRequires: maven-local BuildRequires: aether-api >= 1:0 @@ -260,6 +264,10 @@ ln -sf $(build-classpath plexus/classworlds) \ %changelog +* Tue Nov 5 2013 Mikolaj Izdebski - 3.1.1-5 +- Add OrderWithRequires: xmvn +- Related: rhbz#1014355 + * Tue Oct 29 2013 Mikolaj Izdebski - 3.1.1-4 - Add explicit requires