This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch karaf-4.4.x in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 6a624fa9c10a1f1352c55944f17831054c5a197c Author: JB Onofré <[email protected]> AuthorDate: Fri Oct 18 10:01:01 2024 +0200 KARAF-7845: Upgrade to Spring 6.1.13 (cherry picked from commit dfb10136a1d1ddabfbe4fdffaf4e743eb519e1ef) --- assemblies/features/spring/src/main/feature/feature.xml | 6 ++---- .../java/org/apache/karaf/itests/features/Spring61FeaturesTest.java | 3 --- pom.xml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 555750c4df..fffc641545 100644 --- 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,7 +62,6 @@ <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> @@ -68,20 +69,17 @@ <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/Spring61FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring61FeaturesTest.java index 972716c19e..0ceb935ea6 100644 --- 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 @@ -23,7 +23,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) -@Ignore("Spring 6.x needs Java17, Jenkins is still using Java11 for test for now") public class Spring61FeaturesTest extends BaseTest { @Test @@ -57,7 +56,6 @@ public class Spring61FeaturesTest extends BaseTest { } @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 +66,6 @@ public class Spring61FeaturesTest extends BaseTest { } @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 index c786d34902..d3f04b0307 100644 --- a/pom.xml +++ b/pom.xml @@ -338,7 +338,7 @@ <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> + <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>
