You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/22 09:51:17 UTC
svn commit: r191781 - in /maven/components/trunk/maven-artifact/src:
main/java/org/apache/maven/artifact/resolver/
test/java/org/apache/maven/artifact/resolver/
Author: brett
Date: Wed Jun 22 00:51:16 2005
New Revision: 191781
URL: http://svn.apache.org/viewcvs?rev=191781&view=rev
Log:
implement managed versions in tests
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/LegacyArtifactCollector.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=191781&r1=191780&r2=191781&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java Wed Jun 22 00:51:16 2005
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Set;
+import java.util.Map;
/**
* Artifact collector - takes a set of original artifacts and resolves all of the best versions to use
@@ -39,7 +40,7 @@
ArtifactFactory artifactFactory )
throws ArtifactResolutionException;
- ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Set managedVersions,
+ ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions,
ArtifactRepository localRepository, List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
ArtifactFactory artifactFactory )
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=191781&r1=191780&r2=191781&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Wed Jun 22 00:51:16 2005
@@ -47,11 +47,11 @@
ArtifactFactory artifactFactory )
throws ArtifactResolutionException
{
- return collect( artifacts, originatingArtifact, Collections.EMPTY_SET, localRepository, remoteRepositories,
+ return collect( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories,
source, filter, artifactFactory );
}
- public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Set managedVersions,
+ public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions,
ArtifactRepository localRepository, List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
ArtifactFactory artifactFactory )
@@ -62,7 +62,8 @@
ResolutionNode root = new ResolutionNode( originatingArtifact );
root.addDependencies( artifacts, filter );
- recurse( root, resolvedArtifacts, localRepository, remoteRepositories, source, filter, artifactFactory );
+ recurse( root, resolvedArtifacts, managedVersions, localRepository, remoteRepositories, source, filter,
+ artifactFactory );
Set set = new HashSet();
@@ -82,12 +83,19 @@
return result;
}
- private void recurse( ResolutionNode node, Map resolvedArtifacts, ArtifactRepository localRepository,
- List remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter,
- ArtifactFactory artifactFactory )
+ private void recurse( ResolutionNode node, Map resolvedArtifacts, Map managedVersions,
+ ArtifactRepository localRepository, List remoteRepositories, ArtifactMetadataSource source,
+ ArtifactFilter filter, ArtifactFactory artifactFactory )
throws ArtifactResolutionException
{
- ResolutionNode previous = (ResolutionNode) resolvedArtifacts.get( node.getKey() );
+ // TODO: conflict resolvers, shouldn't be munging original artifact perhaps?
+ Object key = node.getKey();
+ if ( managedVersions.containsKey( key ) )
+ {
+ node.getArtifact().setVersion( (String) managedVersions.get( key ) );
+ }
+
+ ResolutionNode previous = (ResolutionNode) resolvedArtifacts.get( key );
if ( previous != null )
{
// TODO: conflict resolvers
@@ -158,7 +166,7 @@
}
}
- resolvedArtifacts.put( node.getKey(), node );
+ resolvedArtifacts.put( key, node );
for ( Iterator i = node.getChildrenIterator(); i.hasNext(); )
{
@@ -176,7 +184,7 @@
remoteRepositories, e );
}
- recurse( child, resolvedArtifacts, localRepository, remoteRepositories, source, filter,
+ recurse( child, resolvedArtifacts, managedVersions, localRepository, remoteRepositories, source, filter,
artifactFactory );
}
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/LegacyArtifactCollector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/LegacyArtifactCollector.java?rev=191781&r1=191780&r2=191781&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/LegacyArtifactCollector.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/LegacyArtifactCollector.java Wed Jun 22 00:51:16 2005
@@ -48,11 +48,11 @@
ArtifactFactory artifactFactory )
throws ArtifactResolutionException
{
- return collect( artifacts, originatingArtifact, Collections.EMPTY_SET, localRepository, remoteRepositories,
+ return collect( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories,
source, filter, artifactFactory );
}
- public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Set managedVersions,
+ public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions,
ArtifactRepository localRepository, List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
ArtifactFactory artifactFactory )
Modified: maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=191781&r1=191780&r2=191781&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java Wed Jun 22 00:51:16 2005
@@ -65,7 +65,7 @@
this.projectArtifact = createArtifact( "project", "1.0", null );
}
- public void disabledtestCircularDependencyNotIncludingCurrentProject()
+ public void testCircularDependencyNotIncludingCurrentProject()
throws ArtifactResolutionException
{
ArtifactSpec a = createArtifact( "a", "1.0" );
@@ -82,7 +82,7 @@
}
}
- public void disabledtestCircularDependencyIncludingCurrentProject()
+ public void testCircularDependencyIncludingCurrentProject()
throws ArtifactResolutionException
{
ArtifactSpec a = createArtifact( "a", "1.0" );
@@ -132,7 +132,7 @@
res.getArtifacts() );
}
- public void disabledtestResolveManagedVersion()
+ public void testResolveManagedVersion()
throws ArtifactResolutionException
{
ArtifactSpec a = createArtifact( "a", "1.0" );
@@ -284,9 +284,10 @@
private ArtifactResolutionResult collect( ArtifactSpec a, Artifact managedVersion )
throws ArtifactResolutionException
{
+ Map managedVersions = Collections.singletonMap( managedVersion.getDependencyConflictId(),
+ managedVersion.getVersion() );
return artifactCollector.collect( Collections.singleton( a.artifact ), projectArtifact.artifact,
- Collections.singleton( managedVersion ), null, null, source, null,
- artifactFactory );
+ managedVersions, null, null, source, null, artifactFactory );
}
private ArtifactSpec createArtifact( String id, String version )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org