Author: hboutemy
Date: Sun Apr 11 10:10:36 2010
New Revision: 932860
URL: http://svn.apache.org/viewvc?rev=932860&view=rev
Log:
use maven-archetype packaging instead of jar + manual configuration
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-simple/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/pom.xml
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/pom.xml
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-archetype</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Archetype Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
Sun Apr 11 10:10:36 2010
@@ -5,6 +5,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
+ <packaging>maven-archetype</packaging>
<name>Archetype - ${artifactId}</name>
<url>http://maven.apache.org</url>
@@ -14,19 +15,21 @@
</properties>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <executions>
- <execution>
- <id>it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-5-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-5-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-j2ee-simple/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-j2ee-simple</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Simple J2EE Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-mojo/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-mojo</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Mojo Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin-site/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-plugin-site</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Plugin Site Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-plugin/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-plugin</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Plugin Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-portlet/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-portlet</artifactId>
<version>1.0.2-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Portlet Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-profiles/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-profiles</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Profiles Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-quickstart/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-quickstart</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Quickstart Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-simple/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-simple/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-simple/pom.xml
Sun Apr 11 10:10:36 2010
@@ -32,6 +32,7 @@ under the License.
<artifactId>maven-archetype-simple</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Simple Project Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site-simple/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-site-simple</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Archetype for Simple Site</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-site/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-site</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Site Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
---
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/pom.xml
(original)
+++
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/maven-archetype-webapp/pom.xml
Sun Apr 11 10:10:36 2010
@@ -31,6 +31,7 @@ under the License.
<artifactId>maven-archetype-webapp</artifactId>
<version>1.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
<name>Maven Webapp Archetype</name>
<description>
Modified:
maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/pom.xml?rev=932860&r1=932859&r2=932860&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/pom.xml
(original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetype-bundles/pom.xml
Sun Apr 11 10:10:36 2010
@@ -67,19 +67,21 @@ under the License.
</distributionManagement>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <executions>
- <execution>
- <id>it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-5-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-5-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
