You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/24 12:20:55 UTC
svn commit: r737332 - in /maven/components/branches/maven-2.0.10-RC: ./
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: bentmann
Date: Sat Jan 24 11:20:54 2009
New Revision: 737332
URL: http://svn.apache.org/viewvc?rev=737332&view=rev
Log:
[MNG-3769] [regression] Excluding relocated transitive dependencies does not work
o Merged from r736543
Modified:
maven/components/branches/maven-2.0.10-RC/ (props changed)
maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Propchange: maven/components/branches/maven-2.0.10-RC/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 24 11:20:54 2009
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007,727548,729738
+/maven/components/branches/maven-2.0.x:709032,709208,709241,725949,726541,727007,727548,729738,736543
/maven/components/trunk:721902,726845
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=737332&r1=737331&r2=737332&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Sat Jan 24 11:20:54 2009
@@ -285,6 +285,8 @@
{
fireEvent( ResolutionListener.PROCESS_CHILDREN, listeners, node );
+ Artifact parentArtifact = node.getArtifact();
+
for ( Iterator i = node.getChildrenIterator(); i.hasNext(); )
{
ResolutionNode child = (ResolutionNode) i.next();
@@ -386,11 +388,22 @@
Artifact relocated = source.retrieveRelocatedArtifact( artifact, localRepository, childRemoteRepositories );
if ( !artifact.equals( relocated ) )
{
+ relocated.setDependencyFilter( artifact.getDependencyFilter() );
artifact = relocated;
child.setArtifact( artifact );
}
}
while( !childKey.equals( child.getKey() ) );
+
+ if ( parentArtifact != null && parentArtifact.getDependencyFilter() != null && !parentArtifact.getDependencyFilter().include( artifact ) )
+ {
+ // MNG-3769: the [probably relocated] artifact is excluded.
+ // We could process exclusions on relocated artifact details in the
+ // MavenMetadataSource.createArtifacts(..) step, BUT that would
+ // require resolving the POM from the repository very early on in
+ // the build.
+ continue;
+ }
artifact.setDependencyTrail( node.getDependencyTrail() );
ResolutionGroup rGroup = source.retrieve( artifact, localRepository, remoteRepositories );
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=737332&r1=737331&r2=737332&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Sat Jan 24 11:20:54 2009
@@ -431,6 +431,11 @@
ArtifactFilter artifactFilter = dependencyFilter;
+ // MNG-3769: It would be nice to be able to process relocations here,
+ // so we could have this filtering step apply to post-relocated dependencies.
+ // HOWEVER, this would require a much more invasive POM resolution process
+ // in order to look for relocations, which would make the early steps in
+ // a Maven build way too heavy.
if ( artifact != null && ( artifactFilter == null || artifactFilter.include( artifact ) ) )
{
if ( d.getExclusions() != null && !d.getExclusions().isEmpty() )