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 c99c303571c152a14bc8a3385b3834b3ff978583 Author: JB Onofré <[email protected]> AuthorDate: Fri Oct 18 11:30:22 2024 +0200 KARAF-7845: Upgrade to Spring 6.0.23 (cherry picked from commit cb590f2c799c87c9df7d3871f7b68fcafd30d7f5) --- Jenkinsfile | 2 +- assemblies/features/spring-legacy/src/main/feature/feature.xml | 4 ---- .../java/org/apache/karaf/itests/features/Spring60FeaturesTest.java | 3 --- pom.xml | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 76deecb42d..60b8e3d599 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { tools { // ... tell Jenkins what java version, maven version or other tools are required ... maven 'maven_3_latest' - jdk 'jdk_11_latest' + jdk 'jdk_17_latest' } options { diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml index 8c8eb04cae..cb0c0cda5f 100644 --- a/assemblies/features/spring-legacy/src/main/feature/feature.xml +++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml @@ -394,7 +394,6 @@ <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> @@ -402,20 +401,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/${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/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 index 813c44d747..0e0ee1a910 100644 --- 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 @@ -32,7 +32,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) -@Ignore("Spring 6.x needs Java17, Jenkins is still using Java11 for test for now") public class Spring60FeaturesTest extends BaseTest { @Configuration @@ -79,7 +78,6 @@ public class Spring60FeaturesTest extends BaseTest { } @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 +88,6 @@ public class Spring60FeaturesTest extends BaseTest { } @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/pom.xml b/pom.xml index d3f04b0307..5cc46ac3a3 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ <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> + <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>
