You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jd...@apache.org on 2004/11/03 23:56:42 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/artifact MavenMetadataSource.java
jdcasey 2004/11/03 14:56:42
Modified: maven-core/src/main/java/org/apache/maven/artifact
MavenMetadataSource.java
Log:
o Add the model's parent to the set of artifacts to be resolved. This will allow dependency poms' parent-poms' dependencies to be included in the build classpath as implicit dependencies.
Revision Changes Path
1.5 +14 -3 maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
Index: MavenMetadataSource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenMetadataSource.java 7 Oct 2004 10:00:55 -0000 1.4
+++ MavenMetadataSource.java 3 Nov 2004 22:56:42 -0000 1.5
@@ -13,6 +13,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
/*
@@ -73,7 +74,7 @@
Model model = reader.read( new FileReader( metadataArtifact.getFile() ) );
- artifacts = createArtifacts( model.getDependencies(), localRepository );
+ artifacts = createArtifacts( model, localRepository );
}
catch ( ArtifactResolutionException e )
{
@@ -87,10 +88,20 @@
return artifacts;
}
- public Set createArtifacts( List dependencies, ArtifactRepository localRepository )
+ public Set createArtifacts( Model model, ArtifactRepository localRepository )
{
Set projectArtifacts = new HashSet();
+
+ Parent parent = model.getParent();
+ if(parent != null)
+ {
+ projectArtifacts.add( new DefaultArtifact( parent.getGroupId(),
+ parent.getArtifactId(),
+ parent.getVersion(),
+ "pom" ) );
+ }
+ List dependencies = model.getDependencies();
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();