You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/08/17 06:44:38 UTC
svn commit: r1158510 - in /myfaces/test/trunk: pom.xml src/site/site.xml
test12/pom.xml test20/pom.xml
Author: lu4242
Date: Wed Aug 17 04:44:37 2011
New Revision: 1158510
URL: http://svn.apache.org/viewvc?rev=1158510&view=rev
Log:
update site and dependencies to use geronimo stuff and maven 3 stuff
Modified:
myfaces/test/trunk/pom.xml
myfaces/test/trunk/src/site/site.xml
myfaces/test/trunk/test12/pom.xml
myfaces/test/trunk/test20/pom.xml
Modified: myfaces/test/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/pom.xml?rev=1158510&r1=1158509&r2=1158510&view=diff
==============================================================================
--- myfaces/test/trunk/pom.xml (original)
+++ myfaces/test/trunk/pom.xml Wed Aug 17 04:44:37 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
<version>10</version>
+ <relativePath/>
</parent>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test-project</artifactId>
@@ -45,6 +46,7 @@
<module>test12</module>
<module>test20</module>
</modules>
+ <!--
<repositories>
<repository>
<id>java.net</id>
@@ -53,9 +55,11 @@
<layout>legacy</layout>
</repository>
</repositories>
+ -->
<build>
<!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
+ <!--
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -63,6 +67,7 @@
<version>1.0-beta-7</version>
</extension>
</extensions>
+ -->
<plugins>
<!-- plugin> -->
@@ -93,17 +98,15 @@
</plugins>
<pluginManagement>
<plugins>
+ <!-- SITE GENERATION -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
</plugin>
-
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.9</version>
</plugin>
-
- <!-- SITE GENERATION -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
@@ -180,12 +183,18 @@
</profile>
</profiles>
-
<reporting>
<plugins>
+ <!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
</plugin>
</plugins>
</reporting>
Modified: myfaces/test/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/src/site/site.xml?rev=1158510&r1=1158509&r2=1158510&view=diff
==============================================================================
--- myfaces/test/trunk/src/site/site.xml (original)
+++ myfaces/test/trunk/src/site/site.xml Wed Aug 17 04:44:37 2011
@@ -82,8 +82,8 @@
<item name="ExtVal" href="../extensions/validator/index.html"/>
<item name="Portlet Bridge" href="../portlet-bridge/index.html"/>
<item name="Test" href="../test/index.html" collapse="false">
- <item name="Myfaces Test Framework for JSF 1.2 (and 1.1)" href="./myfaces-test12/index.html"/>
- <item name="Myfaces Test Framework for JSF 2.0" href="./myfaces-test20/index.html"/>
+ <item name="Myfaces Test Framework for JSF 1.2 (and 1.1)" href="http://myfaces.apache.org/test/myfaces-test12/index.html"/>
+ <item name="Myfaces Test Framework for JSF 2.0" href="http://myfaces.apache.org/test/myfaces-test20/index.html"/>
</item>
<item name="Commons" href="../commons/index.html"/>
<item name="HTML5" href="../html5/index.html"/>
Modified: myfaces/test/trunk/test12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/pom.xml?rev=1158510&r1=1158509&r2=1158510&view=diff
==============================================================================
--- myfaces/test/trunk/test12/pom.xml (original)
+++ myfaces/test/trunk/test12/pom.xml Wed Aug 17 04:44:37 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.14</version>
<optional>true</optional>
@@ -124,6 +124,26 @@
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <!-- Specific configuration for the non aggregate report -->
+ </configuration>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<!-- Allow building with JDK 1.4 as well as JDK 1.5,
the 1.4 profile caters only to JSF 1.1 -->
<profiles>
@@ -186,27 +206,36 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.9</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_03</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.9</version>
<scope>test</scope>
</dependency>
+ <!-- Servlet 2.5 -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
+ <!-- JSP 2.1 -->
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- EL 1.0 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -219,27 +248,36 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.9</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_03</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.9</version>
<scope>test</scope>
</dependency>
+ <!-- Servlet 2.5 -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
+ <!-- JSP 2.1 -->
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- EL 1.0 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: myfaces/test/trunk/test20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/pom.xml?rev=1158510&r1=1158509&r2=1158510&view=diff
==============================================================================
--- myfaces/test/trunk/test20/pom.xml (original)
+++ myfaces/test/trunk/test20/pom.xml Wed Aug 17 04:44:37 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.14</version>
<optional>true</optional>
@@ -104,17 +104,26 @@
<version>${jsf-myfaces.version}</version>
<scope>test</scope>
</dependency>
+ <!-- Servlet 2.5 -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- JSP 2.1 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- EL 1.0 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -148,6 +157,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
@@ -168,7 +178,7 @@
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.3</version>
+ <version>1.0.9</version>
<executions>
<execution>
<id>unpack-test12</id>
@@ -182,10 +192,10 @@
<artifactItem>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test12</artifactId>
- <version>${pom.version}</version>
+ <version>1.0.4-SNAPSHOT</version>
<classifier>sources</classifier>
<outputDirectory>${project.build.directory}/test12_sources</outputDirectory>
- <includes>**/*.java</includes>
+ <includes>org/apache/myfaces/**/*.java</includes>
<excludes>**/*.class,**/META-INF/**</excludes>
</artifactItem>
</artifactItems>
@@ -195,8 +205,27 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <!-- Specific configuration for the non aggregate report -->
+ </configuration>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<properties>
<jsf-ri.version>2.0.2-b10</jsf-ri.version>
- <jsf-myfaces.version>2.0.0-beta</jsf-myfaces.version>
+ <jsf-myfaces.version>2.0.0</jsf-myfaces.version>
</properties>
</project>