Author: jim.ma Date: 2013-04-12 01:17:59 -0400 (Fri, 12 Apr 2013) New Revision: 17493 Modified: projects/wsi-bp-test/trunk/pom.xml Log: Add as800 profile and update the component version Modified: projects/wsi-bp-test/trunk/pom.xml =================================================================== --- projects/wsi-bp-test/trunk/pom.xml 2013-04-12 04:46:32 UTC (rev 17492) +++ projects/wsi-bp-test/trunk/pom.xml 2013-04-12 05:17:59 UTC (rev 17493) @@ -26,27 +26,30 @@ <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> - <jbossws.cxf.version>4.1.3.Final</jbossws.cxf.version> - <jbossws.shared.testsuite.version>4.1.1.Final</jbossws.shared.testsuite.version> + <jbossws.cxf.version>4.2.0-SNAPSHOT</jbossws.cxf.version> + <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version> <gnu.getopt.version>1.0.13</gnu.getopt.version> <log4j.version>1.2.14</log4j.version> - <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> <jboss713.version>7.1.3.Final</jboss713.version> - <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> + <jboss720.version>7.2.0.Final</jboss720.version> + <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> <spring.version>3.0.7.RELEASE</spring.version> + <picketlink.version>2.1.4.Final</picketlink.version> + <org.slf4j.version>1.6.1</org.slf4j.version> </properties> <!-- Modules --> <modules> <module>bp12-tests</module> + <module>bsp12-tests</module> </modules> <!-- Dependencies --> @@ -102,6 +105,22 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + + + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> + <version>${picketlink.version}</version> + <scope>test</scope> + </dependency> + + + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version> @@ -460,19 +479,19 @@ </profile> <!-- - Name: jboss711 - Descr: JBoss-7.1.1 specific options + Name: jboss712 + Descr: JBoss-7.1.2 specific options --> <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jboss.version>${jboss711.version}</jboss.version> - <jbossws.integration.target>jboss711</jbossws.integration.target> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -489,6 +508,12 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> + <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> + <!--this broke the WSI-Analyzer--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -496,19 +521,19 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options + Name: jboss713 + Descr: JBoss-7.1.3 specific options --> <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss713.version}</jboss.version> + <jbossws.integration.target>jboss713</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -525,6 +550,12 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> + <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> + <!--this broke the WSI-Analyzer--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -532,50 +563,46 @@ </profile> <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options + Name: jboss720 + Descr: JBoss-7.2.0 specific options --> <profile> - <id>jboss713</id> + <id>jboss720</id> <properties> - <jboss.version>${jboss713.version}</jboss.version> - <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.version>${jboss720.version}</jboss.version> + <jbossws.integration.target>jboss720</jbossws.integration.target> </properties> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> </dependency> </dependencies> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> + <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> + <!--this broke the WSI-Analyzer--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> </build> </profile> - <!-- - Name: jboss720 - Descr: JBoss-7.2.0 specific options - --> + <profile> - <id>jboss720</id> + <id>jboss800</id> <properties> - <jboss.version>${jboss720.version}</jboss.version> - <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.version>${jboss800.version}</jboss.version> + <jbossws.integration.target>jboss800</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -587,11 +614,16 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> + <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> + <!--this broke the WSI-Analyzer--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins>