[jboss-svn-commits] JBoss Common SVN: r4137 - in arquillian/trunk: examples/domain and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Mar 9 08:41:01 EST 2010


Author: aslak
Date: 2010-03-09 08:41:00 -0500 (Tue, 09 Mar 2010)
New Revision: 4137

Modified:
   arquillian/trunk/containers/glassfish-embedded-30/pom.xml
   arquillian/trunk/examples/domain/pom.xml
   arquillian/trunk/examples/junit/pom.xml
   arquillian/trunk/examples/testng/pom.xml
   arquillian/trunk/protocols/servlet/pom.xml
Log:
ARQ-87 Removed reference to javaee-api. Can not be on runtime claspath


Modified: arquillian/trunk/containers/glassfish-embedded-30/pom.xml
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/pom.xml	2010-03-09 13:32:31 UTC (rev 4136)
+++ arquillian/trunk/containers/glassfish-embedded-30/pom.xml	2010-03-09 13:41:00 UTC (rev 4137)
@@ -54,16 +54,6 @@
          <groupId>org.jboss.arquillian.protocol</groupId>
          <artifactId>arquillian-protocol-servlet</artifactId>
          <version>${project.version}</version>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.servlet</groupId>
-               <artifactId>servlet-api</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>javax</groupId>
-               <artifactId>javaee-api</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
 
       <dependency>

Modified: arquillian/trunk/examples/domain/pom.xml
===================================================================
--- arquillian/trunk/examples/domain/pom.xml	2010-03-09 13:32:31 UTC (rev 4136)
+++ arquillian/trunk/examples/domain/pom.xml	2010-03-09 13:41:00 UTC (rev 4137)
@@ -29,11 +29,42 @@
    <!-- Dependencies -->
    <dependencies>
 
+      <dependency> 
+         <groupId>org.jboss.ejb3</groupId> 
+         <artifactId>jboss-ejb3-api</artifactId> 
+         <version>3.1.0</version>
+         <scope>provided</scope>
+      </dependency>
       <dependency>
-         <groupId>javax</groupId>
-         <artifactId>javaee-api</artifactId>
+         <groupId>javax.jms</groupId> 
+         <artifactId>jms</artifactId> 
+         <version>1.1</version> 
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>javax.annotation</groupId> 
+         <artifactId>jsr250-api</artifactId> 
+         <version>1.0</version> 
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.persistence</groupId> 
+         <artifactId>persistence-api</artifactId> 
+         <version>1.0</version> 
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.enterprise</groupId> 
+         <artifactId>cdi-api</artifactId> 
+         <version>1.0-SP1</version> 
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId> 
+         <artifactId>mail</artifactId> 
+         <version>1.4.1</version> 
+         <scope>provided</scope>
+      </dependency>
 
    </dependencies>
 

Modified: arquillian/trunk/examples/junit/pom.xml
===================================================================
--- arquillian/trunk/examples/junit/pom.xml	2010-03-09 13:32:31 UTC (rev 4136)
+++ arquillian/trunk/examples/junit/pom.xml	2010-03-09 13:41:00 UTC (rev 4137)
@@ -27,19 +27,16 @@
 
    <profiles>
       <profile>
-         <!--
-            Added a default profile used during compiling. The JavaEE
-            API jar can not be on classpath during test execution.
-         -->
          <id>default</id>
          <activation>
             <activeByDefault>true</activeByDefault>
          </activation>
          <dependencies>
-            <dependency>
-               <groupId>javax</groupId>
-               <artifactId>javaee-api</artifactId>
-               <scope>provided</scope>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
             </dependency>
          </dependencies>
          <build>
@@ -63,6 +60,12 @@
                <artifactId>arquillian-weld-embedded</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -87,6 +90,12 @@
                <artifactId>arquillian-jbossas-embedded-60</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
       </profile>
       <profile>
@@ -97,6 +106,12 @@
                <artifactId>arquillian-jbossas-remote-51</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -127,6 +142,12 @@
                <artifactId>arquillian-jbossas-remote-60</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <testResources>
@@ -167,6 +188,12 @@
                <artifactId>arquillian-openejb</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -203,11 +230,42 @@
       </dependency>
 
       <dependency>
