You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2024/10/28 16:35:43 UTC
(karaf) branch karaf-4.4.x updated (fec2955fc7 -> 2c789932ad)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
from fec2955fc7 KARAF-7879: Upgrade to Pax Web 8.0.29
new 6a624fa9c1 KARAF-7845: Upgrade to Spring 6.1.13
new c99c303571 KARAF-7845: Upgrade to Spring 6.0.23
new 2c789932ad KARAF-7845: Upgrade to Spring 5.3.39
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assemblies/features/spring-legacy/src/main/feature/feature.xml | 4 ----
assemblies/features/spring/src/main/feature/feature.xml | 6 ++----
.../java/org/apache/karaf/itests/features/Spring60FeaturesTest.java | 2 --
.../java/org/apache/karaf/itests/features/Spring61FeaturesTest.java | 2 --
pom.xml | 6 +++---
5 files changed, 5 insertions(+), 15 deletions(-)
(karaf) 03/03: KARAF-7845: Upgrade to Spring 5.3.39
Posted by jb...@apache.org.
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é <jb...@apache.org>
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>
(karaf) 02/03: KARAF-7845: Upgrade to Spring 6.0.23
Posted by jb...@apache.org.
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é <jb...@apache.org>
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>
(karaf) 01/03: KARAF-7845: Upgrade to Spring 6.1.13
Posted by jb...@apache.org.
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é <jb...@apache.org>
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>