Merge branch 'refs/heads/main' into chore/api-test-demo

Author: coling01

.github/workflows/ci-build-publish.yml

@@ -58,19 +58,14 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          gradle-version: current
+          java-version: '25'
 
       - name: Gradle Build
         env:
           ARTEFACT_VERSION: ${{ needs.Artefact-Version.outputs.artefact_version }}
         run: |
           echo "Building with ARTEFACT_VERSION=$ARTEFACT_VERSION"
-          gradle build -DARTEFACT_VERSION=$ARTEFACT_VERSION
+          ./gradlew build -DARTEFACT_VERSION=$ARTEFACT_VERSION
 
       - name: Extract repo name
         id: repo_vars
@@ -96,7 +91,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -121,7 +116,7 @@ jobs:
 
           echo "Publishing artefact for version: $ARTEFACT_VERSION"
           
-          gradle publish \
+          ./gradlew publish \
             -DARTEFACT_VERSION=$ARTEFACT_VERSION \
             -DGITHUB_REPOSITORY=${{ github.repository }} \
             -DGITHUB_ACTOR=${{ github.actor }} \

.github/workflows/code-analysis.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - uses: pmd/pmd-github-action@v2
         id: pmd

.github/workflows/codeql.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v5

.gitignore

@@ -3,9 +3,7 @@ bin/*
 !bin/run-in-docker.sh
 .gradle
 /build/
-/gradlew
 /gradlew.bat
-!gradle/wrapper/gradle-wrapper.properties
 *.class
 bin/main/application.yaml
 

Dockerfile

@@ -1,11 +1,13 @@
 # Dockerfile (project root)
-FROM eclipse-temurin:21-jre-alpine
+FROM eclipse-temurin:25-jre
 
 # minimal runtime tooling for healthcheck
-RUN apk add --no-cache curl
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends curl \
+    && rm -rf /var/lib/apt/lists/*
 
 # run as non-root
-RUN addgroup -S app && adduser -S app -G app
+RUN groupadd -r app && useradd -r -g app app
 WORKDIR /app
 
 # copy all jars (bootJar + plain). We'll run the non-plain jar.

README.md

@@ -32,7 +32,7 @@ Further documentation can be found in the [docs](docs) directory.
 
 ### Prerequisites
 
-- ☕️ **Java 21.0.8 or later**: Ensure Java is installed and available on your `PATH`.
+- ☕️ **Java 25 or later**: Ensure Java is installed and available on your `PATH`.
 - ⚙️ **Gradle**: [Install Gradle](https://gradle.org/install/). The project itself defines which Gradle version to use (gradle/wraper/gradle-wrapper.properties).
 
 You can verify installation with:

build.gradle

@@ -40,11 +40,11 @@ springBoot {
 }
 
 dependencies {
-  implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.1")
+  implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.2")
 
   // --- Observability / Actuator / OTEL / Prometheus ---
   implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.hibernate.validator:hibernate-validator'
+  implementation 'org.hibernate.validator:hibernate-validator'
   implementation 'org.springframework.boot:spring-boot-starter-opentelemetry'
   implementation 'io.jsonwebtoken:jjwt:0.13.0'
   testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

gradle/dependencies/java-core.gradle

@@ -20,3 +20,7 @@ dependencies {
   implementation "org.mapstruct:mapstruct:$mapstructVersion"
   annotationProcessor "org.mapstruct:mapstruct-processor:$mapstructVersion"
 }
+
+tasks.named('wrapper') {
+  delete "${projectDir}/gradlew.bat"
+}

gradle/github/java.gradle

@@ -1,6 +1,7 @@
 java {
-  sourceCompatibility = JavaVersion.VERSION_21
-  targetCompatibility = JavaVersion.VERSION_21
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(25)
+  }
 }
 tasks.withType(JavaCompile).configureEach {
   options.compilerArgs << "-Xlint:unchecked" << "-Werror"