rpms/maven
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patches

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-09-29 13:07:49 +02:00
parent 4778f3905e
commit 26ebec7ce0
5 changed files with 66 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
0002-Migrate-from-easymock-1-to-easymock-3.patch → 0001-MNG-5696-Remove-dependency-on-Easymock.patch
View File

@ -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 <mizdebsk@redhat.com>
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 @@
<artifactId>aether-connector-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
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 <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@@ -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 @@
<maven.compiler.target>1.6</maven.compiler.target>
<classWorldsVersion>2.5.1</classWorldsVersion>
<commonsCliVersion>1.2</commonsCliVersion>
- <easyMockVersion>1.2_Java1.3</easyMockVersion>
+ <easyMockVersion>3.2</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.19</plexusInterpolationVersion>
@@ -344,7 +344,7 @@
@@ -342,14 +341,6 @@
<artifactId>plexus-cipher</artifactId>
<version>${cipherVersion}</version>
</dependency>
<!--bootstrap-start-comment-->
<dependency>
- <!--bootstrap-start-comment-->
- <dependency>
- <groupId>easymock</groupId>
+ <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easyMockVersion}</version>
<scope>test</scope>
- <artifactId>easymock</artifactId>
- <version>${easyMockVersion}</version>
- <scope>test</scope>
- </dependency>
- <!--bootstrap-end-comment-->
</dependencies>
<!--bootstrap-start-comment-->
</dependencyManagement>
--
1.9.3

47
0001-Use-generics-in-modello-generated-code.patch
View File

@ -1,47 +0,0 @@
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/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.
<models>
<model>src/main/mdo/maven.mdo</model>
</models>
+ <useJava5>true</useJava5>
</configuration>
<executions>
<execution>
@@ -103,6 +104,7 @@ under the License.
<configuration>
<version>3.0.0</version>
<packageWithVersion>true</packageWithVersion>
+ <useJava5>true</useJava5>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 6576a25..ccf6f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,6 +399,9 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>${modelloVersion}</version>
+ <configuration>
+ <useJava5>true</useJava5>
+ </configuration>
<executions>
<execution>
<id>site-docs</id>
--
1.9.3

18
0003-Update-Aether-to-0.9.0.M3.patch → 0002-Update-Aether-to-0.9.0.M3.patch
View File

@ -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 <mizdebsk@redhat.com>
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
<dependency>
<groupId>org.slf4j</groupId>
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
</dependency>
<dependency>
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
+ <artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
</dependencies>
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 @@
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
@ -76,7 +76,7 @@ index 760e6c2..148b8ce 100644
<slf4jVersion>1.7.5</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
@@ -308,7 +308,12 @@
@@ -307,7 +307,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>

22
0004-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch → 0003-Update-to-Sisu-0.1.0-and-Guice-3.1.6.patch
View File

@ -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 <mizdebsk@redhat.com>
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
<dependency>
<groupId>commons-cli</groupId>
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
<dependency>
<groupId>org.eclipse.aether</groupId>
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
<artifactId>plexus-component-annotations</artifactId>
</dependency>
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
<artifactId>plexus-interpolation</artifactId>
</dependency>
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
<artifactId>plexus-component-annotations</artifactId>
</dependency>
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
<artifactId>xmlunit</artifactId>
<version>1.3</version>
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
<build>
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 @@
<plexusUtilsVersion>3.0.17</plexusUtilsVersion>
<!-- Latest version of Guava that works with Sisu -->
<guavaVersion>14.0.1</guavaVersion>

19
maven.spec
View File

@ -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 <mizdebsk@redhat.com> - 3.2.3-2
- Update patches
* Fri Aug 22 2014 Michal Srb <msrb@redhat.com> - 3.2.3-1
- Update to upstream version 3.2.3