From 22385f8fb9b9e95cbd588c9dbdf9764731451dc5 Mon Sep 17 00:00:00 2001
From: Matteo Molinari <matteo.molinari@molinari-technology.ch>
Date: Mon, 18 May 2026 11:34:39 +0200
Subject: [PATCH 1/2] feat(java/jersey3): Update jakarta annotation and
 validation libs

---
 .../resources/Java/libraries/jersey3/build.gradle.mustache    | 4 ++--
 .../src/main/resources/Java/libraries/jersey3/pom.mustache    | 4 ++--
 samples/client/petstore/java/jersey3-oneOf/build.gradle       | 2 +-
 samples/client/petstore/java/jersey3-oneOf/pom.xml            | 4 ++--
 samples/client/petstore/java/jersey3/build.gradle             | 4 ++--
 samples/client/petstore/java/jersey3/pom.xml                  | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
index 1ba060915648..583fc434caa3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
@@ -105,9 +105,9 @@ ext {
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.10"
     {{/openApiNullable}}
-    jakarta_annotation_version = "2.1.0"
+    jakarta_annotation_version = "3.0.0"
     {{#useBeanValidation}}
-    bean_validation_version = "3.0.2"
+    bean_validation_version = "3.1.1"
     {{/useBeanValidation}}
     jersey_version = "3.0.4"
     junit_version = "5.8.2"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
index ba0bb943e056..aefd1b77bcdb 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
@@ -410,8 +410,8 @@
         <jackson-databind-version>2.21.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
         {{#useJakartaEe}}
-        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
+        <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
+        <beanvalidation-version>3.1.1</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
diff --git a/samples/client/petstore/java/jersey3-oneOf/build.gradle b/samples/client/petstore/java/jersey3-oneOf/build.gradle
index df19f4f1c9f1..a049e38ea93d 100644
--- a/samples/client/petstore/java/jersey3-oneOf/build.gradle
+++ b/samples/client/petstore/java/jersey3-oneOf/build.gradle
@@ -103,7 +103,7 @@ ext {
     jackson_annotations_version = "2.21"
     jackson_databind_version = "2.21.1"
     jackson_databind_nullable_version = "0.2.10"
-    jakarta_annotation_version = "2.1.0"
+    jakarta_annotation_version = "3.0.0"
     jersey_version = "3.0.4"
     junit_version = "5.8.2"
 }
diff --git a/samples/client/petstore/java/jersey3-oneOf/pom.xml b/samples/client/petstore/java/jersey3-oneOf/pom.xml
index 94aea8af5e82..eb96e82e8749 100644
--- a/samples/client/petstore/java/jersey3-oneOf/pom.xml
+++ b/samples/client/petstore/java/jersey3-oneOf/pom.xml
@@ -334,8 +334,8 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-version>2.21.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
-        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
+        <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
+        <beanvalidation-version>3.1.1</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <spotless.version>2.21.0</spotless.version>
     </properties>
diff --git a/samples/client/petstore/java/jersey3/build.gradle b/samples/client/petstore/java/jersey3/build.gradle
index 0b26c0545286..98b932d71795 100644
--- a/samples/client/petstore/java/jersey3/build.gradle
+++ b/samples/client/petstore/java/jersey3/build.gradle
@@ -103,8 +103,8 @@ ext {
     jackson_annotations_version = "2.21"
     jackson_databind_version = "2.21.1"
     jackson_databind_nullable_version = "0.2.10"
-    jakarta_annotation_version = "2.1.0"
-    bean_validation_version = "3.0.2"
+    jakarta_annotation_version = "3.0.0"
+    bean_validation_version = "3.1.1"
     jersey_version = "3.0.4"
     junit_version = "5.8.2"
     scribejava_apis_version = "8.3.1"
diff --git a/samples/client/petstore/java/jersey3/pom.xml b/samples/client/petstore/java/jersey3/pom.xml
index faf628278687..881c42a9832c 100644
--- a/samples/client/petstore/java/jersey3/pom.xml
+++ b/samples/client/petstore/java/jersey3/pom.xml
@@ -357,8 +357,8 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-version>2.21.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
-        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
+        <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
+        <beanvalidation-version>3.1.1</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <http-signature-version>1.8</http-signature-version>
         <scribejava-apis-version>8.3.3</scribejava-apis-version>

From af45f66cfee8d0892ec406ba36ddbd4877e1f9b1 Mon Sep 17 00:00:00 2001
From: Matteo Molinari <matteo.molinari@molinari-technology.ch>
Date: Mon, 18 May 2026 13:26:24 +0200
Subject: [PATCH 2/2] feat: Update target JDK to 17

---
 .../resources/Java/libraries/jersey3/build.gradle.mustache  | 4 ++--
 .../src/main/resources/Java/libraries/jersey3/pom.mustache  | 6 +++---
 samples/client/petstore/java/jersey3-oneOf/build.gradle     | 4 ++--
 samples/client/petstore/java/jersey3-oneOf/pom.xml          | 6 +++---
 samples/client/petstore/java/jersey3/build.gradle           | 4 ++--
 samples/client/petstore/java/jersey3/pom.xml                | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
index 583fc434caa3..01cb55a9abf6 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
index aefd1b77bcdb..063c932664a8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache
@@ -142,8 +142,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>512m</maxmem>
@@ -167,7 +167,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
-                    <source>1.8</source>
+                    <source>17</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
diff --git a/samples/client/petstore/java/jersey3-oneOf/build.gradle b/samples/client/petstore/java/jersey3-oneOf/build.gradle
index a049e38ea93d..fea94f0cc5f3 100644
--- a/samples/client/petstore/java/jersey3-oneOf/build.gradle
+++ b/samples/client/petstore/java/jersey3-oneOf/build.gradle
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
diff --git a/samples/client/petstore/java/jersey3-oneOf/pom.xml b/samples/client/petstore/java/jersey3-oneOf/pom.xml
index eb96e82e8749..ed43cdcd57b4 100644
--- a/samples/client/petstore/java/jersey3-oneOf/pom.xml
+++ b/samples/client/petstore/java/jersey3-oneOf/pom.xml
@@ -135,8 +135,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>512m</maxmem>
@@ -160,7 +160,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
-                    <source>1.8</source>
+                    <source>17</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>
diff --git a/samples/client/petstore/java/jersey3/build.gradle b/samples/client/petstore/java/jersey3/build.gradle
index 98b932d71795..cd2fe69e5c9b 100644
--- a/samples/client/petstore/java/jersey3/build.gradle
+++ b/samples/client/petstore/java/jersey3/build.gradle
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
diff --git a/samples/client/petstore/java/jersey3/pom.xml b/samples/client/petstore/java/jersey3/pom.xml
index 881c42a9832c..6fd30f3bcec4 100644
--- a/samples/client/petstore/java/jersey3/pom.xml
+++ b/samples/client/petstore/java/jersey3/pom.xml
@@ -135,8 +135,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>512m</maxmem>
@@ -160,7 +160,7 @@
                 </executions>
                 <configuration>
                     <doclint>none</doclint>
-                    <source>1.8</source>
+                    <source>17</source>
                     <tags>
                         <tag>
                             <name>http.response.details</name>