[jboss-cvs] JBossAS SVN: r108503 - in branches/weld-snapshot-integration: weld-int/assembly and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-10-10 21:09:21 -0400 (Sun, 10 Oct 2010)
New Revision: 108503

Modified:
   branches/weld-snapshot-integration/component-matrix/pom.xml
   branches/weld-snapshot-integration/weld-int/assembly/pom.xml
   branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml
Log:
Reverted temporarily to allow merging trunk

Modified: branches/weld-snapshot-integration/component-matrix/pom.xml
===================================================================
--- branches/weld-snapshot-integration/component-matrix/pom.xml	2010-10-10 17:49:00 UTC (rev 108502)
+++ branches/weld-snapshot-integration/component-matrix/pom.xml	2010-10-11 01:09:21 UTC (rev 108503)
@@ -91,7 +91,7 @@
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
     <version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
     <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
-    <version.org.jboss.interceptor>2.0.0.Alpha1</version.org.jboss.interceptor>
+    <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.Beta6</version.org.jboss.javaee.specs.bom>
     <version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
@@ -248,17 +248,11 @@
 
       <dependency>
         <groupId>org.jboss.interceptor</groupId>
-        <artifactId>jboss-interceptor-spi</artifactId>
+        <artifactId>jboss-interceptor</artifactId>
         <version>${version.org.jboss.interceptor}</version>
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.interceptor</groupId>
-         <artifactId>jboss-interceptor-core</artifactId>
-         <version>${version.org.jboss.interceptor}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.jboss.snowdrop</groupId>
         <artifactId>jboss-spring-deployer</artifactId>
         <version>${version.spring.integration}</version>

Modified: branches/weld-snapshot-integration/weld-int/assembly/pom.xml
===================================================================
--- branches/weld-snapshot-integration/weld-int/assembly/pom.xml	2010-10-10 17:49:00 UTC (rev 108502)
+++ branches/weld-snapshot-integration/weld-int/assembly/pom.xml	2010-10-11 01:09:21 UTC (rev 108503)
@@ -142,17 +142,11 @@
     
     <dependency>
       <groupId>org.jboss.interceptor</groupId>
-      <artifactId>jboss-interceptor-spi</artifactId>
+      <artifactId>jboss-interceptor</artifactId>
       <optional>true</optional>
     </dependency>
-
+      
     <dependency>
-      <groupId>org.jboss.interceptor</groupId>
-      <artifactId>jboss-interceptor-core</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
       <groupId>javax.enterprise</groupId>
       <artifactId>cdi-api</artifactId>
       <optional>true</optional>

Modified: branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml
===================================================================
--- branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml	2010-10-10 17:49:00 UTC (rev 108502)
+++ branches/weld-snapshot-integration/weld-int/assembly/src/main/assembly/assembly.xml	2010-10-11 01:09:21 UTC (rev 108503)
@@ -30,8 +30,8 @@
             <include>org.jboss.jbossas:weld-int-ejb</include>
             <include>org.jboss.jbossas:weld-int-deployer</include>
             <include>org.jboss.jbossas:weld-int-deployer-mc-int</include>
-            <include>org.jboss.interceptor:jboss-interceptor-spi</include>
-            <include>org.jboss.interceptor:jboss-interceptor-core</include>
+
+            <include>org.jboss.interceptor:jboss-interceptor</include>
          </includes>
       </dependencySet>
       <dependencySet>