Author: dkulp Date: Wed Sep 30 19:31:31 2009 New Revision: 820411 URL: http://svn.apache.org/viewvc?rev=820411&view=rev Log: Merged revisions 820382 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r820382 | dkulp | 2009-09-30 14:45:30 -0400 (Wed, 30 Sep 2009) | 9 lines Merged revisions 820158 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r820158 | dkulp | 2009-09-29 23:08:33 -0400 (Tue, 29 Sep 2009) | 1 line remove some unneeded deps ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml?rev=820411&r1=820410&r2=820411&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/jaxws/pom.xml Wed Sep 30 19:31:31 2009 @@ -94,16 +94,6 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-tools-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-tools-validator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-api</artifactId> <version>${project.version}</version> </dependency> @@ -134,34 +124,9 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-js</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-corba</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-jbi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-jbi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-integration-jbi</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -190,105 +155,16 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-jms</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-addr</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-rm</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-integration-jca</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-coloc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-testutils</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.5.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>1.5.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </dependency> - <dependency> - <groupId>httpunit</groupId> - <artifactId>httpunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.6.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </dependency> @@ -298,63 +174,6 @@ <version>${spring.version}</version> </dependency> <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core-tiger</artifactId> - <version>2.0.4</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-dao</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-support</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-acl</artifactId> - <version>2.0.4</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-dao</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-support</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -369,54 +188,14 @@ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> </dependency> <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>servicemix-core</artifactId> - <version>3.3.1</version> - <exclusions> - <exclusion> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </exclusion> - <exclusion> - <groupId>org.jencks</groupId> - <artifactId>jencks</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-testsupport</artifactId>
