Attempt at making everything Java 17 - both the 3.x and 4.x builds

Author: tomakehurst

.github/workflows/ci-4.x-beta.yml

@@ -55,9 +55,11 @@ jobs:
           push: false
           file: ${{ matrix.versions.CONTEXT }}/Dockerfile
           tags: ${{ matrix.versions.TAGS[0] }}
+          build-args: |
+            WIREMOCK_VERSION=4.0.0-beta.29
 
       - name: Build Wiremock Docker image
-        run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17
+        run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 --build-arg WIREMOCK_VERSION=4.0.0-beta.29
 
       - name: Set up JDK
         uses: actions/setup-java@v3

.github/workflows/ci.yml

@@ -55,14 +55,16 @@ jobs:
           push: false
           file: ${{ matrix.versions.CONTEXT }}/Dockerfile
           tags: ${{ matrix.versions.TAGS[0] }}
+          build-args: |
+            WIREMOCK_VERSION=3.13.2
 
       - name: Build Wiremock Docker image
-        run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=11
+        run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 --build-arg WIREMOCK_VERSION=3.13.2
 
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: maven
 

.github/workflows/main.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: maven
 

.github/workflows/nightly.yml

@@ -66,7 +66,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: maven
 

.github/workflows/release.yml

@@ -95,7 +95,8 @@ jobs:
           push: true
           tags: ${{ join(matrix.versions.IMAGES, ',') }}
           build-args: |
-            "WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}"
+            WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}
+            JAVA_VERSION=17
 
   container-image-scan:
     uses: ./.github/workflows/container-image-scan.yml

.gitignore

@@ -5,3 +5,5 @@
 
 test/integration-tests/target
 test/integration-tests/integration-tests.iml
+
+.claude

Dockerfile

@@ -1,4 +1,4 @@
-ARG JAVA_VERSION=11
+ARG JAVA_VERSION=17
 FROM eclipse-temurin:${JAVA_VERSION}-jre
 
 LABEL maintainer="Rodolphe CHAIGNEAU <rodolphe.chaigneau@gmail.com>"

alpine/Dockerfile

@@ -1,4 +1,4 @@
-ARG JAVA_VERSION=11
+ARG JAVA_VERSION=17
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 
 LABEL maintainer="Rodolphe CHAIGNEAU <rodolphe.chaigneau@gmail.com>"

test/integration-tests/pom.xml

@@ -16,7 +16,7 @@
   </licenses>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <wiremock-testcontainers.version>1.0-alpha-13</wiremock-testcontainers.version>