From f14bee0e5af27108b9e56347c4491324bf1e6f0b Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Sun, 19 Jul 2026 10:47:59 +0200
Subject: [PATCH] Upgraded Jakarta REST client module to java 17; upgraded
 jakarta.ws.rs-api to version 4.0.0

---
 .github/workflows/maven.yml             | 6 +++---
 httpclient5-jakarta-rest-client/pom.xml | 4 ++--
 pom.xml                                 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 37e144c4af..a4441dfcc2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -59,10 +59,10 @@ jobs:
             echo 'HC_BUILD_TOOLCHAIN_VERSION=${{ matrix.java }}' >> "$GITHUB_ENV"
             ;;
         esac
-        # The httpclient5-jakarta-rest-client module is compiled for Java 11, so it must be
-        # excluded from the reactor whenever the selected toolchain is older than 11.
+        # The httpclient5-jakarta-rest-client module is compiled for Java 17, so it must be
+        # excluded from the reactor whenever the selected toolchain is older than 17.
         case '${{ matrix.java }}' in
-          8)
+          8|11)
             echo 'HC_PROFILE_ARGS=-Dhc.jakarta-rest-client.skip=true' >> "$GITHUB_ENV"
             ;;
           *)
diff --git a/httpclient5-jakarta-rest-client/pom.xml b/httpclient5-jakarta-rest-client/pom.xml
index f36508ca1d..26f94c1f91 100644
--- a/httpclient5-jakarta-rest-client/pom.xml
+++ b/httpclient5-jakarta-rest-client/pom.xml
@@ -37,8 +37,8 @@
 
   <properties>
     <Automatic-Module-Name>org.apache.hc.client5.http.rest</Automatic-Module-Name>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 9bc6df3b05..416014ec0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
     <otel.version>1.64.0</otel.version>     <!-- already used elsewhere -->
     <commons-compress.version>1.26.2</commons-compress.version>
     <caffeine.version>2.9.3</caffeine.version>  <!-- java 8. current version 3.2.3 -->
-    <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
+    <jakarta.ws.rs.version>4.0.0</jakarta.ws.rs.version>
     <assertj.version>3.27.7</assertj.version>
   </properties>
 
@@ -463,8 +463,8 @@
   <profiles>
     <profile>
       <!--
-        The httpclient5-jakarta-rest-client module is compiled for Java 11, so its class files
-        cannot be read by javac 8. Builds that select an older toolchain must leave this module
+        The httpclient5-jakarta-rest-client module is compiled for Java 17, so its class files
+        cannot be read by javac 8 and 11. Builds that select an older toolchain must leave this module
         out of the reactor by setting -Dhc.jakarta-rest-client.skip.
       -->
       <id>jakarta-rest-client</id>