Author: bentmann
Date: Fri Oct 30 18:13:26 2009
New Revision: 831410
URL:
http://svn.apache.org/viewvc?rev=831410&view=revLog:
o Fixed backward-compat
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=831410&r1=831409&r2=831410&view=diff==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Fri Oct 30 18:13:26 2009
@@ -25,7 +25,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -64,6 +63,8 @@
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.util.StringUtils;
@@ -237,22 +238,9 @@
//TODO: need to integrate the effective scope and refactor it out of the MMS
@Deprecated
public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope, ArtifactFilter filter )
+ throws InvalidDependencyVersionException
{
- Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
-
- for ( Dependency d : getDependencies() )
- {
- Artifact dependencyArtifact =
- repositorySystem.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(),
- d.getType() );
-
- if ( filter == null || filter.include( dependencyArtifact ) )
- {
- artifacts.add( dependencyArtifact );
- }
- }
-
- return artifacts;
+ return MavenMetadataSource.createArtifacts( artifactFactory, getDependencies(), inheritedScope, filter, this );
}
// TODO: Find a way to use <relativePath/> here...it's tricky, because the moduleProject