[jboss-cvs] JBossAS SVN: r106743 - in trunk: testsuite and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2010-07-15 09:29:34 -0400 (Thu, 15 Jul 2010)
New Revision: 106743

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/build.xml
   trunk/testsuite/pom.xml
   trunk/weld-int/deployer/pom.xml
   trunk/weld-int/ejb/pom.xml
   trunk/weld-int/webtier/pom.xml
Log:
JBAS-8215 - upgrade jboss-javaee6-specs-bom to 1.0.0.Beta4

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/component-matrix/pom.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -46,7 +46,7 @@
     <version.rhq>1.4.0.B01</version.rhq>
     <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
     <version.javassist>3.12.1.GA</version.javassist>
-    <version.javax.faces>2.0.2-FCS</version.javax.faces>
+    <version.javax.faces>2.0.3-20100630.jar</version.javax.faces>
     <version.javax.validation>1.0.0.GA</version.javax.validation>
     <version.jaxrpc.api>1.1</version.jaxrpc.api>
     <version.jboss.jaxr>2.0.1</version.jboss.jaxr>
@@ -112,7 +112,7 @@
    <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
     <version.org.jboss.interceptor>1.0.0-CR11</version.org.jboss.interceptor>
     <version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
-    <version.org.jboss.javaee.specs.bom>1.0.0.Beta3</version.org.jboss.javaee.specs.bom>
+    <version.org.jboss.javaee.specs.bom>1.0.0.Beta4</version.org.jboss.javaee.specs.bom>
     <version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.4.0.CR2</version.org.jboss.jopr>
     <version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
@@ -730,7 +730,7 @@
       </dependency>
       
       <dependency>
-        <groupId>javax.faces</groupId>
+        <groupId>com.sun.faces</groupId>
         <artifactId>jsf-impl</artifactId>
         <version>${version.javax.faces}</version>
       </dependency>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/testsuite/build.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -251,8 +251,7 @@
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
       <fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
       <fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
-      <fileset refid="javax.faces:jsf-api:jar"/>
-      <fileset refid="javax.faces:jsf-impl:jar"/>
+      <fileset refid="com.sun.faces:jsf-api:jar"/>
       <fileset refid="javax.validation:validation-api:jar"/>
       <fileset refid="org.jboss.web:jasper-jdt:jar"/>
       <fileset refid="org.jboss.web:jbossweb:jar"/>

Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/testsuite/pom.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -85,13 +85,15 @@
       <artifactId>jstl</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.faces</groupId>
+      <groupId>com.sun.faces</groupId>
       <artifactId>jsf-api</artifactId>
     </dependency>
+    <!--
     <dependency>
-      <groupId>javax.faces</groupId>
+      <groupId>com.sun.faces</groupId>
       <artifactId>jsf-impl</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>org.jboss.web</groupId>
       <artifactId>jasper-jdt</artifactId>

Modified: trunk/weld-int/deployer/pom.xml
===================================================================
--- trunk/weld-int/deployer/pom.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/weld-int/deployer/pom.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -332,7 +332,7 @@
     </dependency>
     
     <dependency>
-      <groupId>javax.faces</groupId>
+      <groupId>com.sun.faces</groupId>
       <artifactId>jsf-api</artifactId>
     </dependency>
     

Modified: trunk/weld-int/ejb/pom.xml
===================================================================
--- trunk/weld-int/ejb/pom.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/weld-int/ejb/pom.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -267,7 +267,7 @@
     </dependency>
     
     <dependency>
-      <groupId>javax.faces</groupId>
+      <groupId>com.sun.faces</groupId>
       <artifactId>jsf-api</artifactId>
     </dependency>
 

Modified: trunk/weld-int/webtier/pom.xml
===================================================================
--- trunk/weld-int/webtier/pom.xml	2010-07-15 13:23:01 UTC (rev 106742)
+++ trunk/weld-int/webtier/pom.xml	2010-07-15 13:29:34 UTC (rev 106743)
@@ -23,7 +23,7 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.faces</groupId>
+            <groupId>com.sun.faces</groupId>
             <artifactId>jsf-api</artifactId>
         </dependency>