You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2014/02/15 23:44:44 UTC
svn commit: r1568697 - in /servicemix/smx5/trunk:
assemblies/apache-servicemix/src/main/filtered-resources/features.xml pom.xml
Author: gertv
Date: Sat Feb 15 22:44:44 2014
New Revision: 1568697
URL: http://svn.apache.org/r1568697
Log:
SM-2237: Fix build problems after upgrade to Spring 3.2.4.RELEASE
Thanks to Krzysztof for the patch!
Modified:
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1568697&r1=1568696&r2=1568697&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Sat Feb 15 22:44:44 2014
@@ -27,10 +27,10 @@
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle> â
- <bundle dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.transaction/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.context/${spring.version}</bundle> â
+ <bundle dependency="true">mvn:org.springframework/org.springframework.aop/${spring.version}</bundle>
</feature>
<!--
@@ -48,12 +48,12 @@
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
@@ -61,14 +61,14 @@
<feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<feature version="${version}">swagger</feature>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
</feature>
<feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
@@ -120,14 +120,14 @@
<feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
@@ -138,7 +138,7 @@
<feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
</feature>
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1568697&r1=1568696&r2=1568697&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Sat Feb 15 22:44:44 2014
@@ -309,11 +309,6 @@
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>