[jboss-cvs] JBossAS SVN: r100216 - in projects/weld-int/trunk: deployer-mc-int and 1 other directory.

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

Author: alesj
Date: 2010-02-01 11:15:20 -0500 (Mon, 01 Feb 2010)
New Revision: 100216

Modified:
   projects/weld-int/trunk/deployer-mc-int/pom.xml
   projects/weld-int/trunk/pom.xml
Log:
Enable Kabir's Weld-int as part of main build.

Modified: projects/weld-int/trunk/deployer-mc-int/pom.xml
===================================================================
--- projects/weld-int/trunk/deployer-mc-int/pom.xml	2010-02-01 16:08:06 UTC (rev 100215)
+++ projects/weld-int/trunk/deployer-mc-int/pom.xml	2010-02-01 16:15:20 UTC (rev 100216)
@@ -39,100 +39,8 @@
         </configuration>
       </plugin>
     </plugins>
-  </build>   
+  </build>
 
-   <properties>
-      <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel>
-      <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
-   </properties>
-
-   <dependencyManagement>
-      <!-- The parent pom manages the inter-dependencies of the modules. -->
-      <dependencies>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-client</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-client-spi</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-core-spi</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-impl</artifactId>
-            <version>${version.jboss.deployers}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.jboss</groupId>
-                  <artifactId>javassist</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-spi</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-structure-spi</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-vfs</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-          <dependency>
-            <groupId>org.jboss.deployers</groupId>
-            <artifactId>jboss-deployers-vfs-spi</artifactId>
-            <version>${version.jboss.deployers}</version>
-         </dependency>
-
-          <dependency>
-            <groupId>org.jboss.kernel</groupId>
-            <artifactId>jboss-dependency</artifactId>
-            <version>${version.jboss.kernel}</version>
-         </dependency>
-
-         <dependency>
-            <groupId>org.jboss.kernel</groupId>
-            <artifactId>jboss-kernel</artifactId>
-            <version>${version.jboss.kernel}</version>
-         </dependency>
-
-         <dependency>
-            <groupId>org.jboss.kernel</groupId>
-            <artifactId>jboss-weld-int</artifactId>
-            <version>${version.jboss.kernel}</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>org.jboss.weld.integration</groupId>
-            <artifactId>weld-jboss-int-deployer</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-
-         <dependency>
-            <groupId>org.jboss.weld.integration</groupId>
-            <artifactId>weld-jboss-int-deployer</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-            <version>${project.version}</version>
-         </dependency>
-         
-      </dependencies>
-   </dependencyManagement>
- 
-
-
   <dependencies>
   
     <dependency>
@@ -180,7 +88,6 @@
     <dependency>
       <groupId>org.jboss.kernel</groupId>
       <artifactId>jboss-weld-int</artifactId>
-      <version>${version.jboss.kernel}</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.microcontainer</groupId>
@@ -358,12 +265,9 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${version.slf4j}</version>
       <scope>test</scope>
     </dependency>
 
   </dependencies>
   
-  
-  
 </project>

Modified: projects/weld-int/trunk/pom.xml
===================================================================
--- projects/weld-int/trunk/pom.xml	2010-02-01 16:08:06 UTC (rev 100215)
+++ projects/weld-int/trunk/pom.xml	2010-02-01 16:15:20 UTC (rev 100216)
@@ -20,6 +20,7 @@
       <module>ejb</module>
       <module>webtier</module>
       <module>deployer</module>
+      <module>deployer-mc-int</module>
       <module>assembly</module>
    </modules>
 
@@ -312,6 +313,12 @@
          </dependency>
 
          <dependency>
+            <groupId>org.jboss.kernel</groupId>
+            <artifactId>jboss-weld-int</artifactId>
+            <version>${version.jboss.microcontainer}</version>
+         </dependency>
+
+         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-common-core</artifactId>
             <version>${version.jboss.common.core}</version>
@@ -409,6 +416,14 @@
 
          <dependency>
             <groupId>org.jboss.weld.integration</groupId>
+            <artifactId>weld-jboss-int-deployer</artifactId>
+            <version>${project.version}</version>
+             <type>test-jar</type>
+            <scope>test</scope>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.weld.integration</groupId>
             <artifactId>weld-jboss-int-deployer-mc-int</artifactId>
             <version>${project.version}</version>
          </dependency>