Update to Apache Karaf 4.4.7 (#2263)

apache · Feb 11, 2025 · adedf93 · adedf93
1 parent 334df9a
commit adedf93
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git 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
@@ -79,8 +79,12 @@ public Option[] config() {
             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
@@ -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
@@ -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
@@ -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>