Port to current maven-artifact
This commit is contained in:
Michael Simacek
parent
31d66ef616
commit
0067b6ea1b
@ -1,7 +1,7 @@
|
||||
From 30148a1592f5f6f2626b977cc57ada82c94608fa Mon Sep 17 00:00:00 2001
|
||||
From a64a54900d64d7f2b699979a8abd46506d6779ad Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Fri, 27 Mar 2015 06:51:35 +0100
|
||||
Subject: [PATCH] Port to plexus-utils 3.0.21
|
||||
Subject: [PATCH 1/2] Port to plexus-utils 3.0.21
|
||||
|
||||
---
|
||||
.../main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java | 2 +-
|
||||
@ -22,7 +22,7 @@ index 8b047a7..4d35dc4 100644
|
||||
PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationFilterReader );
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 5f91fad..0731a02 100644
|
||||
index 0aab541..d0f0e7e 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -194,7 +194,7 @@ under the License.
|
||||
@ -35,5 +35,5 @@ index 5f91fad..0731a02 100644
|
||||
</dependency>
|
||||
|
||||
--
|
||||
2.1.0
|
||||
2.5.0
|
||||
|
||||
|
||||
75
0002-Port-to-current-maven-artifact.patch
Normal file
75
0002-Port-to-current-maven-artifact.patch
Normal file
@ -0,0 +1,75 @@
|
||||
From c36cd3c3eaad3ce9486d7c49c50b9d309a0d5fe1 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Tue, 24 Nov 2015 12:59:13 +0100
|
||||
Subject: [PATCH 2/2] Port to current maven-artifact
|
||||
|
||||
---
|
||||
.../apache/maven/plugin/testing/stubs/StubArtifactCollector.java | 6 +++---
|
||||
.../org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
|
||||
index be7e156..c6a059e 100644
|
||||
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
|
||||
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
|
||||
@@ -51,7 +51,7 @@ public class StubArtifactCollector
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactResolutionRequest repositoryRequest,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners,
|
||||
List<ConflictResolver> conflictResolvers )
|
||||
@@ -60,7 +60,7 @@ public class StubArtifactCollector
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactRepository localRepository,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners,
|
||||
@@ -70,7 +70,7 @@ public class StubArtifactCollector
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactRepository localRepository,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners )
|
||||
diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
|
||||
index cc02ec0..2d90152 100644
|
||||
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
|
||||
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
|
||||
@@ -141,7 +141,7 @@ public class StubArtifactResolver
|
||||
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource)
|
||||
*/
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactRepository localRepository,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
@@ -153,7 +153,7 @@ public class StubArtifactResolver
|
||||
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter)
|
||||
*/
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactRepository localRepository,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
|
||||
ArtifactFilter filter )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
@@ -166,7 +166,7 @@ public class StubArtifactResolver
|
||||
* @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter, java.util.List)
|
||||
*/
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
- Map managedVersions, ArtifactRepository localRepository,
|
||||
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
|
||||
ArtifactFilter filter, List<ResolutionListener> listeners )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-plugin-testing
|
||||
Version: 3.3.0
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: Maven Plugin Testing
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugin-testing/
|
||||
@ -9,6 +9,7 @@ BuildArch: noarch
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0001-Port-to-plexus-utils-3.0.21.patch
|
||||
Patch1: 0002-Port-to-current-maven-artifact.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
@ -61,7 +62,10 @@ Framework to test Maven Plugins with Easymock objects.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
|
||||
sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
|
||||
@ -83,6 +87,9 @@ sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apa
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Nov 24 2015 Michael Simacek <msimacek@redhat.com> - 3.3.0-5
|
||||
- Port to current maven-artifact
|
||||
|
||||
* Fri Oct 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-4
|
||||
- Enable tests
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user