You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/10/27 12:10:39 UTC
[karaf] 01/01: [KARAF-5447] Support Spring 5.0.x
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 38af4e2e70e2847b1c8d199bd476773cc84887c5
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Oct 27 14:10:21 2017 +0200
[KARAF-5447] Support Spring 5.0.x
---
.../spring-legacy/src/main/feature/feature.xml | 77 ++++++++++++++++++++
.../features/spring/src/main/feature/feature.xml | 85 ++++++++++------------
pom.xml | 1 +
3 files changed, 117 insertions(+), 46 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 223b4b1..c3676bb 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -420,6 +420,83 @@
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
</feature>
+ <!-- Spring 4.3.x support -->
+
+ <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+ <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/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" 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/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature>http</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
+ <feature prerequisite="true">wrap</feature>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
+ </feature>
+
<!-- Spring Security support -->
<feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 471cedf..f608cd4 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -22,81 +22,74 @@
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
- <!-- Spring 4.3.x support -->
+ <!-- Spring 5.0.x support -->
- <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+ <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
<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/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
</feature>
- <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
+ <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
</feature>
- <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
+ <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
</feature>
- <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-tx</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
+ <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
</feature>
- <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
<bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true" 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/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
</feature>
- <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
<bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
</feature>
- <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
+ <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
</feature>
- <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
+ <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
</feature>
- <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
+ <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
<feature>http</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
</feature>
- <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
- <feature prerequisite="true">wrap</feature>
- <feature version="[${spring43.version},4.4)">spring-web</feature>
- <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
- </feature>
-
- <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+ <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
<bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
- <feature version="[${spring43.version},4.4)">spring-web</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
+ <feature version="[${spring50.version},5.1)">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
</feature>
<!-- Aries Blueprint Spring support -->
diff --git a/pom.xml b/pom.xml
index b3b486e..4e521eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,6 +289,7 @@
<spring41.version>4.1.9.RELEASE_1</spring41.version>
<spring42.version>4.2.9.RELEASE_1</spring42.version>
<spring43.version>4.3.12.RELEASE_1</spring43.version>
+ <spring50.version>5.0.1.RELEASE_1-SNAPSHOT</spring50.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
<sshd.version>1.6.0</sshd.version>
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.