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 2013/05/13 11:21:28 UTC
svn commit: r1481748 - in /karaf/branches/karaf-2.3.x:
assemblies/features/standard/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Mon May 13 09:21:28 2013
New Revision: 1481748
URL: http://svn.apache.org/r1481748
Log:
[KARAF-2062] Add Spring 3.2.x support
Modified:
karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml?rev=1481748&r1=1481747&r2=1481748&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml Mon May 13 09:21:28 2013
@@ -52,7 +52,7 @@
</feature>
<!-- Spring 2 support -->
- <feature name="spring" description="Spring support" version="${spring2.version}" resolver="(obr)">
+ <feature name="spring" description="Spring 2.x support" version="${spring2.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.springframework/spring-core/${spring2.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-beans/${spring2.version}</bundle>
@@ -61,13 +61,32 @@
<bundle start-level="30">mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring 2 Web support" version="${spring2.version}" resolver="(obr)">
+ <feature name="spring-web" description="Spring 2.x Web support" version="${spring2.version}" resolver="(obr)">
<feature version="${spring2.version}">spring</feature>
<feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.springframework/spring-web/${spring2.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
</feature>
+ <!-- Spring DM support -->
+
+ <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
+ <feature version="[2.5.6,4)">spring</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+ <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+ </feature>
+
+ <feature name="spring-dm-web" description="Spring DM Web Support" version="${spring.osgi.version}" resolver="(obr)">
+ <feature version="${spring.osgi.version}">spring-dm</feature>
+ <feature version="[2.5.6,4)">spring-web</feature>
+ <feature version="${http.feature.version}">http</feature>
+ <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+ </feature>
+
<!-- Spring 3.0 support -->
<feature name="spring" description="Spring 3.0.x support" version="${spring30.version}" resolver="(obr)">
@@ -81,39 +100,22 @@
<bundle start-level="30">mvn:org.springframework/spring-context-support/${spring30.version}</bundle>
</feature>
- <feature name="spring-aspects" description="Spring AOP support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-aspects" description="Spring 3.0.x AOP support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-aspects/${spring30.version}</bundle>
</feature>
- <feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}" resolver="(obr)">
- <feature version="[2.5.6,4)">spring</feature>
- <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
- <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
- <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
- <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
- <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
- </feature>
-
- <feature name="spring-dm-web" description="Spring DM Web Support" version="${spring.osgi.version}" resolver="(obr)">
- <feature version="${spring.osgi.version}">spring-dm</feature>
- <feature version="[2.5.6,4)">spring-web</feature>
- <feature version="${http.feature.version}">http</feature>
- <bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
- </feature>
-
- <feature name="spring-instrument" description="Spring Instrument support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-instrument" description="Spring 3.0.x Instrument support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-instrument/${spring30.version}</bundle>
</feature>
- <feature name="spring-jdbc" description="Spring JDBC support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-jdbc" description="Spring 3.0.x JDBC support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring-tx</feature>
<bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring30.version}</bundle>
</feature>
- <feature name="spring-jms" description="Spring JMS support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-jms" description="Spring 3.0.x JMS support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring-web</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>
@@ -121,7 +123,7 @@
<bundle start-level="30">mvn:org.springframework/spring-tx/${spring30.version}</bundle>
</feature>
- <feature name="spring-struts" description="Spring Struts support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-struts" description="Spring 3.0.x Struts support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring-web</feature>
<feature>war</feature>
<bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
@@ -130,34 +132,34 @@
<bundle start-level="30">mvn:org.springframework/spring-struts/${spring30.version}</bundle>
</feature>
- <feature name="spring-test" description="Spring Test support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-test" description="Spring 3.0.x Test support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-test/${spring30.version}</bundle>
</feature>
- <feature name="spring-orm" description="Spring ORM support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-orm" description="Spring 3.0.x ORM support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring-jdbc</feature>
<bundle start-level="30">mvn:org.springframework/spring-orm/${spring30.version}</bundle>
</feature>
- <feature name="spring-oxm" description="Spring OXM support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-oxm" description="Spring 3.0.x OXM support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-oxm/${spring30.version}</bundle>
</feature>
- <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-tx" description="Spring 3.0.x Transaction (TX) support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-tx/${spring30.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring Web support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-web" description="Spring 3.0.x Web support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.version}">spring</feature>
<feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.springframework/spring-web/${spring30.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring30.version}</bundle>
</feature>
- <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring30.version}" resolver="(obr)">
+ <feature name="spring-web-portlet" description="Spring 3.0.x Web Portlet support" version="${spring30.version}" resolver="(obr)">
<feature version="${spring30.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.springframework/spring-webmvc-portlet/${spring30.version}</bundle>
@@ -176,22 +178,22 @@
<bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
</feature>
- <feature name="spring-aspects" description="Spring 3.1 AOP support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-aspects" description="Spring 3.1.x AOP support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
</feature>
- <feature name="spring-instrument" description="Spring 3.1 Instrument support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-instrument" description="Spring 3.1.x Instrument support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
</feature>
- <feature name="spring-jdbc" description="Spring 3.1 JDBC support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-jdbc" description="Spring 3.1.x JDBC support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring-tx</feature>
<bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
</feature>
- <feature name="spring-jms" description="Spring 3.1 JMS support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-jms" description="Spring 3.1.x JMS support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</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>
@@ -199,7 +201,7 @@
<bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
</feature>
- <feature name="spring-struts" description="Spring 3.1 Struts support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring-web</feature>
<feature>war</feature>
<bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
@@ -208,39 +210,115 @@
<bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
</feature>
- <feature name="spring-test" description="Spring 3.1 Test support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-test" description="Spring 3.1.x Test support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
</feature>
- <feature name="spring-orm" description="Spring 3.1 ORM support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-orm" description="Spring 3.1.x ORM support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring-jdbc</feature>
<bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
</feature>
- <feature name="spring-oxm" description="Spring 3.1 OXM support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-oxm" description="Spring 3.1.x OXM support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
</feature>
- <feature name="spring-tx" description="Spring 3.1 Transaction (TX) support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-tx" description="Spring 3.1.x Transaction (TX) support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring 3.1 Web support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-web" description="Spring 3.1.x Web support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.version}">spring</feature>
<feature version="${http.feature.version}">http</feature>
<bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
</feature>
- <feature name="spring-web-portlet" description="Spring 3.1 Web Portlet support" version="${spring31.version}" resolver="(obr)">
+ <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet support" version="${spring31.version}" resolver="(obr)">
<feature version="${spring31.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.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
</feature>
+ <!-- Spring 3.2 support -->
+
+ <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.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.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.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.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.springframework/org.springframework.jms/${spring32.version}</bundle>
+ </feature>
+
+ <feature name="spring-struts" description="Spring 3.2.x Struts support" version="${spring32.version}" resolver="(obr)">
+ <feature version="${spring32.version}">spring-web</feature>
+ <feature>war</feature>
+ <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.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.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.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.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.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.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.springframework/org.springframework.web.portlet/${spring32.version}</bundle>
+ </feature>
+
<feature name="wrapper" description="Provide OS integration" version="${project.version}">
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1481748&r1=1481747&r2=1481748&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Mon May 13 09:21:28 2013
@@ -186,6 +186,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.1.RELEASE</spring32.version>
<sshd.version>0.8.0</sshd.version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
<xbean.version>3.12</xbean.version>