From 67d45c54fbc45439e449b79ce2b8d047a10ab3fe Mon Sep 17 00:00:00 2001
From: Nicklas Wiegandt <nicklas@wiegandt.eu>
Date: Tue, 16 Jul 2024 21:10:31 +0200
Subject: [PATCH] fead (JAVA SPRING RESTCLIENT) 18522: Add restclient tests to
 JDK 11 tests & changed min version to JDK 11

---
 .../samples-java-client-echo-api-jdk11.yaml          |  1 +
 .github/workflows/samples-java-client-jdk11.yaml     | 12 ++++++++++++
 .../resources/Java/libraries/restclient/pom.mustache |  6 +++---
 samples/client/echo_api/java/restclient/pom.xml      |  6 +++---
 .../java/restclient-useAbstractionForFiles/pom.xml   |  6 +++---
 .../petstore/java/restclient-nullable-arrays/pom.xml |  6 +++---
 .../client/petstore/java/restclient-swagger2/pom.xml |  6 +++---
 samples/client/petstore/java/restclient/pom.xml      |  6 +++---
 8 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/samples-java-client-echo-api-jdk11.yaml b/.github/workflows/samples-java-client-echo-api-jdk11.yaml
index 5e27029ee358c..e256fa4832067 100644
--- a/.github/workflows/samples-java-client-echo-api-jdk11.yaml
+++ b/.github/workflows/samples-java-client-echo-api-jdk11.yaml
@@ -21,6 +21,7 @@ jobs:
           - samples/client/echo_api/java/feign-gson
           - samples/client/echo_api/java/resttemplate
           - samples/client/echo_api/java/resteasy
+          - samples/client/echo_api/java/restclient
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml
index 6c002712d01b6..2c0a831b1dcda 100644
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -16,6 +16,10 @@ on:
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
       - samples/client/others/java/resttemplate-list-schema-validation/**
+      - samples/client/petstore/java/restclient/**
+      - samples/client/petstore/java/restclient-nullable-arrays/**
+      - samples/client/petstore/java/restclient-swagger2/**
+      - samples/client/others/java/restclient-useAbstractionForFiles/**
   pull_request:
     paths:
       - 'samples/client/petstore/java/**'
@@ -31,6 +35,10 @@ on:
       - samples/client/others/java/jersey2-oneOf-duplicates/**
       - samples/client/others/java/jersey2-oneOf-Mixed/**
       - samples/client/others/java/resttemplate-list-schema-validation/**
+      - samples/client/petstore/java/restclient/**
+      - samples/client/petstore/java/restclient-nullable-arrays/**
+      - samples/client/petstore/java/restclient-swagger2/**
+      - samples/client/others/java/restclient-useAbstractionForFiles/**
 jobs:
   build:
     name: Build Java Client JDK11
@@ -81,6 +89,10 @@ jobs:
           - samples/client/others/java/jersey2-oneOf-duplicates/
           - samples/client/others/java/jersey2-oneOf-Mixed/
           - samples/client/others/java/resttemplate-list-schema-validation/
+          - samples/client/petstore/java/restclient/
+          - samples/client/petstore/java/restclient-nullable-arrays/
+          - samples/client/petstore/java/restclient-swagger2/
+          - samples/client/others/java/restclient-useAbstractionForFiles/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
index d3f6ab6500e1f..ef21d0d17567e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
@@ -152,8 +152,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -352,7 +352,7 @@
         {{#swagger2AnnotationLibrary}}
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         {{#openApiNullable}}
diff --git a/samples/client/echo_api/java/restclient/pom.xml b/samples/client/echo_api/java/restclient/pom.xml
index 0386d9f1470c5..e52acec690aa5 100644
--- a/samples/client/echo_api/java/restclient/pom.xml
+++ b/samples/client/echo_api/java/restclient/pom.xml
@@ -145,8 +145,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
index 70570f31c895a..c2d60f42aa82b 100644
--- a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
+++ b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
@@ -145,8 +145,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml
index 789ad39773585..ddff2d0ef7505 100644
--- a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml
+++ b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml
@@ -145,8 +145,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-swagger2/pom.xml b/samples/client/petstore/java/restclient-swagger2/pom.xml
index 5670fabdbc59b..9e372ad215019 100644
--- a/samples/client/petstore/java/restclient-swagger2/pom.xml
+++ b/samples/client/petstore/java/restclient-swagger2/pom.xml
@@ -145,8 +145,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -286,7 +286,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient/pom.xml b/samples/client/petstore/java/restclient/pom.xml
index f53b4974b3ee5..d16cc122eca6b 100644
--- a/samples/client/petstore/java/restclient/pom.xml
+++ b/samples/client/petstore/java/restclient/pom.xml
@@ -145,8 +145,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -280,7 +280,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.11</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>