You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2012/03/06 00:27:14 UTC
svn commit: r1297283 - in /myfaces/trinidad/trunk: pom.xml
trinidad-api/pom.xml trinidad-examples/trinidad-components-showcase/pom.xml
trinidad-examples/trinidad-demo/pom.xml trinidad-impl/pom.xml
Author: sobryan
Date: Mon Mar 5 23:27:14 2012
New Revision: 1297283
URL: http://svn.apache.org/viewvc?rev=1297283&view=rev
Log:
A bit better implementation of the rat stuff. Still only invokes automatically on the profiles.
Modified:
myfaces/trinidad/trunk/pom.xml
myfaces/trinidad/trunk/trinidad-api/pom.xml
myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/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=1297283&r1=1297282&r2=1297283&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Mon Mar 5 23:27:14 2012
@@ -90,7 +90,7 @@ Create A Branch (http://maven.apache.org
<!-- Enforcer -->
<maven.min-version>3.0</maven.min-version>
- <jdk.min-version>1.5.0</jdk.min-version>
+ <jdk.min-version>1.6.0</jdk.min-version>
<!-- Other -->
<jdev.release>11.1.1.0.0</jdev.release>
@@ -558,21 +558,6 @@ Create A Branch (http://maven.apache.org
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
- <configuration>
- <includes>
- <include>src/*/</include>
- <include>pom.xml</include>
- </includes>
- <excludes>
- <exclude>**/clirr-runner.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<version>2.2</version>
@@ -584,6 +569,18 @@ Create A Branch (http://maven.apache.org
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -604,11 +601,16 @@ Create A Branch (http://maven.apache.org
</goals>
<configuration>
<rules>
+ <requireJavaVersion>
+ <message>Apache MyFaces Trinidad 2 needs to be compiled with Java 6</message>
+ <version>1.6</version>
+ </requireJavaVersion>
<requireMavenVersion>
<!-- Require AT LEAST Maven 3.0 or higher -->
<version>[${maven.min-version},)</version>
</requireMavenVersion>
<requireJavaVersion>
+ <message>Apache MyFaces Trinidad 2 needs to be compiled with at least JDK ${jdk.min-version}</message>
<version>[${jdk.min-version},)</version>
</requireJavaVersion>
</rules>
@@ -627,27 +629,6 @@ Create A Branch (http://maven.apache.org
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <message>Apache MyFaces Trinidad 2 needs to be compiled with Java 6</message>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<preparationGoals>clean verify install</preparationGoals>
@@ -702,6 +683,22 @@ Create A Branch (http://maven.apache.org
</execution>
</executions>
</plugin>
+
+ <!-- Apache RAT Plugin - intentionally executed only on -PenableRat, -Papache-release, or rat:check -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ <configuration>
+ <includes>
+ <include>src/*/</include>
+ <include>pom.xml</include>
+ </includes>
+ <excludes>
+ <exclude>**/clirr-runner.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: myfaces/trinidad/trunk/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/pom.xml?rev=1297283&r1=1297282&r2=1297283&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-api/pom.xml Mon Mar 5 23:27:14 2012
@@ -118,21 +118,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/clirr-runner.txt</exclude>
- <!-- Sometimes added by jdev. Should not ever be checked in. -->
- <exclude>/src/webapp/</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -361,6 +346,18 @@
</reportPlugins>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/clirr-runner.txt</exclude>
+ <!-- Sometimes added by jdev. Should not ever be checked in. -->
+ <exclude>/src/webapp/</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml?rev=1297283&r1=1297282&r2=1297283&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml Mon Mar 5 23:27:14 2012
@@ -57,6 +57,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
@@ -64,6 +65,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml?rev=1297283&r1=1297282&r2=1297283&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/pom.xml Mon Mar 5 23:27:14 2012
@@ -102,20 +102,6 @@
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Nasdaq*.txt</exclude>
- <exclude>**/*.jspf</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
@@ -126,6 +112,17 @@
</libraries>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Nasdaq*.txt</exclude>
+ <exclude>**/*.jspf</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=1297283&r1=1297282&r2=1297283&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Mon Mar 5 23:27:14 2012
@@ -135,25 +135,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Excludes the Golden files -->
- <exclude>src/test/resources/*/</exclude>
- <!-- Exclude a directory that jdev sometimes adds, should not be checked in -->
- <exclude>/src/webapp/</exclude>
- <exclude>src/main/resources/META-INF/trinidad-version.txt</exclude>
- <exclude>src/main/resources/META-INF/servlets/resources/adf.resources</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
@@ -416,6 +397,21 @@
</reportPlugins>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Excludes the Golden files -->
+ <exclude>src/test/resources/*/</exclude>
+ <!-- Exclude a directory that jdev sometimes adds, should not be checked in -->
+ <exclude>/src/webapp/</exclude>
+ <exclude>src/main/resources/META-INF/trinidad-version.txt</exclude>
+ <exclude>src/main/resources/META-INF/servlets/resources/adf.resources</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>