You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/28 18:50:22 UTC
svn commit: r769456 -
/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
Author: sisbell
Date: Tue Apr 28 16:50:21 2009
New Revision: 769456
URL: http://svn.apache.org/viewvc?rev=769456&view=rev
Log:
Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied.
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=769456&r1=769455&r2=769456&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Tue Apr 28 16:50:21 2009
@@ -267,23 +267,6 @@
public static void addPluginsToModel(Model target, Set<Plugin> plugins)
{
- Build build = target.getBuild();
- // addPlugin(build, "maven-compiler-plugin");
- // addPlugin(build, "maven-resources-plugin");
- //addPlugin(build, "maven-deploy-plugin");
- //addPlugin(build, "maven-jar-plugin");
- // addPlugin(build, "maven-surefire-plugin");
-
- /*
- rg.apache.maven.plugins:maven-jar-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-resources-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-deploy-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-install-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-jar-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-resources-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-surefire-plugin
- [java] PLUGIN: org.apache.maven.plugins:maven-deploy-plugin
- */
List<Plugin> mPlugins = target.getBuild().getPlugins();
List<Plugin> lifecyclePlugins = new ArrayList<Plugin>();
@@ -294,7 +277,6 @@
{
p.setConfiguration(null);
lifecyclePlugins.add(p);
- //System.out.println("PLUGIN: " + p.getKey() +":" + ((p.getConfiguration() != null) ? p.getConfiguration().toString() : "") );
}
}