Merge pull request #1875 from jbonofre/KARAF-7845

KARAF-7845: Upgrade to Spring 6.1.13, Spring 6.0.23, Spring 5.3.39
apache · Oct 28, 2024 · 5a8d99f · 5a8d99f
2 parents f127ede + 8c2c8f4
commit 5a8d99f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -394,28 +394,24 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring60.version}</bundle>
     </feature>
 
-    <!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
     <feature name="spring-test" description="Spring 6.0.x Test support" version="${spring60.version}">
         <feature version="[${spring60.version},6.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/${spring60.version}</bundle>
     </feature>
-    -->
 
     <feature name="spring-orm" description="Spring 6.0.x ORM support" version="${spring60.version}">
         <feature version="[${spring60.version},6.1)">spring-jdbc</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring60.version}</bundle>
     </feature>
 
-    <!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
     <feature name="spring-oxm" description="Spring 6.0.x OXM support" version="${spring60.version}">
         <feature version="[${spring60.version},6.1)">spring</feature>
         <bundle dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0</bundle>
         <bundle start-level="30">wrap:mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring60.version}</bundle>
     </feature>
-    -->
 
     <feature name="spring-tx" description="Spring 6.0.x Transaction (TX) support" version="${spring60.version}">
         <feature version="[${spring60.version},6.1)">spring</feature>

diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
@@ -52,6 +52,8 @@
     <feature name="spring-jms" description="Spring 6.1.x JMS support" version="${spring61.version}">
         <feature version="[${spring61.version},6.2)">spring-tx</feature>
         <bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
+        <bundle dependency="true">mvn:io.micrometer/micrometer-commons/1.12.4</bundle>
+        <bundle dependency="true">mvn:io.micrometer/micrometer-observation/1.12.4</bundle>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.version}</bundle>
     </feature>
 
@@ -60,28 +62,24 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring61.version}</bundle>
     </feature>
 
-    <!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
     <feature name="spring-test" description="Spring 6.1.x Test support" version="${spring61.version}">
         <feature version="[${spring61.version},6.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/${spring61.version}</bundle>
     </feature>
-    -->
 
     <feature name="spring-orm" description="Spring 6.1.x ORM support" version="${spring61.version}">
         <feature version="[${spring61.version},6.2)">spring-jdbc</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring61.version}</bundle>
     </feature>
 
-    <!-- Waiting https://issues.apache.org/jira/browse/SM-5703 fix
     <feature name="spring-oxm" description="Spring 6.1.x OXM support" version="${spring61.version}">
         <feature version="[${spring61.version},6.2)">spring</feature>
         <bundle dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0</bundle>
         <bundle start-level="30">wrap:mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring61.version}</bundle>
     </feature>
-    -->
 
     <feature name="spring-tx" description="Spring 6.1.x Transaction (TX) support" version="${spring61.version}">
         <feature version="[${spring61.version},6.2)">spring</feature>

diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring60FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring60FeaturesTest.java
@@ -79,7 +79,6 @@ public void installSpringMessagingFeature() throws Exception {
     }
 
     @Test
-    @Ignore("Waiting https://issues.apache.org/jira/browse/SM-5703 fix")
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring60.version"));
     }
@@ -90,7 +89,6 @@ public void installSpringOrmFeature() throws Exception {
     }
 
     @Test
-    @Ignore("Waiting https://issues.apache.org/jira/browse/SM-5703 fix")
     public void installSpringOxmFeature() throws Exception {
         installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring60.version"));
     }

diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring61FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring61FeaturesTest.java
@@ -57,7 +57,6 @@ public void installSpringMessagingFeature() throws Exception {
     }
 
     @Test
-    @Ignore("Waiting https://issues.apache.org/jira/browse/SM-5703 fix")
     public void installSpringTestFeature() throws Exception {
         installAssertAndUninstallFeature("spring-test", System.getProperty("spring61.version"));
     }
@@ -68,7 +67,6 @@ public void installSpringOrmFeature() throws Exception {
     }
 
     @Test
-    @Ignore("Waiting https://issues.apache.org/jira/browse/SM-5703 fix")
     public void installSpringOxmFeature() throws Exception {
         installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring61.version"));
     }

diff --git a/pom.xml b/pom.xml
@@ -336,9 +336,9 @@
         <spring31.version>3.1.4.RELEASE</spring31.version>
         <spring43.version>4.3.30.RELEASE_1</spring43.version>
         <spring52.version>5.2.25.RELEASE_1</spring52.version>
-        <spring53.version>5.3.33_1</spring53.version>
-        <spring60.version>6.0.18_1</spring60.version>
-        <spring61.version>6.1.5_1</spring61.version>
+        <spring53.version>5.3.39_1</spring53.version>
+        <spring60.version>6.0.23_1</spring60.version>
+        <spring61.version>6.1.13_1</spring61.version>
         <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
         <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
         <spring.security51.version>5.1.6.RELEASE_1</spring.security51.version>