Author: brett
Date: Tue Jun 7 08:51:25 2005
New Revision: 188803
URL: http://svn.apache.org/viewcvs?rev=188803&view=rev
Log:
PR: MNG-407
allow filtering of transitive dependencies
Removed:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Dependency.java
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
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=188803&r1=188802&r2=188803&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/sample.build.xml (original)
+++ maven/components/trunk/maven-artifact-ant/sample.build.xml Tue Jun 7
08:51:25 2005
@@ -13,7 +13,9 @@
<artifact:pom file="pom.xml" id="maven.project"/>
<artifact:dependencies pathId="dependency.classpath"
filesetId="dependency.fileset">
- <dependency groupId="org.apache.maven.wagon"
artifactId="wagon-provider-test" version="1.0-alpha-2"/>
+ <dependency groupId="org.apache.maven.wagon"
artifactId="wagon-provider-test" version="1.0-alpha-2">
+ <exclusion groupId="junit" artifactId="junit" />
+ </dependency>
<dependency groupId="org.codehaus.modello" artifactId="modello-core"
version="1.0-alpha-2-SNAPSHOT"/>
<localRepository refid="local.repository"/>
</artifact:dependencies>
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=188803&r1=188802&r2=188803&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
Tue Jun 7 08:51:25 2005
@@ -26,13 +26,14 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.artifact.MavenMetadataSource;
+import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Dependency;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.FileList;
-import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -67,7 +68,12 @@
ArtifactFactory factory = (ArtifactFactory) lookup(
ArtifactFactory.ROLE );
- Set artifacts = new HashSet();
+ ArtifactResolver resolver = (ArtifactResolver) lookup(
ArtifactResolver.ROLE );
+ MavenMetadataSource metadataSource = new MavenMetadataSource(
resolver, (MavenProjectBuilder) lookup(
+ MavenProjectBuilder.ROLE ) );
+
+ Set artifacts = metadataSource.createArtifacts( dependencies, null,
null );
+/*
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
Dependency dependency = (Dependency) i.next();
@@ -76,10 +82,7 @@
null );
artifacts.add( a );
}
-
- ArtifactResolver resolver = (ArtifactResolver) lookup(
ArtifactResolver.ROLE );
- MavenMetadataSource metadataSource = new MavenMetadataSource(
resolver, (MavenProjectBuilder) lookup(
- MavenProjectBuilder.ROLE ) );
+*/
log( "Resolving dependencies..." );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
