This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new adedf93e8f Update to Apache Karaf 4.4.7 (#2263)
adedf93e8f is described below
commit adedf93e8ff979fd485b13ec9dbeb44d3ac8a556
Author: Andriy Redko <[email protected]>
AuthorDate: Mon Feb 10 19:53:22 2025 -0500
Update to Apache Karaf 4.4.7 (#2263)
---
osgi/itests/pom.xml | 16 +++++++++++++++-
.../org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 8 ++++++--
osgi/karaf/features/pom.xml | 3 ++-
osgi/karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 2 +-
5 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 73107b4d83..0fc21c9ab4 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -111,7 +111,21 @@
</exclusion>
</exclusions>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring-legacy</artifactId>
+ <type>xml</type>
+ <version>${cxf.karaf.version}</version>
+ <classifier>features</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 3f13e380ce..74b925b094 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -79,8 +79,12 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
cxfBaseConfig(),
testUtils(),
features(cxfUrl, "cxf-jaxws", "cxf-transports-jms"),
-
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
- .type("xml").classifier("features-core"),
+ features(
+
maven().groupId("org.apache.karaf.features").artifactId("spring-legacy").versionAsInProject()
+ .type("xml").classifier("features"), "spring-legacy"),
+ features(
+
maven().groupId("org.apache.activemq").artifactId("activemq-karaf").versionAsInProject()
+ .type("xml").classifier("features-core"),
"cxf-jackson", "activemq-client"),
provision(serviceBundle())
);
diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index 8a88e0f520..450aa08268 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -165,7 +165,8 @@
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
- <javase>11</javase>
+ <!-- Apache Karaf 4.4.6 and above use Spring
Framework 6.x, needs JDK-17 baseline -->
+ <javase>17</javase>
<framework>
<feature>framework</feature>
</framework>
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index ab1078368f..841ea162ed 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -543,6 +543,8 @@
</config>
<feature>spring</feature>
<feature>aries-blueprint</feature>
+ <!-- Jackson is required by Apache ActiveMQ (PersistenceAdapterView,
..) -->
+ <feature version="${project.version}">cxf-jackson</feature>
<feature version="${project.version}">cxf-wsn-api</feature>
<feature version="${project.version}">cxf-http-provider</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index 24276be66c..a3cb2f4307 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,7 +255,7 @@
<cxf.jaxb.bundle.version>2.3.2_1</cxf.jaxb.bundle.version>
<cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
- <cxf.karaf.version>4.4.5</cxf.karaf.version>
+ <cxf.karaf.version>4.4.7</cxf.karaf.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
<cxf.osgi.saaj.version>[1.4,2)</cxf.osgi.saaj.version>
