svn commit: r1309477 - /myfaces/trinidad/trunk/pom.xml

[so...@apache.org]

Author: sobryan
Date: Wed Apr  4 16:15:10 2012
New Revision: 1309477

URL: http://svn.apache.org/viewvc?rev=1309477&view=rev
Log:
A few small additional pom changes

Modified:
    myfaces/trinidad/trunk/pom.xml

Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1309477&r1=1309476&r2=1309477&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Wed Apr  4 16:15:10 2012
@@ -43,9 +43,9 @@ Create A Branch (http://maven.apache.org
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>Apache MyFaces Trinidad 2.0</name>
-  <description>Apache MyFaces Trinidad for JSF 2.0</description>
-  <url>http://myfaces.apache.org/trinidad/trinidad-1_2</url>
+  <name>Apache MyFaces Trinidad</name>
+  <description>Apache MyFaces Trinidad for JSF ${jsf-spec.version}</description>
+  <url>http://myfaces.apache.org/trinidad</url>
   <inceptionYear>2001</inceptionYear>
 
   <parent>
@@ -67,9 +67,9 @@ Create A Branch (http://maven.apache.org
     <validation.version>1.0.0.GA</validation.version>
     <jsp.version>2.1</jsp.version>
     <jstl.version>1.2</jstl.version>
-    <jsf-spec.version>2.0</jsf-spec.version>
-    <jsf-ri.version>2.0.4-b09</jsf-ri.version>
-    <jsf-myfaces.version>2.0.7</jsf-myfaces.version>
+    <jsf-spec.version>2.1</jsf-spec.version>
+    <jsf-ri.version>2.1.7</jsf-ri.version>
+    <jsf-myfaces.version>2.1.6</jsf-myfaces.version>
     <portlet-bridge.version>2.0.0</portlet-bridge.version>
     <commons-lang.version>2.4</commons-lang.version>
     <commons-io.version>2.0</commons-io.version>
@@ -601,12 +601,9 @@ 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 -->
+                  <message>Apache MyFaces Trinidad 2 needs to be compiled with at least Maven ${maven.min-version}</message> 
                   <version>[${maven.min-version},)</version>
                 </requireMavenVersion>
                 <requireJavaVersion>