Story/ccls 2018 upgrade to Java 21

.github/workflows/on-tag.yml

@@ -35,10 +35,10 @@ jobs:
  app_version: ${{ steps.capture_version.outputs.app_version }}
  steps:
  - uses: actions/checkout@v3
- - name: Set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v3
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  - name: Build with Gradle
  uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629

.github/workflows/pr-merge-main.yml

@@ -26,10 +26,10 @@ jobs:
  with:
  ref: main
  token: ${{ secrets.REPO_TOKEN }}
- - name: Set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v3
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  - name: Build with Gradle
  uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629

.github/workflows/push-branch.yml

@@ -21,10 +21,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3
- - name: Set up JDK 17
+ - name: Set up JDK 21
  uses: actions/setup-java@v3
  with:
- java-version: '17'
+ java-version: '21'
  distribution: 'temurin'
  - name: Build with Gradle
  uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21
 
 # Use a build argument for version
 ARG app_version=0.0.1-SNAPSHOT

assessment-api/build.gradle

@@ -1,6 +1,6 @@
 plugins {
  id 'org.openapi.generator' version '7.0.1'
- id 'org.springframework.boot' version '3.1.0'
+ id 'org.springframework.boot'
 }
 
 apply plugin: "maven-publish"

assessment-service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
- id 'org.springframework.boot' version '3.1.0'
+ id 'org.springframework.boot'
  id 'jacoco'
  id 'checkstyle'
 }

build.gradle

@@ -1,6 +1,7 @@
 plugins {
  id 'java'
  id 'io.spring.dependency-management' version '1.1.0'
+ id 'org.springframework.boot' version '3.2.5' apply false
  id 'net.researchgate.release' version '3.0.2'
 }
 
@@ -12,7 +13,11 @@ subprojects {
 
  group = 'uk.gov.laa.ccms.caab'
 
- sourceCompatibility = '17'
+ java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
+ }
+ }
 
  repositories {
  mavenCentral()

gradle.properties

@@ -1,2 +1,4 @@
 version=0.0.7-SNAPSHOT
-group='uk.gov.laa.ccms'
+group='uk.gov.laa.ccms'
+
+JAVA_VERSION = 21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
  esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 # shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%