|
 |
57f329 |
From c36cd3c3eaad3ce9486d7c49c50b9d309a0d5fe1 Mon Sep 17 00:00:00 2001
|
|
|
57f329 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
57f329 |
Date: Tue, 24 Nov 2015 12:59:13 +0100
|
|
|
57f329 |
Subject: [PATCH 2/2] Port to current maven-artifact
|
|
|
57f329 |
|
|
|
57f329 |
---
|
|
|
57f329 |
.../apache/maven/plugin/testing/stubs/StubArtifactCollector.java | 6 +++---
|
|
|
57f329 |
.../org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java | 6 +++---
|
|
|
57f329 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
57f329 |
|
|
|
57f329 |
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
|
|
|
57f329 |
index be7e156..c6a059e 100644
|
|
|
57f329 |
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
|
|
|
57f329 |
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
|
|
|
57f329 |
@@ -51,7 +51,7 @@ public class StubArtifactCollector
|
|
|
57f329 |
}
|
|
|
57f329 |
|
|
|
57f329 |
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactResolutionRequest repositoryRequest,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest,
|
|
|
57f329 |
ArtifactMetadataSource source, ArtifactFilter filter,
|
|
|
57f329 |
List<ResolutionListener> listeners,
|
|
|
57f329 |
List<ConflictResolver> conflictResolvers )
|
|
|
57f329 |
@@ -60,7 +60,7 @@ public class StubArtifactCollector
|
|
|
57f329 |
}
|
|
|
57f329 |
|
|
|
57f329 |
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
List<ArtifactRepository> remoteRepositories,
|
|
|
57f329 |
ArtifactMetadataSource source, ArtifactFilter filter,
|
|
|
57f329 |
List<ResolutionListener> listeners,
|
|
|
57f329 |
@@ -70,7 +70,7 @@ public class StubArtifactCollector
|
|
|
57f329 |
}
|
|
|
57f329 |
|
|
|
57f329 |
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
List<ArtifactRepository> remoteRepositories,
|
|
|
57f329 |
ArtifactMetadataSource source, ArtifactFilter filter,
|
|
|
57f329 |
List<ResolutionListener> listeners )
|
|
|
57f329 |
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
|
|
|
57f329 |
index cc02ec0..2d90152 100644
|
|
|
57f329 |
--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
|
|
|
57f329 |
+++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
|
|
|
57f329 |
@@ -141,7 +141,7 @@ public class StubArtifactResolver
|
|
|
57f329 |
* @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)
|
|
|
57f329 |
*/
|
|
|
57f329 |
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source )
|
|
|
57f329 |
throws ArtifactResolutionException, ArtifactNotFoundException
|
|
|
57f329 |
{
|
|
|
57f329 |
@@ -153,7 +153,7 @@ public class StubArtifactResolver
|
|
|
57f329 |
* @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)
|
|
|
57f329 |
*/
|
|
|
57f329 |
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
|
|
|
57f329 |
ArtifactFilter filter )
|
|
|
57f329 |
throws ArtifactResolutionException, ArtifactNotFoundException
|
|
|
57f329 |
@@ -166,7 +166,7 @@ public class StubArtifactResolver
|
|
|
57f329 |
* @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)
|
|
|
57f329 |
*/
|
|
|
57f329 |
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
|
|
57f329 |
- Map managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
|
|
|
57f329 |
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source,
|
|
|
57f329 |
ArtifactFilter filter, List<ResolutionListener> listeners )
|
|
|
57f329 |
throws ArtifactResolutionException, ArtifactNotFoundException
|
|
|
57f329 |
--
|
|
|
57f329 |
2.5.0
|
|
|
57f329 |
|