Author: richard.opalka(a)jboss.com Date: 2011-10-13 10:02:26 -0400 (Thu, 13 Oct 2011) New Revision: 15098 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: use jboss spec ejb API version plus fixing endorsement for AS6 targets Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2011-10-13 12:59:20 UTC (rev 15097) +++ stack/native/trunk/modules/core/pom.xml 2011-10-13 14:02:26 UTC (rev 15098) @@ -55,8 +55,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 12:59:20 UTC (rev 15097) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 14:02:26 UTC (rev 15098) @@ -69,10 +69,6 @@ <systemPath>${java.home}/../lib/tools.jar</systemPath> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> @@ -119,6 +115,11 @@ <version>${jboss.javaee.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>test</scope> + </dependency> </dependencies> <!-- Build --> @@ -181,6 +182,13 @@ <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/endorsed</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> </artifactItems> </configuration> </execution> @@ -427,7 +435,7 @@ <properties> <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> - <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs> + <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> <dependencies> <dependency> @@ -439,6 +447,10 @@ <exclusions> <!-- Exclusion for not depending on the container integration --> <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> + <exclusion> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> </exclusion> @@ -552,6 +564,9 @@ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + <!-- # [JBWS-3026] fixed since AS 7.1 --> + <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> + <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 --> <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> </excludes> @@ -570,7 +585,7 @@ <properties> <jboss.version>6.1.0.Final</jboss.version> <jbossws.integration.target>jboss610</jbossws.integration.target> - <endorsed.dirs>${jboss610.home}/lib/endorsed</endorsed.dirs> + <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> <dependencies> <dependency> @@ -580,6 +595,10 @@ <type>pom</type> <version>${jboss.version}</version> <exclusions> + <exclusion> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-ejb-api</artifactId> + </exclusion> <!-- Exclusion for not depending on the container integration --> <exclusion> <groupId>org.jboss.jbossas</groupId> @@ -695,6 +714,9 @@ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + <!-- # [JBWS-3026] fixed since AS 7.1 --> + <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> + <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 --> <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> </excludes> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-10-13 12:59:20 UTC (rev 15097) +++ stack/native/trunk/pom.xml 2011-10-13 14:02:26 UTC (rev 15098) @@ -53,6 +53,7 @@ <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> <jboss700.version>7.0.0.Final</jboss700.version> + <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -153,11 +154,6 @@ <version>1.0</version> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - <version>3.0</version> - </dependency> - <dependency> <groupId>javax.jms</groupId> <artifactId>jms</artifactId> <version>1.1</version> @@ -289,6 +285,11 @@ <version>${jaxws.api.version}</version> </dependency> <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <version>${ejb.api.version}</version> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> <version>${jaxrpc.api.version}</version>