You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ke...@apache.org on 2007/01/19 18:56:16 UTC
svn commit: r497888 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
ArtifactFilterManager.java DefaultArtifactFilterManager.java
plugin/DefaultPluginManager.java
Author: kenney
Date: Fri Jan 19 09:56:16 2007
New Revision: 497888
URL: http://svn.apache.org/viewvc?view=rev&rev=497888
Log:
Only filter core artifacts from plugins, not extension artifacts, as they may break the plugin by bringing in incompatible API artifacts
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java?view=diff&rev=497888&r1=497887&r2=497888
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java Fri Jan 19 09:56:16 2007
@@ -4,9 +4,20 @@
public interface ArtifactFilterManager
{
-
+ /**
+ * Returns a filter for core + extension artifacts.
+ */
ArtifactFilter getArtifactFilter();
- void excludeArtifact( String artifactId );
+ /**
+ * Returns a filter for only the core artifacts.
+ */
+ ArtifactFilter getCoreArtifactFilter();
+ /**
+ * Exclude an extension artifact (doesn't affect getArtifactFilter's result,
+ * only getExtensionArtifactFilter).
+ * @param artifactId
+ */
+ void excludeArtifact( String artifactId );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?view=diff&rev=497888&r1=497887&r2=497888
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Fri Jan 19 09:56:16 2007
@@ -19,9 +19,8 @@
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
-import java.util.List;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -30,9 +29,9 @@
*/
public class DefaultArtifactFilterManager implements ArtifactFilterManager
{
-
+
private static final Set DEFAULT_EXCLUSIONS;
-
+
static
{
Set artifacts = new HashSet();
@@ -65,12 +64,12 @@
artifacts.add( "wagon-http-lightweight" );
artifacts.add( "wagon-ssh" );
artifacts.add( "wagon-ssh-external" );
-
+
DEFAULT_EXCLUSIONS = artifacts;
}
-
+
private Set excludedArtifacts = new HashSet( DEFAULT_EXCLUSIONS );
-
+
/**
* @deprecated Use this class as a component instead, and then use getArtifactFilter().
*/
@@ -79,15 +78,27 @@
// TODO: configure this from bootstrap or scan lib
return new ExclusionSetFilter( DEFAULT_EXCLUSIONS );
}
-
- /* (non-Javadoc)
+
+ /**
+ * Returns the artifact filter for the core + extension artifacts.
+ *
* @see org.apache.maven.ArtifactFilterManager#getArtifactFilter()
*/
public ArtifactFilter getArtifactFilter()
{
return new ExclusionSetFilter( excludedArtifacts );
}
-
+
+ /**
+ * Returns the artifact filter for the standard core artifacts.
+ *
+ * @see org.apache.maven.ArtifactFilterManager#getExtensionArtifactFilter()
+ */
+ public ArtifactFilter getCoreArtifactFilter()
+ {
+ return new ExclusionSetFilter( DEFAULT_EXCLUSIONS );
+ }
+
/* (non-Javadoc)
* @see org.apache.maven.ArtifactFilterManager#excludeArtifact(java.lang.String)
*/
@@ -95,5 +106,5 @@
{
excludedArtifacts.add( artifactId );
}
-
+
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=497888&r1=497887&r2=497888
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Jan 19 09:56:16 2007
@@ -354,9 +354,8 @@
try
{
-
projectPluginDependencies = MavenMetadataSource.createArtifacts( artifactFactory, plugin.getDependencies(), null,
- coreArtifactFilterManager.getArtifactFilter(), project );
+ coreArtifactFilterManager.getCoreArtifactFilter(), project );
}
catch ( InvalidDependencyVersionException e )
{
@@ -439,7 +438,7 @@
}
}
- getLogger().info( "Using the following artifacts for classpath of: " + pluginArtifact.getId() + ":\n\n" + allResolved.toString().replace( ',', '\n' ) );
+ getLogger().debug( "Using the following artifacts for classpath of: " + pluginArtifact.getId() + ":\n\n" + allResolved.toString().replace( ',', '\n' ) );
return allResolved;
}