You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/09/15 01:04:34 UTC
svn commit: r814901 - in /maven/shared/trunk/maven-artifact-resolver: ./
src/test/java/org/apache/maven/shared/artifact/resolver/
src/test/java/org/apache/maven/shared/artifact/resolver/testutil/
Author: jdcasey
Date: Mon Sep 14 23:04:34 2009
New Revision: 814901
URL: http://svn.apache.org/viewvc?rev=814901&view=rev
Log:
Adding another IT, and updating to use version 12 of parent POM.
Modified:
maven/shared/trunk/maven-artifact-resolver/pom.xml
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/testutil/ModelCreator.java
Modified: maven/shared/trunk/maven-artifact-resolver/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/pom.xml?rev=814901&r1=814900&r2=814901&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-resolver/pom.xml Mon Sep 14 23:04:34 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-shared-components</artifactId>
<groupId>org.apache.maven.shared</groupId>
- <version>12-SNAPSHOT</version>
+ <version>12</version>
</parent>
<artifactId>maven-artifact-resolver</artifactId>
Modified: maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java?rev=814901&r1=814900&r2=814901&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java (original)
+++ maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java Mon Sep 14 23:04:34 2009
@@ -247,6 +247,36 @@
assertSingleArtifact( result, gid, aid, version );
}
+ @Test
+ public void ignoreUnbuiltInterdependency()
+ throws ArtifactResolutionException, ArtifactNotFoundException, IOException, ProjectBuildingException
+ {
+ String gid = "org.codehaus.plexus";
+ String aid = "plexus-utils";
+ String version = "1.5.15";
+
+ Model model1 = new ModelCreator().withDefaultCoordinate().withArtifactId( "child1" ).withDependency( gid, aid, version )
+ .getModel();
+ MavenProject project1 = writeAndBuild( model1, "pom.interdep-child-1.xml" );
+
+ Model model2 = new ModelCreator().withDefaultCoordinate().withArtifactId( "child2" ).withDependency( model1.getGroupId(),
+ model1.getArtifactId(),
+ model1.getVersion() )
+ .getModel();
+
+ MavenProject project2 = writeAndBuild( model2, "pom.interdep-child-2.xml" );
+
+ Set<MavenProject> projects = new LinkedHashSet<MavenProject>();
+ projects.add( project1 );
+ projects.add( project2 );
+
+ Collection<String> scopes = Collections.singleton( Artifact.SCOPE_COMPILE );
+
+ Set<Artifact> result = resolver.resolve( projects, scopes, session );
+
+ assertSingleArtifact( result, gid, aid, version );
+ }
+
private void assertSingleArtifact( Set<Artifact> result, String gid, String aid, String version )
{
assertNotNull( result );
Modified: maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/testutil/ModelCreator.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/testutil/ModelCreator.java?rev=814901&r1=814900&r2=814901&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/testutil/ModelCreator.java (original)
+++ maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/testutil/ModelCreator.java Mon Sep 14 23:04:34 2009
@@ -62,6 +62,12 @@
{
return withCoordinate( "group.id", "artifact-id", "1" );
}
+
+ public ModelCreator withArtifactId( String artifactId )
+ {
+ model.setArtifactId( artifactId );
+ return this;
+ }
public ModelCreator withManagedDependency( String groupId, String artifactId, String version )
{