[jboss-cvs] JBossAS SVN: r94891 - in projects/kernel/trunk: weld-int and 1 other directory.

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

Author: alesj
Date: 2009-10-14 16:20:04 -0400 (Wed, 14 Oct 2009)
New Revision: 94891

Modified:
   projects/kernel/trunk/pom.xml
   projects/kernel/trunk/weld-int/pom.xml
Log:
Enable Weld-int; perhaps some local weld/extensiosn/bean-utils needs to be deployed, until Weld does it

Modified: projects/kernel/trunk/pom.xml
===================================================================
--- projects/kernel/trunk/pom.xml	2009-10-14 20:09:30 UTC (rev 94890)
+++ projects/kernel/trunk/pom.xml	2009-10-14 20:20:04 UTC (rev 94891)
@@ -29,7 +29,7 @@
     <module>jmx-aop-mc-int</module>
     <module>spring-int</module>
     <module>guice-int</module>
-    <!-- module>weld-int</module -->
+    <module>weld-int</module>
     <module>build</module>
   </modules>
 
@@ -53,10 +53,12 @@
     <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
     <version.google.guice>2.0</version.google.guice>
     <version.jboss.byteman>1.0.3.CP01</version.jboss.byteman>    
-    <version.org.jboss.weld.ri>1.0.0-SNAPSHOT</version.org.jboss.weld.ri>
     <version.org.jboss.ejb3.api>3.1.0-Alpha1</version.org.jboss.ejb3.api> 
     <version.javax.validation>1.0.CR3</version.javax.validation>
     <version.javax.faces.jsf-api>1.2_12</version.javax.faces.jsf-api>
+    <version.org.jboss.weld.api>1.0-CR1</version.org.jboss.weld.api>
+    <version.org.jboss.weld.core>1.0.0-SNAPSHOT</version.org.jboss.weld.core>
+    <version.org.jboss.weld.ext>1.0.0-SNAPSHOT</version.org.jboss.weld.ext>
   </properties>
 
   <build>
@@ -273,19 +275,19 @@
         <version>${version.ant.junit}</version>
       </dependency>
       <dependency>
-        <groupId>org.jboss.weld</groupId>
-        <artifactId>jsr299-api</artifactId>
-        <version>${version.org.jboss.weld.ri}</version>
+        <groupId>javax.enterprise</groupId>
+        <artifactId>cdi-api</artifactId>
+        <version>${version.org.jboss.weld.api}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-core-test</artifactId>
-        <version>${version.org.jboss.weld.ri}</version>
+        <version>${version.org.jboss.weld.core}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-bean-utils</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${version.org.jboss.weld.ext}</version>
       </dependency>
       <!-- Move this down to tests once finalized -->
       <dependency>

Modified: projects/kernel/trunk/weld-int/pom.xml
===================================================================
--- projects/kernel/trunk/weld-int/pom.xml	2009-10-14 20:09:30 UTC (rev 94890)
+++ projects/kernel/trunk/weld-int/pom.xml	2009-10-14 20:20:04 UTC (rev 94891)
@@ -38,8 +38,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>jsr299-api</artifactId>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld</groupId>
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-bean-utils</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>