Update to Apache Karaf 4.4.7

apache · Feb 9, 2025 · 7ce3a0e · 7ce3a0e
1 parent 334df9a
commit 7ce3a0e
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 62 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>
@@ -171,6 +185,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>${cxf.bndlib.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -40,7 +40,7 @@
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundles;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -136,21 +136,21 @@ public Option[] config() {
     private static InputStream serviceBundle() {
         if (JavaUtils.isJava11Compatible()) {
             return TinyBundles.bundle()
-                  .add(AbstractServerActivator.class)
-                  .add(JaxRsTestActivator.class)
-                  .add(Book.class)
-                  .add(BookStore.class)
-                  .set(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
-                  .set("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
-                  .build(TinyBundles.withBnd());
+                  .addClass(AbstractServerActivator.class)
+                  .addClass(JaxRsTestActivator.class)
+                  .addClass(Book.class)
+                  .addClass(BookStore.class)
+                  .setHeader(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
+                  .setHeader("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
+                  .build(TinyBundles.bndBuilder());
         } else {
             return TinyBundles.bundle()
-                .add(AbstractServerActivator.class)
-                .add(JaxRsTestActivator.class)
-                .add(Book.class)
-                .add(BookStore.class)
-                .set(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
-                .build(TinyBundles.withBnd());
+                .addClass(AbstractServerActivator.class)
+                .addClass(JaxRsTestActivator.class)
+                .addClass(Book.class)
+                .addClass(BookStore.class)
+                .setHeader(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
+                .build(TinyBundles.bndBuilder());
         }
     }
 }
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/OpenApiServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/OpenApiServiceTest.java
@@ -44,7 +44,7 @@
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundles;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -121,23 +121,23 @@ public Option[] config() {
     private static InputStream serviceBundle() {
         if (JavaUtils.isJava11Compatible()) {
             return TinyBundles.bundle()
-                  .add(AbstractServerActivator.class)
-                  .add(OpenApiTestActivator.class)
-                  .add(Book.class)
-                  .add(BookStore.class)
-                  .add(OpenApiBookStore.class)
-                  .set(Constants.BUNDLE_ACTIVATOR, OpenApiTestActivator.class.getName())
-                  .set("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
-                  .build(TinyBundles.withBnd());
+                  .addClass(AbstractServerActivator.class)
+                  .addClass(OpenApiTestActivator.class)
+                  .addClass(Book.class)
+                  .addClass(BookStore.class)
+                  .addClass(OpenApiBookStore.class)
+                  .setHeader(Constants.BUNDLE_ACTIVATOR, OpenApiTestActivator.class.getName())
+                  .setHeader("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
+                  .build(TinyBundles.bndBuilder());
         } else {
             return TinyBundles.bundle()
-                .add(AbstractServerActivator.class)
-                .add(OpenApiTestActivator.class)
-                .add(Book.class)
-                .add(BookStore.class)
-                .add(OpenApiBookStore.class)
-                .set(Constants.BUNDLE_ACTIVATOR, OpenApiTestActivator.class.getName())
-                .build(TinyBundles.withBnd());
+                .addClass(AbstractServerActivator.class)
+                .addClass(OpenApiTestActivator.class)
+                .addClass(Book.class)
+                .addClass(BookStore.class)
+                .addClass(OpenApiBookStore.class)
+                .setHeader(Constants.BUNDLE_ACTIVATOR, OpenApiTestActivator.class.getName())
+                .build(TinyBundles.bndBuilder());
         }
     }
 

diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -35,7 +35,7 @@
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundles;
 
 import static org.junit.Assert.assertEquals;
 import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -81,21 +81,21 @@ public Option[] config() {
     private static InputStream serviceBundle() {
         if (JavaUtils.isJava11Compatible()) {
             return TinyBundles.bundle()
-                  .add(AbstractServerActivator.class)
-                  .add(HttpTestActivator.class)
-                  .add(Greeter.class)
-                  .add(GreeterImpl.class)
-                  .set(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
-                  .set("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
-                  .build(TinyBundles.withBnd());
+                  .addClass(AbstractServerActivator.class)
+                  .addClass(HttpTestActivator.class)
+                  .addClass(Greeter.class)
+                  .addClass(GreeterImpl.class)
+                  .setHeader(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
+                  .setHeader("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
+                  .build(TinyBundles.bndBuilder());
         } else {
             return TinyBundles.bundle()
-                .add(AbstractServerActivator.class)
-                .add(HttpTestActivator.class)
-                .add(Greeter.class)
-                .add(GreeterImpl.class)
-                .set(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
-                .build(TinyBundles.withBnd());
+                .addClass(AbstractServerActivator.class)
+                .addClass(HttpTestActivator.class)
+                .addClass(Greeter.class)
+                .addClass(GreeterImpl.class)
+                .setHeader(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
+                .build(TinyBundles.bndBuilder());
         }
     }
 

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
@@ -38,7 +38,7 @@
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundles;
 
 import static org.junit.Assert.assertEquals;
 import static org.ops4j.pax.exam.CoreOptions.maven;
@@ -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())
         );
@@ -89,19 +93,19 @@ public Option[] config() {
     private static InputStream serviceBundle() {
         if (JavaUtils.isJava11Compatible()) {
             return TinyBundles.bundle()
-                .add(JmsTestActivator.class)
-                .add(Greeter.class)
-                .add(GreeterImpl.class)
-                .set(Constants.BUNDLE_ACTIVATOR, JmsTestActivator.class.getName())
-                .set("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
-                .build(TinyBundles.withBnd());
+                .addClass(JmsTestActivator.class)
+                .addClass(Greeter.class)
+                .addClass(GreeterImpl.class)
+                .setHeader(Constants.BUNDLE_ACTIVATOR, JmsTestActivator.class.getName())
+                .setHeader("Require-Capability", "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=11))\"")
+                .build(TinyBundles.bndBuilder());
         } else {
             return TinyBundles.bundle()
-                .add(JmsTestActivator.class)
-                .add(Greeter.class)
-                .add(GreeterImpl.class)
-                .set(Constants.BUNDLE_ACTIVATOR, JmsTestActivator.class.getName())
-                .build(TinyBundles.withBnd());
+                .addClass(JmsTestActivator.class)
+                .addClass(Greeter.class)
+                .addClass(GreeterImpl.class)
+                .setHeader(Constants.BUNDLE_ACTIVATOR, JmsTestActivator.class.getName())
+                .build(TinyBundles.bndBuilder());
         }
     }
 

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
@@ -89,6 +89,7 @@
         <cxf.brave.reporter.version>2.17.2</cxf.brave.reporter.version>
         <cxf.brave.version>5.17.1</cxf.brave.version>
         <cxf.brave.zipkin.version>2.27.0</cxf.brave.zipkin.version>
+        <cxf.bndlib.version>6.4.1</cxf.bndlib.version>
         <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
         <cxf.cdi.api.version>2.0.2</cxf.cdi.api.version>
         <cxf.classgraph.version>4.8.25</cxf.classgraph.version>
@@ -255,13 +256,13 @@
         <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>
         <cxf.osgi.jws.version>[0,3)</cxf.osgi.jws.version>
         <cxf.osgi.version>6.0.0</cxf.osgi.version>
-        <cxf.pax.exam.version>4.13.5</cxf.pax.exam.version>
+        <cxf.pax.exam.version>4.14.0</cxf.pax.exam.version>
         <cxf.reflections.version>0.10.2</cxf.reflections.version>
         <cxf.rhino.bundle.version>1.7.13_1</cxf.rhino.bundle.version>
         <cxf.servicemix.aspectj.version>1.9.1_1</cxf.servicemix.aspectj.version>