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/08/02 21:39:21 UTC
svn commit: r800140 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Author: bentmann
Date: Sun Aug 2 19:39:21 2009
New Revision: 800140
URL: http://svn.apache.org/viewvc?rev=800140&view=rev
Log:
[MNG-4277] Remove core artifacts from ${plugin.artifacts}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
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?rev=800140&r1=800139&r2=800140&view=diff
==============================================================================
--- 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 Sun Aug 2 19:39:21 2009
@@ -299,6 +299,7 @@
else
{
artifact.setFile( null );
+ artifact.setResolved( false );
}
}
@@ -432,6 +433,8 @@
logger.debug( "Populating plugin realm for " + constructPluginKey( plugin ) );
}
+ List<Artifact> exposedPluginArtifacts = new ArrayList<Artifact>();
+
for ( Artifact a : pluginArtifacts )
{
if ( a.getFile() != null )
@@ -441,6 +444,8 @@
logger.debug( " Included: " + a.getId() );
}
+ exposedPluginArtifacts.add( a );
+
try
{
pluginRealm.addURL( a.getFile().toURI().toURL() );
@@ -460,8 +465,8 @@
}
pluginDescriptor.setClassRealm( pluginRealm );
- pluginDescriptor.setArtifacts( pluginArtifacts );
-
+ pluginDescriptor.setArtifacts( exposedPluginArtifacts );
+
try
{
for ( ComponentDescriptor componentDescriptor : pluginDescriptor.getComponents() )
@@ -481,8 +486,8 @@
throw new PluginManagerException( plugin, e.getMessage(), e );
}
- pluginCache.put( plugin, localRepository, remoteRepositories, pluginRealm, pluginArtifacts );
-
+ pluginCache.put( plugin, localRepository, remoteRepositories, pluginRealm, exposedPluginArtifacts );
+
return pluginRealm;
}
Modified: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=800140&r1=800139&r2=800140&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Sun Aug 2 19:39:21 2009
@@ -227,6 +227,12 @@
this.inheritedByDefault = inheritedByDefault;
}
+ /**
+ * Gets the artifacts that make up the plugin's class realm, excluding artifacts shadowed by the Maven core realm
+ * like {@code maven-project}.
+ *
+ * @return The plugin artifacts, never {@code null}.
+ */
public List<Artifact> getArtifacts()
{
return artifacts;
@@ -277,7 +283,7 @@
MojoDescriptor mojoDescriptor = null;
- for ( Iterator i = getMojos().iterator(); i.hasNext() && mojoDescriptor == null; )
+ for ( Iterator<?> i = getMojos().iterator(); i.hasNext() && mojoDescriptor == null; )
{
MojoDescriptor desc = (MojoDescriptor) i.next();