[weld-commits] Weld SVN: r3924 - cdi-tck/trunk/impl and 5 other directories.

[weld-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2009-10-10 12:18:17 -0400 (Sat, 10 Oct 2009)
New Revision: 3924

Removed:
   core/trunk/cdi-api/src/main/java/javax/interceptor/
Modified:
   cdi-tck/trunk/impl/pom.xml
   cdi-tck/trunk/pom.xml
   core/trunk/impl/pom.xml
   core/trunk/spi/pom.xml
   core/trunk/tests/pom.xml
   core/trunk/version-matrix/pom.xml
Log:
Use org.jboss.interceptors:jboss-interceptor-api.jar and the newly renamed org.jboss.interceptors:jboss-interceptor.jar

Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ cdi-tck/trunk/impl/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -78,6 +78,11 @@
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.interceptor</groupId>
+        <artifactId>jboss-interceptor-api</artifactId>
+      </dependency>
+     
+      <dependency>
          <groupId>javax.annotation</groupId>
          <artifactId>jsr250-api</artifactId>
       </dependency>

Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ cdi-tck/trunk/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -169,6 +169,11 @@
          	</exclusions>
          </dependency>
          <dependency>
+            <groupId>org.jboss.interceptor</groupId>
+            <artifactId>jboss-interceptor-api</artifactId>
+            <version>3.1.0-SNAPSHOT</version>
+         </dependency>
+         <dependency>
          	<groupId>javax.jws</groupId>
          	<artifactId>jsr181-api</artifactId>
          	<version>1.0-MR1</version>

Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ core/trunk/impl/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -115,12 +115,19 @@
          <optional>true</optional>
       </dependency>
 
-       <dependency>
-           <groupId>org.jboss.interceptors</groupId>
-           <artifactId>interceptors</artifactId>
-           <optional>true</optional>
-       </dependency>
+     <dependency>
+       <groupId>org.jboss.interceptor</groupId>
+       <artifactId>jboss-interceptor-api</artifactId>
+       <optional>true</optional>
+     </dependency>
 
+
+     <dependency>
+       <groupId>org.jboss.interceptor</groupId>
+       <artifactId>jboss-interceptor</artifactId>
+       <optional>true</optional>
+     </dependency>
+
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>

Modified: core/trunk/spi/pom.xml
===================================================================
--- core/trunk/spi/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ core/trunk/spi/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -71,6 +71,12 @@
          <optional>true</optional>
       </dependency>
 
+      <dependency>
+        <groupId>org.jboss.interceptor</groupId>
+        <artifactId>jboss-interceptor-api</artifactId>
+        <optional>true</optional>
+      </dependency>
+
    </dependencies>
 
    <build>

Modified: core/trunk/tests/pom.xml
===================================================================
--- core/trunk/tests/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ core/trunk/tests/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -58,10 +58,15 @@
          <groupId>org.jboss.weld</groupId>
          <artifactId>weld-spi</artifactId>
       </dependency>
-      
+
+     <dependency>
+         <groupId>org.jboss.interceptor</groupId>
+         <artifactId>jboss-interceptor-api</artifactId>
+      </dependency>
+
       <dependency>
-         <groupId>org.jboss.interceptors</groupId>
-         <artifactId>interceptors</artifactId>
+         <groupId>org.jboss.interceptor</groupId>
+         <artifactId>jboss-interceptor</artifactId>
       </dependency>
       
       <dependency>

Modified: core/trunk/version-matrix/pom.xml
===================================================================
--- core/trunk/version-matrix/pom.xml	2009-10-10 16:13:02 UTC (rev 3923)
+++ core/trunk/version-matrix/pom.xml	2009-10-10 16:18:17 UTC (rev 3924)
@@ -282,13 +282,19 @@
             <version>3.1.0-Alpha1</version>
          </dependency>
 
-         <dependency>
-             <groupId>org.jboss.interceptors</groupId>
-             <artifactId>interceptors</artifactId>
-             <version>1.0.0-SNAPSHOT</version>
-         </dependency>
-         
-         <dependency>
+        <dependency>
+          <groupId>org.jboss.interceptor</groupId>
+          <artifactId>jboss-interceptor-api</artifactId>
+          <version>3.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.jboss.interceptor</groupId>
+          <artifactId>jboss-interceptor</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.sun.facelets</groupId>
             <artifactId>jsf-facelets</artifactId>
             <version>1.1.15.B1</version>