Author: hboutemy
Date: Sun Apr 11 16:35:53 2010
New Revision: 932933
URL: http://svn.apache.org/viewvc?rev=932933&view=rev
Log:
moved maven-archetype-plugin configuration in pluginManagement section of the
generated pom
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=932933&r1=932932&r2=932933&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Sun Apr 11 16:35:53 2010
@@ -40,6 +40,7 @@ import org.apache.maven.model.Dependency
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -339,7 +340,10 @@ public class FilesetArchetypeCreator
plugin.setArtifactId( "maven-archetype-plugin" );
plugin.setVersion( getArchetypeVersion() );
plugin.setExtensions( true );
- model.getBuild().addPlugin( plugin );
+
+ PluginManagement pluginManagement = new PluginManagement();
+ pluginManagement.addPlugin( plugin );
+ model.getBuild().setPluginManagement( pluginManagement );
getLogger().debug( "Creating archetype's pom" );
Modified:
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml?rev=932933&r1=932932&r2=932933&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
(original)
+++
maven/archetype/trunk/archetype-common/src/main/resources/org/apache/maven/archetype/creator/pom-prototype.xml
Sun Apr 11 16:35:53 2010
@@ -14,7 +14,9 @@
<extensions>
</extensions>
- <plugins>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
