Author: rickette Date: Sat Jun 4 10:31:33 2011 New Revision: 1131368 URL: http://svn.apache.org/viewvc?rev=1131368&view=rev Log: CAMEL-3735: Upgraded to Spring-WS 2.0.2. This required setting the Karaf features validation plugin to Java 1.6.
Modified: camel/trunk/parent/pom.xml camel/trunk/platforms/karaf/features/pom.xml camel/trunk/platforms/karaf/features/src/main/resources/features.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1131368&r1=1131367&r2=1131368&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Sat Jun 4 10:31:33 2011 @@ -141,7 +141,7 @@ <spring-version>3.0.5.RELEASE</spring-version> <spring-osgi-version>1.2.0</spring-osgi-version> <spring-security-version>3.0.5.RELEASE</spring-security-version> - <spring-ws-version>1.5.9</spring-ws-version> + <spring-ws-version>2.0.2.RELEASE</spring-ws-version> <spymemcached-version>2.5</spymemcached-version> <stax-api-version>1.0.1</stax-api-version> <stringtemplate-version>3.0</stringtemplate-version> Modified: camel/trunk/platforms/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1131368&r1=1131367&r2=1131368&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/pom.xml (original) +++ camel/trunk/platforms/karaf/features/pom.xml Sat Jun 4 10:31:33 2011 @@ -250,6 +250,7 @@ <configuration> <file>${project.build.directory}/classes/${features.file}</file> <karafConfig>${project.build.directory}/classes/config.properties</karafConfig> + <jreVersion>jre-1.6</jreVersion> </configuration> <executions> <execution> Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1131368&r1=1131367&r2=1131368&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Jun 4 10:31:33 2011 @@ -607,11 +607,12 @@ <feature version='${pom.version}'>camel-spring</feature> <bundle dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}</bundle> <bundle dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle> <bundle dependency="true">mvn:org.springframework/spring-web/${spring-version}</bundle> + <bundle dependency="true">mvn:org.springframework/spring-oxm/${spring-version}</bundle> <bundle dependency="true">mvn:org.springframework/spring-webmvc/${spring-version}</bundle> <bundle dependency="true">mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle> - <bundle dependency="true">mvn:org.springframework.ws/spring-oxm/${spring-ws-version}</bundle> <bundle dependency="true">mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle> <bundle dependency="true">mvn:org.springframework.ws/spring-ws-support/${spring-ws-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-ws/${pom.version}</bundle>