You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/03/26 12:55:57 UTC
git commit: [KARAF-2765] Revert usage of Spring ServiceMix Bundles to
avoid to break CXF
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x 71bddf31d -> 45ceb6861
[KARAF-2765] Revert usage of Spring ServiceMix Bundles to avoid to break CXF
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/45ceb686
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/45ceb686
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/45ceb686
Branch: refs/heads/karaf-2.3.x
Commit: 45ceb6861b4d622730f7d6f624f4fd8a6a011f4e
Parents: 71bddf3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Mar 26 12:55:00 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Mar 26 12:55:00 2014 +0100
----------------------------------------------------------------------
.../standard/src/main/resources/features.xml | 36 ++++++++++----------
pom.xml | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/45ceb686/assemblies/features/standard/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/resources/features.xml b/assemblies/features/standard/src/main/resources/features.xml
index 6e9b31b..d6e6c15 100644
--- a/assemblies/features/standard/src/main/resources/features.xml
+++ b/assemblies/features/standard/src/main/resources/features.xml
@@ -247,34 +247,34 @@
<feature name="spring" description="Spring 3.2.x support" version="${spring32.version}" resolver="(obr)">
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.core/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.expression/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.beans/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.aop/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.context/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.context.support/${spring32.version}</bundle>
</feature>
<feature name="spring-aspects" description="Spring 3.2.x AOP support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.aspects/${spring32.version}</bundle>
</feature>
<feature name="spring-instrument" description="Spring 3.2.x Instrument support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.instrument/${spring32.version}</bundle>
</feature>
<feature name="spring-jdbc" description="Spring 3.2.x JDBC support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring-tx</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.jdbc/${spring32.version}</bundle>
</feature>
<feature name="spring-jms" description="Spring 3.2.x JMS support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring-tx</feature>
<bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.jms/${spring32.version}</bundle>
</feature>
<feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}" resolver="(obr)">
@@ -283,40 +283,40 @@
<bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web.struts/${spring32.version}</bundle>
</feature>
<feature name="spring-test" description="Spring 3.2.x Test support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.test/${spring32.version}</bundle>
</feature>
<feature name="spring-orm" description="Spring 3.2.x ORM support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring-jdbc</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.orm/${spring32.version}</bundle>
</feature>
<feature name="spring-oxm" description="Spring 3.2.x OXM support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.oxm/${spring32.version}</bundle>
</feature>
<feature name="spring-tx" description="Spring 3.2.x Transaction (TX) support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.transaction/${spring32.version}</bundle>
</feature>
<feature name="spring-web" description="Spring 3.2.x Web support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring</feature>
<feature version="${http.feature.version}">http</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web.servlet/${spring32.version}</bundle>
</feature>
<feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet support" version="${spring32.version}" resolver="(obr)">
<feature version="${spring32.version}">spring-web</feature>
<bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework/org.springframework.web.portlet/${spring32.version}</bundle>
</feature>
<!-- Spring 4.0 support -->
http://git-wip-us.apache.org/repos/asf/karaf/blob/45ceb686/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 522f403..cdd2158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
<spring2.version>2.5.6.SEC03</spring2.version>
<spring30.version>3.0.7.RELEASE</spring30.version>
<spring31.version>3.1.4.RELEASE</spring31.version>
- <spring32.version>3.2.8.RELEASE_1</spring32.version>
+ <spring32.version>3.2.4.RELEASE</spring32.version>
<spring40.version>4.0.2.RELEASE_1</spring40.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>