Author: bentmann
Date: Sun May 10 21:31:02 2009
New Revision: 773411
URL: http://svn.apache.org/viewvc?rev=773411&view=rev
Log:
o Tweaked API to express in-situ injection of default mojo configuration values
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=773411&r1=773410&r2=773411&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Sun May 10 21:31:02 2009
@@ -647,7 +647,7 @@
return plugin;
}
- public Set<Plugin> populateDefaultConfigurationForPlugins( Set<Plugin>
plugins, MavenProject project, ArtifactRepository localRepository )
+ public void populateDefaultConfigurationForPlugins( Collection<Plugin>
plugins, MavenProject project, ArtifactRepository localRepository )
throws LifecycleExecutionException
{
for( Plugin p : plugins )
@@ -661,8 +661,6 @@
}
}
}
-
- return plugins;
}
public Xpp3Dom getDefaultPluginConfiguration( String groupId, String
artifactId, String version, String goal, MavenProject project,
ArtifactRepository localRepository )
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=773411&r1=773410&r2=773411&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
Sun May 10 21:31:02 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -63,7 +64,7 @@
// Given a set of {...@link org.apache.maven.Plugin} objects where the GAV
is set we can lookup the plugin
// descriptor and populate the default configuration.
//
- Set<Plugin> populateDefaultConfigurationForPlugins( Set<Plugin> plugins,
MavenProject project, ArtifactRepository localRepository )
+ void populateDefaultConfigurationForPlugins( Collection<Plugin> plugins,
MavenProject project, ArtifactRepository localRepository )
throws LifecycleExecutionException;
void execute( MavenSession session )
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=773411&r1=773410&r2=773411&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Sun May 10 21:31:02 2009
@@ -176,9 +176,9 @@
// 3. POM values from per-execution configuration
// These configuration sources are given in increasing order of
dominance.
- Set<Plugin> processedPlugins =
lifecycle.populateDefaultConfigurationForPlugins( pluginsFromProject, project,
configuration.getLocalRepository() );
+ lifecycle.populateDefaultConfigurationForPlugins(
pluginsFromProject, project, configuration.getLocalRepository() );
- for ( Plugin buildPlugin : processedPlugins )
+ for ( Plugin buildPlugin : pluginsFromProject )
{
Xpp3Dom dom = (Xpp3Dom) buildPlugin.getConfiguration();
Plugin x = containsPlugin( buildPlugin,
project.getModel().getBuild().getPlugins() );
@@ -205,7 +205,7 @@
}
}
- project.getModel().getBuild().setPlugins( new ArrayList<Plugin>(
processedPlugins ) );
+ project.getModel().getBuild().setPlugins( new ArrayList<Plugin>(
pluginsFromProject ) );
}
catch ( IOException e )
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java?rev=773411&r1=773410&r2=773411&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Sun May 10 21:31:02 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -71,11 +72,10 @@
return Collections.emptySet();
}
- public Set<Plugin> populateDefaultConfigurationForPlugins( Set<Plugin>
plugins, MavenProject project,
+ public void populateDefaultConfigurationForPlugins( Collection<Plugin>
plugins, MavenProject project,
ArtifactRepository localRepository )
throws LifecycleExecutionException
{
- return plugins;
}
}
