PP-12723: Use Java 21

.github/dependabot.yml

@@ -35,7 +35,7 @@ updates:
     ignore:
       - dependency-name: "eclipse-temurin"
         versions:
-          - "> 11"
+          - "> 21"
     open-pull-requests-limit: 10
     labels:
       - dependencies
@@ -49,7 +49,7 @@ updates:
     ignore:
       - dependency-name: "eclipse-temurin"
         versions:
-          - "> 11"
+          - "> 21"
     open-pull-requests-limit: 10
     labels:
       - dependencies

.github/workflows/_run-tests.yml

@@ -23,11 +23,23 @@ jobs:
   integration-tests:
     name: "Integration tests"
     uses: alphagov/pay-ci/.github/workflows/_run-java-tests-and-publish-pacts.yml@master
+    with:
+      java_version: 21
 
   provider-contract-tests:
     needs: integration-tests
     name: "App as provider tests"
     uses: alphagov/pay-ci/.github/workflows/_run-app-as-provider-contract-tests.yml@master
+    with:
+      java_version: 21
     secrets:
       pact_broker_username: ${{ secrets.pact_broker_username }}
       pact_broker_password: ${{ secrets.pact_broker_password }}
+
+  check-docker-base-images-are-manifests:
+    uses: alphagov/pay-ci/.github/workflows/_validate_docker_image_is_manifest.yml@master
+
+  check-docker-base-images-for-m1-are-manifests:
+    uses: alphagov/pay-ci/.github/workflows/_validate_docker_image_is_manifest.yml@master
+    with:
+      dockerfile: "m1/arm64.Dockerfile"

.github/workflows/codeql.yml

@@ -36,10 +36,10 @@ jobs:
             paths:
               - 'src/**'
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Compile project

Dockerfile

@@ -1,11 +1,11 @@
-FROM maven:3.9.5-eclipse-temurin-11-alpine@sha256:5b8e35bd58fc6d6d78fa7faa34c0a895f897ce90a10ab1e2c31e2eb5c62ee027 AS builder
+FROM maven:3.9.7-eclipse-temurin-21-alpine@sha256:8b762a139e07e874e3830521d97bafaf963cce6bda92afe9fb532def5d011404 AS builder
 
 WORKDIR /home/build
 COPY . .
 
 RUN ["mvn", "clean", "--no-transfer-progress", "package"]
 
-FROM eclipse-temurin:11-jre-alpine@sha256:77899ea444d0c219f3a4f500923dcae6b4b28db239b80c5214f26c1167ba74b5 AS final
+FROM eclipse-temurin:21-jre-alpine@sha256:23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67 AS final
 
 RUN ["apk", "--no-cache", "upgrade"]
 RUN ["apk", "--no-cache", "add", "tini"]

m1/arm64.Dockerfile

@@ -1,16 +1,14 @@
-FROM maven:3.9.5-eclipse-temurin-11@sha256:d698c543af44a1a8e4b2b2f9c1cfe3e009f2398cc7125a3d1204c71ad876800f AS builder
+FROM maven:3.9.7-eclipse-temurin-21-alpine@sha256:8b762a139e07e874e3830521d97bafaf963cce6bda92afe9fb532def5d011404 AS builder
 
 WORKDIR /home/build
 COPY . .
 
 RUN ["mvn", "clean", "--no-transfer-progress", "package"]
 
-FROM eclipse-temurin:11-jre@sha256:f31717a7a4c0d7cc9e50008544d269c90d6894dd70cdcbb28da8060913fcf8ad AS final
+FROM eclipse-temurin:21-jre-alpine@sha256:23467b3e42617ca197f43f58bc5fb03ca4cb059d68acd49c67128bfded132d67 AS final
 
-RUN ["apt-get", "update"]
-RUN ["apt-get", "upgrade", "-y"]
-RUN ["apt-get", "install", "-y", "tini"]
-RUN ["apt-get", "clean"]
+RUN ["apk", "--no-cache", "upgrade"]
+RUN ["apk", "--no-cache", "add", "tini"]
 
 ARG DNS_TTL=15
 

pom.xml

@@ -165,7 +165,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>11</release>
+                    <release>21</release>
                 </configuration>
             </plugin>
             <plugin>