[jbossws-commits] JBossWS SVN: r12319 - in stack/cxf/trunk: modules/client and 3 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-05-25 11:54:04 -0400 (Tue, 25 May 2010) New Revision: 12319 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-3036] Move to SpringFramework 3.0.1 to synch with AS trunk Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2010-05-25 14:05:23 UTC (rev 12318) +++ stack/cxf/trunk/modules/client/pom.xml 2010-05-25 15:54:04 UTC (rev 12319) @@ -55,7 +55,6 @@ <version>2.1</version> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-corba</artifactId> @@ -161,6 +160,39 @@ <artifactId>asm</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> + <!-- useStrictFiltering requires dependency in all included modules http://jira.codehaus.org/browse/MASSEMBLY-317 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-25 14:05:23 UTC (rev 12318) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-25 15:54:04 UTC (rev 12319) @@ -44,9 +44,12 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/spring-aop.jar"/> + <include name="**/spring-asm.jar"/> <include name="**/spring-beans.jar"/> <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> + <include name="**/spring-expression.jar"/> <include name="**/spring-jms.jar"/> <include name="**/spring-tx.jar"/> <include name="**/stax-api.jar"/> @@ -86,9 +89,12 @@ <include name="**/neethi.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> + <include name="**/spring-aop.jar"/> + <include name="**/spring-asm.jar"/> <include name="**/spring-beans.jar"/> <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> + <include name="**/spring-expression.jar"/> <include name="**/spring-jms.jar"/> <include name="**/spring-tx.jar"/> <include name="**/XmlSchema.jar"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-05-25 14:05:23 UTC (rev 12318) +++ stack/cxf/trunk/modules/server/pom.xml 2010-05-25 15:54:04 UTC (rev 12319) @@ -158,6 +158,30 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-05-25 14:05:23 UTC (rev 12318) +++ stack/cxf/trunk/pom.xml 2010-05-25 15:54:04 UTC (rev 12319) @@ -79,7 +79,7 @@ <velocity.version>1.5</velocity.version> <xmlsec.version>1.4.3</xmlsec.version> <wstx.version>3.2.9</wstx.version> - <spring.version>2.5.6</spring.version> + <spring.version>3.0.1.RELEASE</spring.version> </properties> @@ -246,15 +246,6 @@ <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-stax-api_1.0_spec</artifactId> </exclusion> - <!-- Specify the Spring bits we need at the version we need later --> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -466,6 +457,36 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> <version>${spring.version}</version> </dependency> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 14:05:23 UTC (rev 12318) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-25 15:54:04 UTC (rev 12319) @@ -34,9 +34,12 @@ <include>org.apache.neethi:neethi:jar</include> <include>javax.xml.soap:saaj-api:jar</include> <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> + <include>org.springframework:spring-aop:jar</include> + <include>org.springframework:spring-asm:jar</include> <include>org.springframework:spring-beans:jar</include> <include>org.springframework:spring-context:jar</include> <include>org.springframework:spring-core:jar</include> + <include>org.springframework:spring-expression:jar</include> <include>org.springframework:spring-jms:jar</include> <include>org.springframework:spring-tx:jar</include> <include>wsdl4j:wsdl4j:jar</include>