You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/25 21:40:29 UTC
svn commit: r747913 - in
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project:
MavenProject.java artifact/MavenMetadataSource.java
Author: jvanzyl
Date: Wed Feb 25 20:40:28 2009
New Revision: 747913
URL: http://svn.apache.org/viewvc?rev=747913&view=rev
Log:
o remove MavenMetadataSource's static call
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=747913&r1=747912&r2=747913&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Wed Feb 25 20:40:28 2009
@@ -1661,7 +1661,7 @@
public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope, ArtifactFilter dependencyFilter )
throws InvalidDependencyVersionException
{
- return MavenMetadataSource.createArtifacts( artifactFactory, getDependencies(), inheritedScope, dependencyFilter, this );
+ return repositorySystem.createArtifacts( getDependencies(), inheritedScope, dependencyFilter, this );
}
public void addProjectReference( MavenProject project )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=747913&r1=747912&r2=747913&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Feb 25 20:40:28 2009
@@ -454,92 +454,6 @@
return repositories;
}
- /**
- * @return {@link Set} < {@link Artifact} >
- * @todo desperately needs refactoring. It's just here because it's implementation is maven-project specific
- */
- public static Set<Artifact> createArtifacts( ArtifactFactory artifactFactory,
- List<Dependency> dependencies,
- String inheritedScope,
- ArtifactFilter dependencyFilter,
- MavenRepositoryWrapper reactor )
- throws InvalidDependencyVersionException
- {
- Set<Artifact> projectArtifacts = new LinkedHashSet<Artifact>( dependencies.size() );
-
- for ( Iterator<Dependency> i = dependencies.iterator(); i.hasNext(); )
- {
- Dependency d = i.next();
-
- String scope = d.getScope();
-
- if ( StringUtils.isEmpty( scope ) )
- {
- scope = Artifact.SCOPE_COMPILE;
-
- d.setScope( scope );
- }
-
- VersionRange versionRange;
- try
- {
- versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new InvalidDependencyVersionException( reactor.getId(), d, reactor.getFile(), e );
- }
- Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(),
- versionRange, d.getType(), d.getClassifier(),
- scope, inheritedScope, d.isOptional() );
-
- if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
- {
- artifact.setFile( new File( d.getSystemPath() ) );
- }
-
- ArtifactFilter artifactFilter = dependencyFilter;
-
- if ( ( artifact != null ) && ( ( artifactFilter == null ) || artifactFilter.include( artifact ) ) )
- {
- if ( ( d.getExclusions() != null ) && !d.getExclusions().isEmpty() )
- {
- List<String> exclusions = new ArrayList<String>();
- for ( Iterator<Exclusion> j = d.getExclusions().iterator(); j.hasNext(); )
- {
- Exclusion e = j.next();
- exclusions.add( e.getGroupId() + ":" + e.getArtifactId() );
- }
-
- ArtifactFilter newFilter = new ExcludesArtifactFilter( exclusions );
-
- if ( artifactFilter != null )
- {
- AndArtifactFilter filter = new AndArtifactFilter();
- filter.add( artifactFilter );
- filter.add( newFilter );
- artifactFilter = filter;
- }
- else
- {
- artifactFilter = newFilter;
- }
- }
-
- artifact.setDependencyFilter( artifactFilter );
-
- if ( reactor != null )
- {
- artifact = reactor.find( artifact );
- }
-
- projectArtifacts.add( artifact );
- }
- }
-
- return projectArtifacts;
- }
-
public List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException