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 2c789932adbd9f99fad25fcb0d54a4a3ee76b6d3 Author: JB Onofré <[email protected]> AuthorDate: Fri Oct 18 11:35:14 2024 +0200 KARAF-7845: Upgrade to Spring 5.3.39 (cherry picked from commit 8c2c8f4185b39e73648515bb4daa81403f20e210) --- Jenkinsfile | 2 +- .../java/org/apache/karaf/itests/features/Spring60FeaturesTest.java | 1 + .../java/org/apache/karaf/itests/features/Spring61FeaturesTest.java | 1 + pom.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 60b8e3d599..76deecb42d 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_17_latest' + jdk 'jdk_11_latest' } options { 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 0e0ee1a910..e41dd35d89 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,6 +32,7 @@ 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 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 0ceb935ea6..b465bd177d 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,6 +23,7 @@ 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 diff --git a/pom.xml b/pom.xml index 5cc46ac3a3..3a27751c14 100644 --- a/pom.xml +++ b/pom.xml @@ -336,7 +336,7 @@ <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> + <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>
