[Java] Update Java version in GitHub actions (#18513)

* Update Java version in Github actions * Generate samples * [java] Upgrade Gradle wrapper to 8.7 * Generate samples * [Java] Add resttemplate-jakarta to CI * Upgrade CI machines to ubuntu-2204:2024.04.4 which use Java 21 * Change CI machines to ubuntu-2204:2024.01.1 which use Java 17 * Change CI machines to ubuntu-2004:2024.01.1 * [ruby] Update Gemfile.locks * Use gradle wrapper for samples-java-client-jdk17
OpenAPITools · Apr 30, 2024 · bd02e65 · bd02e65
1 parent 8faa77c
commit bd02e65
Show file tree

Hide file tree

Showing 288 changed files with 7,303 additions and 6,000 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -141,7 +141,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -180,7 +180,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:

diff --git a/.github/workflows/gradle-test.yaml b/.github/workflows/gradle-test.yaml
@@ -10,7 +10,7 @@ on:
       - 'samples/client/petstore/java/**'
       - 'samples/openapi3/client/petstore/java/**'
 env:
-  GRADLE_VERSION: 7.2
+  GRADLE_VERSION: 8.7
 
 jobs:
   build:

diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml
@@ -34,9 +34,27 @@ jobs:
           path: |
             ~/.m2
           key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+
       - name: Build with Maven
         working-directory: ${{ matrix.sample }}
         run: mvn clean package
-      - name: Build with Gradle
+
+      - name: Cache gradle dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-caches
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+
+      - name: Cache gradle wrapper
+        uses: actions/cache@v4
+        env:
+          cache-name: gradle-wrapper
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build
         working-directory: ${{ matrix.sample }}
-        run: gradle clean build
+        run: ./gradlew build -x test
diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh
@@ -110,5 +110,6 @@ else
   (cd samples/client/petstore/java/resteasy && mvn integration-test)
   (cd samples/client/petstore/java-micronaut-client && mvn integration-test)
   (cd samples/client/petstore/java/apache-httpclient && mvn integration-test)
+  (cd samples/client/petstore/java/resttemplate-jakarta && mvn integration-test)
 
 fi
diff --git a/modules/openapi-generator/src/main/resources/Java/gradle-wrapper.jar b/modules/openapi-generator/src/main/resources/Java/gradle-wrapper.jar
diff --git a/modules/openapi-generator/src/main/resources/Java/gradle-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/Java/gradle-wrapper.properties.mustache
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/modules/openapi-generator/src/main/resources/Java/gradlew.bat.mustache b/modules/openapi-generator/src/main/resources/Java/gradlew.bat.mustache
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,28 +25,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Resolve any "." and ".." in APP_HOME to make it shorter.
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal