myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1335014 - in /myfaces/tobago/trunk: pom.xml tobago-example/pom.xml tobago-example/tobago-example-demo/pom.xml
Date Mon, 07 May 2012 13:37:06 GMT
Author: lofwyr
Date: Mon May  7 13:37:06 2012
New Revision: 1335014

URL: http://svn.apache.org/viewvc?rev=1335014&view=rev
Log:
TOBAGO-1122: Updating dependencies of MyFaces library versions

Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/tobago-example/pom.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1335014&r1=1335013&r2=1335014&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Mon May  7 13:37:06 2012
@@ -1794,11 +1794,11 @@
   </contributors>
 
   <properties>
-    <myfaces11.version>1.1.9</myfaces11.version>
-    <myfaces12.version>1.2.11</myfaces12.version>
-    <myfaces-test12.version>1.0.1</myfaces-test12.version>
-    <myfaces20.version>2.0.12</myfaces20.version>
-    <myfaces21.version>2.1.5</myfaces21.version>
+    <myfaces11.version>1.1.10</myfaces11.version>
+    <myfaces12.version>1.2.12</myfaces12.version>
+    <myfaces-test12.version>1.0.4</myfaces-test12.version>
+    <myfaces20.version>2.0.13</myfaces20.version>
+    <myfaces21.version>2.1.7</myfaces21.version>
     <mojarra11.version>1.1_02</mojarra11.version>
     <mojarra12.version>1.2_14</mojarra12.version>
     <mojarra20.version>2.0.6</mojarra20.version>

Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1335014&r1=1335013&r2=1335014&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Mon May  7 13:37:06 2012
@@ -238,6 +238,35 @@
     </profile>
 
     <profile>
+      <id>myfaces-2.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-2.1</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+          <version>${myfaces21.version}</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <version>${myfaces21.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
       <id>mojarra-1.1</id>
       <activation>
         <property>
@@ -324,5 +353,34 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>mojarra-2.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.1</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.sun.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+          <version>${mojarra21.version}</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+          <version>${mojarra21.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
   </profiles>
 </project>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1335014&r1=1335013&r2=1335014&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Mon May  7 13:37:06 2012
@@ -310,7 +310,41 @@
       </snapshots>
     </repository>
   </repositories>
+
   <profiles>
+
+    <profile>
+      <id>myfaces-1.2</id>
+      <activation>
+        <property>
+          <name>!jsf</name>
+        </property>
+      </activation>
+      <dependencies>
+
+        <dependency>
+          <groupId>org.apache.openwebbeans</groupId>
+          <artifactId>openwebbeans-jsf12</artifactId>
+          <version>${openwebbeans.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+          <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+          <version>${myfaces-extcdi.version}</version>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+          <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+          <version>${myfaces-extcdi.version}</version>
+          <scope>runtime</scope>
+        </dependency>
+
+      </dependencies>
+    </profile>
+
     <profile>
       <id>myfaces-2.0</id>
       <activation>
@@ -357,36 +391,50 @@
     </profile>
 
     <profile>
-      <id>myfaces-1.2</id>
+      <id>myfaces-2.1</id>
       <activation>
         <property>
-          <name>!jsf</name>
+          <name>jsf</name>
+          <value>myfaces-2.1</value>
         </property>
       </activation>
       <dependencies>
-
         <dependency>
           <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>openwebbeans-jsf12</artifactId>
+          <artifactId>openwebbeans-jsf</artifactId>
           <version>${openwebbeans.version}</version>
         </dependency>
 
         <dependency>
           <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-          <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+          <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
           <version>${myfaces-extcdi.version}</version>
           <scope>compile</scope>
         </dependency>
 
         <dependency>
           <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-          <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+          <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
           <version>${myfaces-extcdi.version}</version>
           <scope>runtime</scope>
         </dependency>
+<!-- for JSF 2.0 and Bean Validation (JSR-303)  -->
+        <dependency>
+          <groupId>javax.el</groupId>
+          <artifactId>el-api</artifactId>
+          <version>2.2</version>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.glassfish.web</groupId>
+          <artifactId>el-impl</artifactId>
+          <version>2.2</version>
+        </dependency>
 
       </dependencies>
     </profile>
+
     <profile>
       <!--
        mvn package cargo:start -Ptomcat6x



Mime
View raw message