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/08/24 17:07:06 UTC
svn commit: r239682 - in /maven/components/trunk: maven-artifact-ant/
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/
maven-artifact/src/main/java/org/apache/maven...
Author: brett
Date: Wed Aug 24 08:06:54 2005
New Revision: 239682
URL: http://svn.apache.org/viewcvs?rev=239682&view=rev
Log:
PR: MNG-634
add a "useScope" attribute to the dependencies task so that you can determine what dependency set you want
Modified:
maven/components/trunk/maven-artifact-ant/sample.build.xml
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=239682&r1=239681&r2=239682&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/sample.build.xml (original)
+++ maven/components/trunk/maven-artifact-ant/sample.build.xml Wed Aug 24 08:06:54 2005
@@ -74,6 +74,14 @@
<fileset refid="my.dependency.fileset"/>
</copy>
+ <artifact:dependencies filesetId="my.compile.dependency.fileset" useScope="compile">
+ <pom refid="maven.project"/>
+ </artifact:dependencies>
+
+ <copy todir="target/my-compile-dependencies">
+ <fileset refid="my.compile.dependency.fileset"/>
+ </copy>
+
<property name="outJar" value="${maven.project.build.directory}/${maven.project.build.finalName}.jar"/>
<artifact:install file="${outJar}">
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=239682&r1=239681&r2=239682&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Wed Aug 24 08:06:54 2005
@@ -24,6 +24,8 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
@@ -38,6 +40,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -57,6 +60,8 @@
private String filesetId;
+ private String useScope;
+
private boolean verbose;
/**
@@ -130,9 +135,14 @@
remoteRepositories.add( remoteRepository );
List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories );
- // TODO: managed dependencies
- result = resolver.resolveTransitively( artifacts, pomArtifact, remoteArtifactRepositories, localRepo,
- metadataSource, listeners );
+
+ // TODO: managed dependencies
+ Map managedDependencies = Collections.EMPTY_MAP;
+
+ ArtifactFilter filter = useScope != null ? new ScopeArtifactFilter( useScope ) : null;
+
+ result = resolver.resolveTransitively( artifacts, pomArtifact, managedDependencies, localRepo,
+ remoteArtifactRepositories, metadataSource, filter, listeners );
}
catch ( ArtifactResolutionException e )
{
@@ -234,5 +244,10 @@
public void setVerbose( boolean verbose )
{
this.verbose = verbose;
+ }
+
+ public void setUseScope( String useScope )
+ {
+ this.useScope = useScope;
}
}
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=239682&r1=239681&r2=239682&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Wed Aug 24 08:06:54 2005
@@ -46,7 +46,7 @@
// ----------------------------------------------------------------------
private WagonManager wagonManager;
-
+
private ArtifactTransformationManager transformationManager;
protected ArtifactFactory artifactFactory;
@@ -109,10 +109,12 @@
{
wagonManager.getArtifact( artifact, remoteRepositories );
}
-
+
if ( !artifact.isResolved() )
{
- throw new ArtifactResolutionException( "Failed to resolve artifact, possibly due to a repository list that is not appropriately equipped for this artifact's metadata.", artifact, remoteRepositories );
+ throw new ArtifactResolutionException(
+ "Failed to resolve artifact, possibly due to a repository list that is not appropriately equipped for this artifact's metadata.",
+ artifact, remoteRepositories );
}
// must be after the artifact is downloaded
@@ -182,10 +184,10 @@
}
- private ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact,
- Map managedVersions, ArtifactRepository localRepository,
- List remoteRepositories, ArtifactMetadataSource source,
- ArtifactFilter filter, List listeners )
+ public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact,
+ Map managedVersions, ArtifactRepository localRepository,
+ List remoteRepositories, ArtifactMetadataSource source,
+ ArtifactFilter filter, List listeners )
throws ArtifactResolutionException
{
ArtifactResolutionResult artifactResolutionResult;
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java?rev=239682&r1=239681&r2=239682&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java Wed Aug 24 08:06:54 2005
@@ -64,6 +64,11 @@
ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException;
+ ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions,
+ ArtifactRepository localRepository, List remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter, List listeners )
+ throws ArtifactResolutionException;
+
void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org