Author: nbelaevski Date: 2010-12-23 09:27:11 -0500 (Thu, 23 Dec 2010) New Revision: 20771 Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/bom/pom.xml trunk/examples/core-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/input-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/iteration-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/misc-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/output-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/parent/pom.xml trunk/examples/push-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/repeater-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/examples/validator-demo/src/main/webapp/WEB-INF/jboss-scanning.xml trunk/parent/pom.xml Log: RF environment updates: - MyFaces versions changed to 2.0.3 & 2.0.4-SNAPSHOT - Guava updated to r07 - Added jsf_profile=jsf_ri_2_1 for Mojarra 2.1.0-b09 Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -8,7 +8,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/bom/pom.xml =================================================================== --- trunk/bom/pom.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/bom/pom.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -149,12 +149,12 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </dependency> <!-- Misc --> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>r05</version> + <version>r07</version> </dependency> <dependency> <groupId>javax.validation</groupId> Modified: trunk/examples/core-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/core-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/core-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/input-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/input-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/input-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/iteration-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/iteration-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/iteration-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/misc-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/misc-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/misc-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/output-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/output-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/output-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/parent/pom.xml =================================================================== --- trunk/examples/parent/pom.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/parent/pom.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -206,6 +206,27 @@ </dependencies> </profile> <profile> + <id>jsf_ri_2_1</id> + <activation> + <property> + <name>jsf_profile</name> + <value>jsf_ri_2_1</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1.0-b09</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.1.0-b09</version> + </dependency> + </dependencies> + </profile> + <profile> <id>myfaces_snapshot</id> <activation> <property> @@ -217,12 +238,12 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.4-SNAPSHOT</version> </dependency> </dependencies> </profile> Modified: trunk/examples/push-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/push-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/push-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/repeater-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/repeater-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/repeater-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/examples/validator-demo/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/examples/validator-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/examples/validator-demo/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -5,7 +5,7 @@ --> <path name="WEB-INF/classes"></path> - <path name="WEB-INF/lib/guava-r05.jar"> + <path name="WEB-INF/lib/guava-r07.jar"> <exclude name="com.google.common.collect" /> </path> </scanning> \ No newline at end of file Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2010-12-23 14:18:13 UTC (rev 20770) +++ trunk/parent/pom.xml 2010-12-23 14:27:11 UTC (rev 20771) @@ -345,7 +345,7 @@ </dependencies> </profile> <profile> - <id>jsf_ri_snapshot</id> + <id>jsf_ri_2_1_snapshot</id> <activation> <property> <name>jsf_profile</name> @@ -368,6 +368,29 @@ </dependencies> </profile> <profile> + <id>jsf_ri_2_1</id> + <activation> + <property> + <name>jsf_profile</name> + <value>jsf_ri_2_1</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1.0-b09</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.1.0-b09</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> <id>myfaces_snapshot</id> <activation> <property> @@ -379,13 +402,13 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.4-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.4-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies>