[jboss-cvs] JBossAS SVN: r95062 - in trunk: component-matrix and 1 other directory.

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

Author: pete.muir at jboss.org
Date: 2009-10-17 10:18:07 -0400 (Sat, 17 Oct 2009)
New Revision: 95062

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
Log:
JBAS-7378, upgrade to WELD 1.0.0 CR1

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-10-17 11:36:33 UTC (rev 95061)
+++ trunk/build/build.xml	2009-10-17 14:18:07 UTC (rev 95062)
@@ -2298,7 +2298,7 @@
     </copy>
 
     <unzip dest="${install.server}/all/deployers">
-      <fileset file="${org.jboss.webbeans.integration:webbeans-jboss-int-deployer:zip}"/>
+      <fileset file="${org.jboss.weld.integration:weld-jboss-int-deployer-assembly:zip}"/>
     </unzip>
 
     <!-- Copy varia stuff -->

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-10-17 11:36:33 UTC (rev 95061)
+++ trunk/build/pom.xml	2009-10-17 14:18:07 UTC (rev 95062)
@@ -464,8 +464,8 @@
       <artifactId>jboss-threads-metadata</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>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-17 11:36:33 UTC (rev 95061)
+++ trunk/component-matrix/pom.xml	2009-10-17 14:18:07 UTC (rev 95062)
@@ -120,7 +120,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</version.sun.jaxb>
-    <version.webbeans.integration>5.2.0.Beta2</version.webbeans.integration>
+    <version.weld.integration>5.2.0.Beta4</version.weld.integration>
     <version.xdoclet>1.2.3</version.xdoclet>
     <version.weld.api>1.0-CR1</version.weld.api>
     <version.spring.integration>1.0.0.CR2</version.spring.integration>
@@ -155,21 +155,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>
-        <!-- temporary workaround for bad Web Beans pom -->
-        <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>