Run on Java 24

And use a version of libexpat without vulns

Author: Mahoney

.github/workflows/ci.yml

@@ -18,22 +18,21 @@ jobs:
               - wiremock/wiremock:test
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             TAGS:
               - wiremock/wiremock:test-alpine
             PLATFORMS:
               - linux/amd64
 
     steps:
-      
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
           image: tonistiigi/binfmt:latest
           platforms: all
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -65,7 +64,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
           cache: maven
-    
+
       - name: Run integration test
         working-directory: test/integration-tests
         run: mvn -B -ntp package verify --file pom.xml -DargLine="-Dit.wiremock-image=${{ matrix.versions.TAGS[0] }}"
@@ -75,4 +74,4 @@ jobs:
     needs: docker-build
     with:
       image_version: latest
-    secrets: inherit
+    secrets: inherit

.github/workflows/main.yml

@@ -19,8 +19,7 @@ jobs:
               - ghcr.io/wiremock/wiremock:3x
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             TAGS:
               - wiremock/wiremock:3x-alpine
@@ -68,7 +67,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
           cache: maven
-    
+
       - name: Run integration test
         working-directory: test/integration-tests
         run: mvn -B -ntp package verify --file pom.xml -DargLine="-Dit.wiremock-image=${{ matrix.versions.TAGS[0] }}"

.github/workflows/nightly.yml

@@ -19,8 +19,7 @@ jobs:
               - ghcr.io/wiremock/wiremock:nightly
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             TAGS:
               - wiremock/wiremock:nightly-alpine
@@ -72,7 +71,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
           cache: maven
-    
+
       - name: Run integration test
         working-directory: test/integration-tests
         run: mvn -B -ntp package verify --file pom.xml -DargLine="-Dit.wiremock-image=${{ matrix.versions.TAGS[0] }}"

.github/workflows/patch.yml

@@ -22,8 +22,7 @@ jobs:
               - ghcr.io/wiremock/wiremock:${{ github.event.inputs.tag }}
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             IMAGES:
               - wiremock/wiremock:latest-alpine

.github/workflows/release-2.x.yml

@@ -42,8 +42,7 @@ jobs:
               - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             IMAGES:
               - wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}-alpine

.github/workflows/release.yml

@@ -45,8 +45,7 @@ jobs:
               - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}
             PLATFORMS:
               - linux/amd64
-              - linux/arm64
-              - linux/arm/v7
+              - linux/arm64/v8
           - CONTEXT: alpine
             IMAGES:
               - wiremock/wiremock:latest-alpine

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.24_8-jre
+FROM eclipse-temurin:24_36-jre
 
 LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"
 

Dockerfile-nightly

@@ -12,7 +12,7 @@ RUN ./gradlew shadowJar
 
 # RUN
 
-FROM eclipse-temurin:11.0.24_8-jre
+FROM eclipse-temurin:24_36-jre
 
 LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"
 

alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre-alpine
+FROM eclipse-temurin:24_36-jre-alpine-3.21
 
 LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"
 
@@ -7,7 +7,7 @@ ENV WIREMOCK_VERSION=$WIREMOCK_VERSION
 
 WORKDIR /home/wiremock
 
-RUN apk add --update openssl
+RUN apk add --update openssl libexpat
 
 # grab su-exec for easy step-down from root
 # and bash

alpine/Dockerfile-nightly

@@ -10,13 +10,13 @@ RUN ./gradlew shadowJar
 
 # RUN
 
-FROM eclipse-temurin:11.0.20_8-jre-alpine
+FROM eclipse-temurin:24_36-jre-alpine-3.21
 
 LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"
 
 WORKDIR /home/wiremock
 
-RUN apk add --update openssl
+RUN apk add --update openssl libexpat
 
 # grab su-exec for easy step-down from root
 # and bash