From bcb2699b467f24573b1dbd5b07fc97f8da661ff8 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Wed, 9 Sep 2026 21:00:27 +0200
Subject: [PATCH] fix(examples): align the Jakarta REST API version with CXF

The REST example modules compiled against jakarta.ws.rs-api 4.0.0, so their
manifests required jakarta.ws.rs [4.0,5). CXF 4.2.3 imports [3,4), meaning the
API bundle it resolves against can never satisfy the example bundles.

Compile against 3.1.0 instead, the version matching CXF 4.x. The SCR module has
no declaration of its own and inherited 4.0.0 through CXF, so pin it explicitly.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../karaf-rest-example/karaf-rest-example-blueprint/pom.xml | 2 +-
 .../karaf-rest-example-client-cxf/pom.xml                   | 2 +-
 .../karaf-rest-example-client-jersey/pom.xml                | 2 +-
 examples/karaf-rest-example/karaf-rest-example-scr/pom.xml  | 6 ++++++
 .../karaf-rest-example-whiteboard/pom.xml                   | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
index 8a1a1bebdc4..3b32d62461e 100644
--- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>4.0.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.examples</groupId>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
index 128ff9eac47..20d7c40a818 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>4.0.0</version>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.karaf.examples</groupId>
diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
index 3a9edc5f8f0..33c53240e7e 100644
--- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>4.0.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
index f1eebc72752..df81ab68175 100644
--- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>org.osgi.service.component.annotations</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- pinned ahead of CXF, which compiles against 4.0.0 but imports jakarta.ws.rs [3,4) -->
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
index ae6ae5a0796..2e601c2dcdc 100644
--- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
+++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>4.0.0</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>