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 20:58:27 UTC
svn commit: r1181138 - in /myfaces/commons/branches/jsf_20:
myfaces-commons-components/pom.xml myfaces-commons-converters/pom.xml
myfaces-commons-resourcehandler/pom.xml myfaces-commons-utils/pom.xml
myfaces-commons-validators/pom.xml pom.xml
Author: lu4242
Date: Mon Oct 10 18:58:25 2011
New Revision: 1181138
URL: http://svn.apache.org/viewvc?rev=1181138&view=rev
Log:
update site generation to maven 3 and remove unused cactus dependency
Modified:
myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-utils/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_20/pom.xml
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml Mon Oct 10 18:58:25 2011
@@ -190,12 +190,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -225,15 +219,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>
@@ -336,7 +327,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_20/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml Mon Oct 10 18:58:25 2011
@@ -199,12 +199,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -234,15 +228,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>
@@ -345,7 +336,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_20/myfaces-commons-resourcehandler/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/pom.xml Mon Oct 10 18:58:25 2011
@@ -151,15 +151,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>
@@ -209,7 +206,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_20/myfaces-commons-utils/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-utils/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-utils/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-utils/pom.xml Mon Oct 10 18:58:25 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_20/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml Mon Oct 10 18:58:25 2011
@@ -200,12 +200,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<scope>test</scope>
@@ -247,15 +241,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>
@@ -358,7 +349,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_20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/pom.xml?rev=1181138&r1=1181137&r2=1181138&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/pom.xml Mon Oct 10 18:58:25 2011
@@ -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>
@@ -116,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>
@@ -195,13 +230,6 @@
</dependency>
<dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.2.1</version>
@@ -347,6 +375,10 @@
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</reporting>
<properties>