Merge pull request apache#990 from jbonofre/KARAF-6506

[KARAF-6506] Add Spring 5.2.0.RELEASE features
sanen · Nov 8, 2019 · 64e7a5a · 64e7a5a
2 parents f06b6f8 + 70dc602
commit 64e7a5a
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 42 deletions.
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -582,6 +582,81 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
     </feature>
 
+    <!-- Spring 5.1.x support -->
+
+    <feature name="spring" description="Spring 5.1.x support" version="${spring51.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/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-aspects" description="Spring 5.1.x AOP support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-instrument" description="Spring 5.1.x Instrument support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-jdbc" description="Spring 5.1.x JDBC support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring 5.1.x JMS support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">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/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-messaging" description="Spring 5.1.x Messaging support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-test" description="Spring 5.1.x Test support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">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/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-orm" description="Spring 5.1.x ORM support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-oxm" description="Spring 5.1.x OXM support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-tx" description="Spring 5.1.x Transaction (TX) support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring 5.1.x Web support" version="${spring51.version}">
+        <feature version="[${spring51.version},5.2)">spring</feature>
+        <feature>http</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring51.version}</bundle>
+    </feature>
+
+    <feature name="spring-websocket" description="Spring 5.1.x WebSocket support" version="${spring51.version}">
+        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <feature version="[${spring51.version},5.2)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring51.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
@@ -22,79 +22,79 @@
 
     <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
 
-    <!-- Spring 5.1.x support -->
+    <!-- Spring 5.2.x support -->
 
-    <feature name="spring" description="Spring 5.1.x support" version="${spring51.version}">
+    <feature name="spring" description="Spring 5.2.x support" version="${spring52.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/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-aspects" description="Spring 5.1.x AOP support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring51.version}</bundle>
+    <feature name="spring-aspects" description="Spring 5.2.x AOP support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-instrument" description="Spring 5.1.x Instrument support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring51.version}</bundle>
+    <feature name="spring-instrument" description="Spring 5.2.x Instrument support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-jdbc" description="Spring 5.1.x JDBC support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring-tx</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring51.version}</bundle>
+    <feature name="spring-jdbc" description="Spring 5.2.x JDBC support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring-tx</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-jms" description="Spring 5.1.x JMS support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring-tx</feature>
+    <feature name="spring-jms" description="Spring 5.2.x JMS support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">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/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-messaging" description="Spring 5.1.x Messaging support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring51.version}</bundle>
+    <feature name="spring-messaging" description="Spring 5.2.x Messaging support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-test" description="Spring 5.1.x Test support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
+    <feature name="spring-test" description="Spring 5.2.x Test support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">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/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-orm" description="Spring 5.1.x ORM support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring-jdbc</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring51.version}</bundle>
+    <feature name="spring-orm" description="Spring 5.2.x ORM support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-oxm" description="Spring 5.1.x OXM support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring51.version}</bundle>
+    <feature name="spring-oxm" description="Spring 5.2.x OXM support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-tx" description="Spring 5.1.x Transaction (TX) support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring51.version}</bundle>
+    <feature name="spring-tx" description="Spring 5.2.x Transaction (TX) support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-web" description="Spring 5.1.x Web support" version="${spring51.version}">
-        <feature version="[${spring51.version},5.2)">spring</feature>
+    <feature name="spring-web" description="Spring 5.2.x Web support" version="${spring52.version}">
+        <feature version="[${spring52.version},5.3)">spring</feature>
         <feature>http</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring51.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring51.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring52.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring52.version}</bundle>
     </feature>
 
-    <feature name="spring-websocket" description="Spring 5.1.x WebSocket support" version="${spring51.version}">
+    <feature name="spring-websocket" description="Spring 5.2.x WebSocket support" version="${spring52.version}">
         <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
-        <feature version="[${spring51.version},5.2)">spring-web</feature>
-        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring51.version}</bundle>
+        <feature version="[${spring52.version},5.3)">spring-web</feature>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring52.version}</bundle>
     </feature>
 
     <!-- Spring Security -->

diff --git a/itests/test/pom.xml b/itests/test/pom.xml
@@ -313,6 +313,7 @@
                         <spring43.version>${spring43.version}</spring43.version>
                         <spring50.version>${spring50.version}</spring50.version>
                         <spring51.version>${spring51.version}</spring51.version>
+                        <spring52.version>${spring52.version}</spring52.version>
                         <spring.security31.version>${spring.security31.version}</spring.security31.version>
                         <spring.security42.version>${spring.security42.version}</spring.security42.version>
                         <spring.security51.version>${spring.security51.version}</spring.security51.version>
@@ -375,6 +376,7 @@
                                 <spring43.version>${spring43.version}</spring43.version>
                                 <spring50.version>${spring50.version}</spring50.version>
                                 <spring51.version>${spring51.version}</spring51.version>
+                                <spring52.version>${spring52.version}</spring52.version>
                                 <spring.security31.version>${spring.security31.version}</spring.security31.version>
                                 <spring.security42.version>${spring.security42.version}</spring.security42.version>
                                 <spring.security51.version>${spring.security51.version}</spring.security51.version>

diff --git a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java
@@ -33,6 +33,7 @@ public Option[] config() {
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")),
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring50.version", System.getProperty("spring50.version")),
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring51.version", System.getProperty("spring51.version")),
+                KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring52.version", System.getProperty("spring52.version")),
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security31.version", System.getProperty("spring.security31.version")),
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security42.version", System.getProperty("spring.security42.version")),
                 KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security51.version", System.getProperty("spring.security51.version")),