Permalink
Browse files

container boms improvements

- move Java EE APIs into container boms
- add missing initialcontext testenricher to glassfish remote container
- reference weld-api instead of weld-core in remote container boms
- add some test excludes
  • Loading branch information...
1 parent fe1157b commit 53cad336e53bc763bff7329eaff4da5069e300cc @mojavelinux mojavelinux committed Jul 19, 2011
View
12 cdi-ejb/pom.xml
@@ -89,6 +89,18 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/MixedInterfaceEjbTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
View
41 cdi/pom.xml
@@ -42,11 +42,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -76,11 +71,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
</profile>
@@ -146,6 +136,18 @@
</profile>
<profile>
+ <id>arq-jbossas-remote-6</id>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>container-bom-jbossas-remote-6</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>arq-glassfish-embedded</id>
<dependencies>
<dependency>
@@ -162,6 +164,7 @@
<configuration>
<excludes>
<exclude>**/AmbiguousDependencyTestCase.java</exclude>
+ <!-- use alternate @Deployment method to make this test pass -->
<exclude>**/SynchronousPaymentProcessorTestCase.java</exclude>
</excludes>
</configuration>
@@ -179,12 +182,20 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- use alternate @Deployment method to make this test pass -->
+ <exclude>**/SynchronousPaymentProcessorTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!-- resin-embedded cannot run tests sequentially (only one per run) -->
View
25 container-boms/glassfish-remote-3.1/pom.xml
@@ -20,21 +20,46 @@
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- FIXME include initialcontext testenricher in container pom -->
+ <dependency>
+ <groupId>org.jboss.arquillian.testenricher</groupId>
+ <artifactId>arquillian-testenricher-initialcontext</artifactId>
+ <version>1.0.0.CR1</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<!--
View
10 container-boms/jbossas-managed-6/pom.xml
@@ -38,10 +38,16 @@
<version>2.2.0.GA</version>
<scope>compile</scope>
</dependency>
- <!-- weld is needed to marshall exceptions -->
+ <!-- weld-api is needed to marshall exceptions -->
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
+ <artifactId>weld-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
<scope>compile</scope>
</dependency>
</dependencies>
View
10 container-boms/jbossas-remote-6/pom.xml
@@ -33,10 +33,16 @@
<version>2.2.0.GA</version>
<scope>compile</scope>
</dependency>
- <!-- weld is needed to marshall exceptions (core or just api?) -->
+ <!-- weld-api is needed to marshall exceptions -->
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
+ <artifactId>weld-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
<scope>compile</scope>
</dependency>
</dependencies>
View
6 container-boms/weld-ee-embedded-1.1/pom.xml
@@ -35,6 +35,12 @@
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<!--
View
6 container-boms/weld-se-embedded-1.1/pom.xml
@@ -35,6 +35,12 @@
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<!--
View
5 jaxrs/pom.xml
@@ -49,11 +49,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
<build>
<testResources>
View
23 jms/pom.xml
@@ -103,30 +103,17 @@
<id>arq-glassfish-remote</id>
<dependencies>
<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-remote-3.1</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>container-bom-glassfish-remote-3.1</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
</dependency>
+ <!-- need the jms apis -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <version>1.1.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-bundle</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</profile>
View
11 jpa/pom.xml
@@ -45,11 +45,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
<build>
<testResources>
@@ -118,7 +113,6 @@
<profile>
<!-- Test requires the default JavaDB to be started (asadmin start-database) -->
- <!-- Broken since Weld is not injected UserTransaction correctly -->
<id>arq-glassfish-remote</id>
<dependencies>
<dependency>
@@ -127,11 +121,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
<build>
<testResources>
View
14 jsf/pom.xml
@@ -133,17 +133,9 @@
-->
<dependencies>
<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-remote-3.1</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-bundle</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>container-bom-glassfish-remote-3.1</artifactId>
+ <type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
View
6 multinode/pom.xml
@@ -37,12 +37,6 @@
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>1.0.0-beta-3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<version>1.0.0-beta-3</version>
<scope>test</scope>
View
3 readme.txt
@@ -4,4 +4,5 @@
interact as a remote client.
All about arquillian: http://jboss.org/arquillian
-
+
+GlassFish requires update to Weld 1.1.1.Final, see http://seamframework.org/Seam3/Compatibility
View
5 servlet/pom.xml
@@ -77,11 +77,6 @@
<type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
</profile>
View
21 ui/pom.xml
@@ -28,11 +28,6 @@
<version>3.0.0.Final</version>
</dependency>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
</dependency>
@@ -41,6 +36,12 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <version>1.0.0-beta-3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-impl</artifactId>
<version>${version.arquillian_extension}</version>
@@ -127,6 +128,11 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
<testResources>
@@ -147,6 +153,11 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
<testResources>

0 comments on commit 53cad33

Please sign in to comment.