You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/02 17:54:38 UTC
svn commit: r991994 - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes: ./
myfaces-archetype-helloworld-facelets/ myfaces-archetype-helloworld-portlets/
myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/
myfaces-archetype-hellowo...
Author: jakobk
Date: Thu Sep 2 15:54:37 2010
New Revision: 991994
URL: http://svn.apache.org/viewvc?rev=991994&view=rev
Log:
update to newest master-pom and to newest maven archetype conventions
Added:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml (contents, props changed)
- copied, changed from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml (contents, props changed)
- copied, changed from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml
- copied unchanged from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml
- copied unchanged from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/archetype.xml (contents, props changed)
- copied, changed from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/maven/archetype.xml
- copied unchanged from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
Removed:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
Modified:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml Thu Sep 2 15:54:37 2010
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-helloworld-facelets</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces Facelets Archetype</name>
<description>Archetype to create a new webapp based on MyFaces and Facelets</description>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml Thu Sep 2 15:54:37 2010
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-helloworld-portlets</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces Portlet Archetype</name>
<description>Archetype to create a new portlet webapp based on myfaces</description>
Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml (from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml&r1=991941&r2=991994&rev=991994&view=diff
==============================================================================
(empty)
Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml Thu Sep 2 15:54:37 2010
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-helloworld</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces Basic Archetype</name>
<description>Archetype to create a new webapp based on myfaces</description>
Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml (from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml&r1=991941&r2=991994&rev=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml Thu Sep 2 15:54:37 2010
@@ -23,7 +23,10 @@
-->
-<archetype>
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
+
<id>myfaces-archetype-helloworld</id>
<sources>
<source>src/main/java/HelloWorldController.java</source>
@@ -36,4 +39,4 @@
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
</resources>
-</archetype>
\ No newline at end of file
+</archetype>
Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml Thu Sep 2 15:54:37 2010
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-helloworld20-owb</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces and OWB Basic Archetype</name>
<description>Archetype to create a new webapp based on MyFaces 2.0 with OpenWebBeans</description>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml Thu Sep 2 15:54:37 2010
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-helloworld20</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces 2.0 Basic Archetype</name>
<description>Archetype to create a new webapp based on MyFaces 2.0</description>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml Thu Sep 2 15:54:37 2010
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-jsfcomponents</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>JSF Component Library Archetype</name>
<description>Archetype to create a libary project of JSF components</description>
</project>
Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/archetype.xml (from r991941, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/archetype.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/archetype.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml&r1=991941&r2=991994&rev=991994&view=diff
==============================================================================
(empty)
Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/pom.xml Thu Sep 2 15:54:37 2010
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-archetype-trinidad</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>MyFaces Trinidad Archetype</name>
<description>Archetype to create a new webapp based on Trinidad</description>
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml?rev=991994&r1=991993&r2=991994&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml Thu Sep 2 15:54:37 2010
@@ -25,13 +25,15 @@
- * to define the common archetype website
- * as a convenient tool for building all the archetype projects.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>5</version>
+ <version>9</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
@@ -76,40 +78,17 @@
<directory>${basedir}/src/main/resources</directory>
</resource>
</resources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <!-- 2.4 throws error, so temporally put on 2.3 -->
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
</build>
<reporting>
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
@@ -140,67 +119,10 @@
</modules>
<distributionManagement>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache.snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
<site>
- <id>apache-site</id>
+ <id>apache.website</id>
<url>scpexe://people.apache.org/www/myfaces.apache.org/build-tools/archetypes</url>
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>release</id>
- <!--
- NOTE: Execute this profile like
- mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -Prelease
- -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>getting-scm.revision</id>
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>