+         <groupId>javax.jms</groupId> 
+         <artifactId>jms</artifactId> 
+         <version>1.1</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.annotation</groupId> 
+         <artifactId>jsr250-api</artifactId> 
+         <version>1.0</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.persistence</groupId> 
+         <artifactId>persistence-api</artifactId> 
+         <version>1.0</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.enterprise</groupId> 
+         <artifactId>cdi-api</artifactId> 
+         <version>1.0-SP1</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId> 
+         <artifactId>mail</artifactId> 
+         <version>1.4.1</version> 
+         <scope>test</scope>
+      </dependency>
+  
+      <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-
+	
    </dependencies>
 
 </project>

Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml	2010-03-09 13:32:31 UTC (rev 4136)
+++ arquillian/trunk/examples/testng/pom.xml	2010-03-09 13:41:00 UTC (rev 4137)
@@ -28,19 +28,16 @@
 
    <profiles>
       <profile>
-         <!--
-            Added a default profile used during compiling. The JavaEE
-            API jar can not be on classpath during test execution.
-         -->
          <id>default</id>
          <activation>
             <activeByDefault>true</activeByDefault>
          </activation>
          <dependencies>
-            <dependency>
-               <groupId>javax</groupId>
-               <artifactId>javaee-api</artifactId>
-               <scope>provided</scope>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
             </dependency>
          </dependencies>
          <build>
@@ -64,6 +61,12 @@
                <artifactId>arquillian-weld-embedded</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -88,6 +91,12 @@
                <artifactId>arquillian-jbossas-embedded-60</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
       </profile>
       <profile>
@@ -98,6 +107,12 @@
                <artifactId>arquillian-jbossas-remote-51</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -128,6 +143,12 @@
                <artifactId>arquillian-jbossas-remote-60</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <testResources>
@@ -168,6 +189,12 @@
                <artifactId>arquillian-openejb</artifactId>
                <version>${project.version}</version>
             </dependency>
+            <dependency> <!-- Need on all profiles except Glassfish to compile, api is not 100% up to date with final spec -->
+               <groupId>org.jboss.ejb3</groupId> 
+               <artifactId>jboss-ejb3-api</artifactId> 
+               <version>3.1.0</version>
+               <scope>test</scope>
+            </dependency>
          </dependencies>
          <build>
             <plugins>
@@ -188,6 +215,7 @@
       </profile>
    </profiles>
 
+
    <!-- Dependencies -->
    <dependencies>
 
@@ -204,6 +232,37 @@
       </dependency>
 
       <dependency>
+         <groupId>javax.jms</groupId> 
+         <artifactId>jms</artifactId> 
+         <version>1.1</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.annotation</groupId> 
+         <artifactId>jsr250-api</artifactId> 
+         <version>1.0</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.persistence</groupId> 
+         <artifactId>persistence-api</artifactId> 
+         <version>1.0</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.enterprise</groupId> 
+         <artifactId>cdi-api</artifactId> 
+         <version>1.0-SP1</version> 
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.mail</groupId> 
+         <artifactId>mail</artifactId> 
+         <version>1.4.1</version> 
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
          <classifier>jdk15</classifier>

Modified: arquillian/trunk/protocols/servlet/pom.xml
===================================================================
--- arquillian/trunk/protocols/servlet/pom.xml	2010-03-09 13:32:31 UTC (rev 4136)
+++ arquillian/trunk/protocols/servlet/pom.xml	2010-03-09 13:41:00 UTC (rev 4137)
@@ -27,26 +27,6 @@
 
    </properties>
 
-   <profiles>
-      <profile>
-         <!-- 
-            Added a default profile used during compiling. 
-            The JavaEE API jar can not be on classpath during test execution.
-          -->
-         <id>default</id>
-         <activation>
-            <activeByDefault>true</activeByDefault>
-         </activation>
-         <dependencies>
-            <dependency>
-               <groupId>javax</groupId>
-               <artifactId>javaee-api</artifactId>
-               <scope>provided</scope>
-            </dependency>
-         </dependencies>
-      </profile>
-   </profiles>
-   
    <!-- Dependencies -->
    <dependencies>
 
@@ -62,8 +42,14 @@
       <!-- 
     servlet api
      -->
-
       <dependency>
+         <groupId>jboss.web</groupId> 
+         <artifactId>servlet-api</artifactId> 
+         <version>3.0.0.alpha-25</version> 
+         <scope>provided</scope>
+      </dependency>
+      
+      <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
          <scope>test</scope>



More information about the jboss-svn-commits mailing list