Author: alessio.soldano(a)jboss.com Date: 2012-05-08 06:36:47 -0400 (Tue, 08 May 2012) New Revision: 16235 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3493] Adding test dependency to PicketLink and cleaning up dependency tree a bit by using the picketbox coming from picketlink Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -21,15 +21,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -27,15 +27,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>junit</groupId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-05-04 08:30:05 UTC (rev 16234) +++ stack/cxf/trunk/pom.xml 2012-05-08 10:36:47 UTC (rev 16235) @@ -82,7 +82,7 @@ <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> - <picketbox.version>4.0.6.Beta1</picketbox.version> + <picketlink.version>2.1.1.Final</picketlink.version> <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> @@ -1181,22 +1181,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> - <version>${picketbox.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi</artifactId> <version>${jboss.security.spi.version}</version> @@ -1282,7 +1266,15 @@ <artifactId>easymockclassextension</artifactId> <version>2.4</version> </dependency> + + <!-- Other test dependencies --> <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>