PI-1705 upgrade to java 21 (#2858)

* PI-1705 upgrade to java 21 * update github actions to use java 21
ministryofjustice · Dec 4, 2023 · 5482378 · 5482378
1 parent c7f50a3
commit 5482378
Show file tree

Hide file tree

Showing 51 changed files with 56 additions and 100 deletions.
diff --git a/.github/actions/analyse/action.yml b/.github/actions/analyse/action.yml
@@ -38,7 +38,7 @@ runs:
 
     - uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Sonar analysis

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -117,7 +117,7 @@ jobs:
       - uses: actions/setup-java@v3
         if: startsWith(steps.check_config.outputs.api_path, 'http')
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - uses: gradle/gradle-build-action@v2 # enables caching
         if: startsWith(steps.check_config.outputs.api_path, 'http')

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup GPG commit verification
         uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -107,7 +107,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Build jars

diff --git a/.github/workflows/templates.yml b/.github/workflows/templates.yml
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Render project template

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,13 +40,13 @@ allprojects {
 
     tasks {
         withType<JavaCompile> {
-            sourceCompatibility = "17"
+            sourceCompatibility = "21"
         }
 
         withType<KotlinCompile> {
             kotlinOptions {
                 freeCompilerArgs = listOf("-Xjsr305=strict")
-                jvmTarget = "17"
+                jvmTarget = "21"
             }
         }
 

diff --git a/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/JibConfigPlugin.kt b/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/JibConfigPlugin.kt
@@ -22,7 +22,7 @@ class JibConfigPlugin : Plugin<Project> {
                     user = "2000:2000"
                 }
                 from {
-                    image = System.getenv("JIB_FROM_IMAGE") ?: "eclipse-temurin:17-jre-alpine"
+                    image = System.getenv("JIB_FROM_IMAGE") ?: "eclipse-temurin:21-jre-alpine"
                 }
                 to {
                     image = "ghcr.io/ministryofjustice/hmpps-probation-integration-services/${project.name}"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/ThreadConfig.kt b/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/ThreadConfig.kt
diff --git a/projects/approved-premises-and-delius/src/main/resources/application.yml b/projects/approved-premises-and-delius/src/main/resources/application.yml
@@ -27,6 +27,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/approved-premises-and-oasys/src/main/resources/application.yml b/projects/approved-premises-and-oasys/src/main/resources/application.yml
@@ -14,6 +14,7 @@ spring:
     provider:
       ords-oasys-auth:
         token-uri: http://localhost:${wiremock.port}/eor/oasys/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/arns-and-delius/src/main/resources/application.yml b/projects/arns-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: ArnsAndDelius # Should match value in [deploy/database/access.yml].

diff --git a/projects/cas3-and-delius/src/main/resources/application.yml b/projects/cas3-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/court-case-and-delius/src/main/resources/application.yml b/projects/court-case-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml b/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml
@@ -30,6 +30,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/custody-key-dates-and-delius/src/main/resources/application.yml b/projects/custody-key-dates-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 delius.db.username: CustodyKeyDatesAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/projects/domain-events-and-delius/src/main/resources/application.yml b/projects/domain-events-and-delius/src/main/resources/application.yml
@@ -16,6 +16,8 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 

diff --git a/projects/dps-and-delius/src/main/resources/application.yml b/projects/dps-and-delius/src/main/resources/application.yml
@@ -17,6 +17,7 @@ spring:
             create_tables: false
             drop_tables: false
     open-in-view: false # this prevents aborted streaming requests from leaving a DB connection in-use
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml b/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/external-api-and-delius/src/main/resources/application.yml b/projects/external-api-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/hdc-licences-and-delius/src/main/resources/application.yml b/projects/hdc-licences-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/hmpps-auth-and-delius/src/main/resources/application.yml b/projects/hmpps-auth-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/make-recall-decisions-and-delius/src/main/resources/application.yml b/projects/make-recall-decisions-and-delius/src/main/resources/application.yml
@@ -30,6 +30,8 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: MakeRecallDecisionsAndDelius # Should match value in [deploy/database/access.yml].

diff --git a/projects/manage-offences-and-delius/src/main/resources/application.yml b/projects/manage-offences-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 delius.db.username: ManageOffencesAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/projects/manage-pom-cases-and-delius/src/main/resources/application.yml b/projects/manage-pom-cases-and-delius/src/main/resources/application.yml
@@ -30,6 +30,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/...nts-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/...nts-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -3,6 +3,7 @@ package uk.gov.justice.digital.hmpps
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
+import org.mockito.Mockito.timeout
 import org.mockito.kotlin.after
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
@@ -49,7 +50,7 @@ internal class IntegrationTest {
 
         if (expected.isNotEmpty()) {
             expected.forEach {
-                verify(telemetryService).trackEvent(
+                verify(telemetryService, timeout(30000)).trackEvent(
                     eq("OffenderEventPublished"),
                     eq(it + ("occurredAt" to ISO_ZONED_DATE_TIME.format(delta.dateChanged.truncatedTo(ChronoUnit.SECONDS)))),
                     any()

diff --git a/projects/offender-events-and-delius/src/main/resources/application.yml b/projects/offender-events-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 delius.db.username: OffenderEventsAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/projects/opd-and-delius/src/main/resources/application.yml b/projects/opd-and-delius/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
           global_temporary:
             create_tables: false
             drop_tables: false
+  threads.virtual.enabled: true
 
 delius.db.username: OpdAndDelius # Should match value in [deploy/database/access.yml].
 

diff --git a/projects/pathfinder-and-delius/src/main/resources/application.yml b/projects/pathfinder-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml b/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml
@@ -27,6 +27,8 @@ spring:
       provider:
         hmpps-auth:
           token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: PreSentenceService

diff --git a/projects/prison-case-notes-to-probation/src/main/resources/application.yml b/projects/prison-case-notes-to-probation/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 delius.db.username: PrisonCaseNotesToProbation
 

diff --git a/projects/prison-custody-status-to-delius/src/main/resources/application.yml b/projects/prison-custody-status-to-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
   profiles:
     include:
       - prisoner-movement

diff --git a/projects/prison-education-and-delius/src/main/resources/application.yml b/projects/prison-education-and-delius/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/prison-identifier-and-delius/src/main/resources/application.yml b/projects/prison-identifier-and-delius/src/main/resources/application.yml
@@ -26,6 +26,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json
 

diff --git a/projects/prisoner-profile-and-delius/src/main/resources/application.yml b/projects/prisoner-profile-and-delius/src/main/resources/application.yml
@@ -20,6 +20,8 @@ spring:
     base: dc=moj,dc=com
     base-environment:
       java.naming.ldap.derefAliases: never
+  threads.virtual.enabled: true
+
 springdoc.default-produces-media-type: application/json
 
 delius.db.username: PrisonerProfileAndDelius # Should match value in [deploy/database/access.yml].

diff --git a/projects/refer-and-monitor-and-delius/src/main/resources/application.yml b/projects/refer-and-monitor-and-delius/src/main/resources/application.yml
@@ -30,6 +30,7 @@ spring:
     provider:
       hmpps-auth:
         token-uri: http://localhost:${wiremock.port}/auth/oauth/token
+  threads.virtual.enabled: true
 
 springdoc.default-produces-media-type: application/json