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/10/10 21:15:43 UTC
svn commit: r1181151 - in /myfaces/commons/branches/jsf_11:
myfaces-commons-components/pom.xml myfaces-commons-converters/pom.xml
myfaces-commons-utils/pom.xml myfaces-commons-validators/pom.xml pom.xml
Author: lu4242
Date: Mon Oct 10 19:15:43 2011
New Revision: 1181151
URL: http://svn.apache.org/viewvc?rev=1181151&view=rev
Log:
fix site generation
Modified:
myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_11/pom.xml
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml?rev=1181151&r1=1181150&r2=1181151&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-components/pom.xml Mon Oct 10 19:15:43 2011
@@ -198,12 +198,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -233,15 +227,12 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
</plugin>
</plugins>
</reporting>
@@ -257,7 +248,7 @@
<artifactId>myfaces-builder-plugin</artifactId>
<configuration>
<taglibs>
- <mcc>http://myfaces.apache.org/commons/components</mcc>
+ <mc>http://myfaces.apache.org/commons/components</mc>
</taglibs>
</configuration>
<executions>
@@ -286,7 +277,7 @@
<artifactId>myfaces-builder-plugin</artifactId>
<configuration>
<taglibs>
- <mcc>http://myfaces.apache.org/commons/components</mcc>
+ <mc>http://myfaces.apache.org/commons/components</mc>
</taglibs>
</configuration>
</plugin>
@@ -310,7 +301,6 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml?rev=1181151&r1=1181150&r2=1181151&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml Mon Oct 10 19:15:43 2011
@@ -195,6 +195,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -202,12 +203,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -237,15 +232,12 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
</plugin>
</plugins>
</reporting>
@@ -314,7 +306,6 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml?rev=1181151&r1=1181150&r2=1181151&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml Mon Oct 10 19:15:43 2011
@@ -70,15 +70,12 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
</plugin>
</plugins>
</reporting>
@@ -100,7 +97,6 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml?rev=1181151&r1=1181150&r2=1181151&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml Mon Oct 10 19:15:43 2011
@@ -204,12 +204,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -251,15 +245,12 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
</plugin>
</plugins>
</reporting>
@@ -328,7 +319,6 @@
<plugin>
<!-- Install in the repository a "-javadoc.jar" file -->
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
Modified: myfaces/commons/branches/jsf_11/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/pom.xml?rev=1181151&r1=1181150&r2=1181151&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/pom.xml Mon Oct 10 19:15:43 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
<groupId>org.apache.myfaces.commons</groupId>
@@ -57,6 +57,14 @@
</pluginRepository>
</pluginRepositories>
<build>
+ <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-7</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -77,7 +85,6 @@
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>verify-style</id>
@@ -102,6 +109,11 @@
<version>1.0.8</version>
</plugin>
<plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -112,6 +124,33 @@
</archive>
</configuration>
</plugin>
+
+ <!-- SITE GENERATION -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -347,21 +386,26 @@
<reporting>
<plugins>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
<configuration>
<configLocation>default/myfaces-checks-standard.xml</configLocation>
<headerLocation>default/myfaces-header-spaces.txt</headerLocation>
</configuration>
</plugin>
+ -->
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</reporting>
<properties>