karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-2765] Revert usage of Spring ServiceMix Bundles to avoid to break CXF
Date Wed, 26 Mar 2014 12:17:50 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 83de89da2 -> e32fca575


[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/e32fca57
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e32fca57
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e32fca57

Branch: refs/heads/karaf-3.0.x
Commit: e32fca5752df17826c61f2b122cc48a6fd1e5746
Parents: 83de89d
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Mar 26 13:17:15 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Mar 26 13:17:15 2014 +0100

----------------------------------------------------------------------
 .../spring/src/main/feature/feature.xml         | 36 ++++++++++----------
 pom.xml                                         |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/e32fca57/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 4941592..b07a7f5 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -121,35 +121,35 @@
 
     <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>
         <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.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)">
@@ -158,40 +158,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.x support -->

http://git-wip-us.apache.org/repos/asf/karaf/blob/e32fca57/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0977607..648aabf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
 
         <spring.osgi.version>1.2.1</spring.osgi.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>
 


Mime
View raw message