You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/11/21 22:27:34 UTC
svn commit: r1204714 - in /myfaces/trinidad/trunk: pom.xml
trinidad-api/pom.xml trinidad-impl/pom.xml
Author: arobinson74
Date: Mon Nov 21 21:27:33 2011
New Revision: 1204714
URL: http://svn.apache.org/viewvc?rev=1204714&view=rev
Log:
Fixing the maven 3 site build
Modified:
myfaces/trinidad/trunk/pom.xml
myfaces/trinidad/trunk/trinidad-api/pom.xml
myfaces/trinidad/trunk/trinidad-impl/pom.xml
Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1204714&r1=1204713&r2=1204714&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Mon Nov 21 21:27:33 2011
@@ -362,7 +362,7 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <!--version>3.0-beta-3</version-->
+ <version>3.0</version>
<inherited>true</inherited>
<dependencies>
<dependency>
@@ -373,6 +373,41 @@
</dependencies>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
+ <reportPlugins>
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <threshold>Low</threshold>
+ </configuration>
+ </plugin-->
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+
+ <!--plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>${jdk.version}</targetJdk>
+ </configuration>
+ </plugin-->
+ </reportPlugins>
</configuration>
</plugin>
@@ -467,6 +502,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<inherited>true</inherited>
+ <version>2.6</version>
<configuration>
<targetJdk>${jdk.version}</targetJdk>
</configuration>
@@ -617,44 +653,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <threshold>Low</threshold>
- </configuration>
- </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
-
- <!--plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>${jdk.version}</targetJdk>
- </configuration>
- </plugin-->
- </plugins>
- </reporting>
-
<profiles>
<!--
This profile builds the examples when NOT performing a release. Execute this profile
Modified: myfaces/trinidad/trunk/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/pom.xml?rev=1204714&r1=1204713&r2=1204714&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-api/pom.xml Mon Nov 21 21:27:33 2011
@@ -290,64 +290,64 @@
</execution>
</executions>
</plugin>
-
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
<plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-tagdoc-plugin</artifactId>
+ <artifactId>maven-site-plugin</artifactId>
<configuration>
- <taglibs>
- <tr>http://myfaces.apache.org/trinidad</tr>
- <trh>http://myfaces.apache.org/trinidad/html</trh>
- </taglibs>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-tagdoc-plugin</artifactId>
+ <configuration>
+ <taglibs>
+ <tr>http://myfaces.apache.org/trinidad</tr>
+ <trh>http://myfaces.apache.org/trinidad/html</trh>
+ </taglibs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <showPackage>false</showPackage>
+ <showProtected>true</showProtected>
+ <!-- we should look up the new URLs -->
+ <!--links>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+ <link>http://download.oracle.com/javaee/1.4/api</link>
+ <link>http://download.oracle.com/docs/cd/E17802_01/j2ee/javaee/javaserverfaces/2.0/docs/api</link>
+ <link>http://download.oracle.com/javaee/5/api</link>
+ </links-->
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <configuration>
+ <basedir>${basedir}</basedir>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <showPackage>false</showPackage>
- <showProtected>true</showProtected>
- <!-- we should look up the new URLs -->
- <!--links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api</link>
- <link>http://download.oracle.com/javaee/1.4/api</link>
- <link>http://download.oracle.com/docs/cd/E17802_01/j2ee/javaee/javaserverfaces/2.0/docs/api</link>
- <link>http://download.oracle.com/javaee/5/api</link>
- </links-->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <configuration>
- <basedir>${basedir}</basedir>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
-
</plugins>
- </reporting>
+ </build>
<!--
This profile is for preparing a release....
Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=1204714&r1=1204713&r2=1204714&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Mon Nov 21 21:27:33 2011
@@ -372,22 +372,25 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
+ <artifactId>maven-site-plugin</artifactId>
<configuration>
- <targetJdk>${jdk.version}</targetJdk>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <targetJdk>${jdk.version}</targetJdk>
+ </configuration>
+ </plugin>
+ </reportPlugins>
</configuration>
</plugin>
- </plugins>
- </reporting>
+ </plugins>
+ </build>
</project>