[jboss-cvs] JBossAS SVN: r94903 - in branches/Branch_5_x: component-matrix and 1 other directories.

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

Author: pete.muir at jboss.org
Date: 2009-10-14 20:13:27 -0400 (Wed, 14 Oct 2009)
New Revision: 94903

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7244, upgrade to Weld 1.0.0-CR1

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-10-14 23:53:26 UTC (rev 94902)
+++ branches/Branch_5_x/build/build-distr.xml	2009-10-15 00:13:27 UTC (rev 94903)
@@ -2301,8 +2301,8 @@
     </chmod>
    	
     <unzip dest="${install.server}/all/deployers">
-       <fileset dir="${webbeans.deployer.lib}">
-         <include name="webbeans-jboss-int-deployer.zip"/>
+       <fileset dir="${weld.deployer.lib}">
+         <include name="weld-jboss-int-deployer-assembly.zip"/>
        </fileset>
     </unzip>
 

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-10-14 23:53:26 UTC (rev 94902)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-10-15 00:13:27 UTC (rev 94903)
@@ -116,7 +116,7 @@
     <version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
     <version.sun-jaxws>2.1.3</version.sun-jaxws>
     <version.sun.jaxb>2.1.9-brew</version.sun.jaxb>
-    <version.webbeans.integration>5.2.0.Beta2</version.webbeans.integration>
+    <version.weld.integration>5.2.0-SNAPSHOT</version.weld.integration>
     <version.weld.api>1.0-CR1</version.weld.api>
     <version.xdoclet>1.2.3</version.xdoclet>
   </properties>
@@ -171,20 +171,10 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.webbeans.integration</groupId>
-        <artifactId>webbeans-jboss-int-deployer</artifactId>
-        <version>${version.webbeans.integration}</version>
+        <groupId>org.jboss.weld.integration</groupId>
+        <artifactId>weld-jboss-int-deployer-assembly</artifactId>
+        <version>${version.weld.integration}</version>
         <type>zip</type>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-core</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.webbeans.integration</groupId>
-            <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
 
       <dependency>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-10-14 23:53:26 UTC (rev 94902)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-10-15 00:13:27 UTC (rev 94903)
@@ -1037,10 +1037,10 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.webbeans.integration</groupId>
-              <artifactId>webbeans-jboss-int-deployer</artifactId>
+              <groupId>org.jboss.weld.integration</groupId>
+              <artifactId>weld-jboss-int-deployer-assembly</artifactId>
               <mapping>
-                <componentId>webbeans-deployer</componentId>
+                <componentId>weld-deployer</componentId>
               </mapping>
             </dependency>
             <!-- End mapped dependecies -->
@@ -1072,8 +1072,8 @@
       <artifactId>jboss-seam-int-jbossas</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.webbeans.integration</groupId>
-      <artifactId>webbeans-jboss-int-deployer</artifactId>
+      <groupId>org.jboss.weld.integration</groupId>
+      <artifactId>weld-jboss-int-deployer-assembly</artifactId>
       <type>zip</type>
     </dependency>
     <dependency>