myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1335597 - in /myfaces/tobago/trunk: pom.xml src/site/apt/getting-started.apt tobago-example/pom.xml tobago-example/tobago-example-demo/pom.xml
Date Tue, 08 May 2012 15:40:43 GMT
Author: lofwyr
Date: Tue May  8 15:40:43 2012
New Revision: 1335597

URL: http://svn.apache.org/viewvc?rev=1335597&view=rev
Log:
TOBAGO-1123: Updating dependencies of Mojarra library versions
- adding profile for Mojarra 2.2

Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/src/site/apt/getting-started.apt
    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=1335597&r1=1335596&r2=1335597&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue May  8 15:40:43 2012
@@ -1765,6 +1765,49 @@
       </dependencyManagement>
     </profile>
 
+    <profile>
+      <id>mojarra-2.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.2</value>
+        </property>
+      </activation>
+      <properties>
+        <jsf.target>2.0</jsf.target>
+        <jsf.targetDirectory>1.2</jsf.targetDirectory>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.sun.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+            <version>${mojarra22.version}</version>
+            <optional>true</optional>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.faces</groupId>
+            <artifactId>jsf-impl</artifactId>
+            <version>${mojarra22.version}</version>
+            <optional>true</optional>
+          </dependency>
+          <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+          </dependency>
+          <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <optional>true</optional>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+
   </profiles>
 
   <repositories>
@@ -1803,6 +1846,7 @@
     <mojarra12.version>1.2_15</mojarra12.version>
     <mojarra20.version>2.0.9</mojarra20.version>
     <mojarra21.version>2.1.7</mojarra21.version>
+    <mojarra22.version>2.2.0-SNAPSHOT</mojarra22.version>
     <facelets.version>1.1.14</facelets.version>
     <jetty7.version>7.4.5.v20110725</jetty7.version>
     <!--

Modified: myfaces/tobago/trunk/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/getting-started.apt?rev=1335597&r1=1335596&r2=1335597&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/getting-started.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/getting-started.apt Tue May  8 15:40:43 2012
@@ -93,4 +93,5 @@ Using different JSF implementations
   mvn jetty:run -Djsf=mojarra-1.2
   mvn jetty:run -Djsf=mojarra-2.0
   mvn jetty:run -Djsf=mojarra-2.1
+  mvn jetty:run -Djsf=mojarra-2.2
 +----------------------------------------

Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1335597&r1=1335596&r2=1335597&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Tue May  8 15:40:43 2012
@@ -382,5 +382,34 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>mojarra-2.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.2</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.sun.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+          <version>${mojarra22.version}</version>
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+          <version>${mojarra22.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=1335597&r1=1335596&r2=1335597&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Tue May  8 15:40:43 2012
@@ -559,6 +559,58 @@
     </profile>
 
     <profile>
+      <id>mojarra-2.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.2</value>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>jvnet-nexus-snapshots</id>
+          <name>jvnet-nexus-snapshots</name>
+          <url>https://maven.java.net/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.openwebbeans</groupId>
+          <artifactId>openwebbeans-jsf</artifactId>
+          <version>${openwebbeans.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+          <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-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