From 6e9b8ecd1f8b7414c634370c9242546a17a1c442 Mon Sep 17 00:00:00 2001 From: holomekc Date: Sun, 17 Sep 2023 13:18:15 +0200 Subject: [PATCH] Remove unused imports, add mac info to README.md, do not ignore java 11 for ubuntu latest anymore. Not sure why this is configured by wiremock yet. --- .github/workflows/build-and-test.yml | 1 - README.md | 2 ++ .../wiremock/standalone/WireMockServerRunner.java | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c5cc56c522..7dce633065 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -57,7 +57,6 @@ jobs: # run: ./gradlew check sonarqube --stacktrace --no-daemon - name: Test WireMock - if: ${{ !(matrix.os == 'ubuntu-latest' && matrix.jdk == 11 && github.event_name == 'push') }} run: ./gradlew check --stacktrace --no-daemon # - name: Archive WireMock test report - ${{ matrix.os }} JDK ${{ matrix.jdk }} diff --git a/README.md b/README.md index fd8175933d..930ca43c06 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,8 @@ holomekc/wiremock-gui:{version} or holomekc/wiremock-gui:latest holomekc/wiremock-gui:{version}-alpine or holomekc/wiremock-gui:latest-alpine - linux/amd64 +#### Mac M[1-2] +In case you want to use this Docker image on an Apple Mac with M1 or M2 processor you cannot use the alpine image. The docker images are baces on the official wiremock docker images. I only replace the build jar file in the image. The official wiremock docker images uses eclipse-temurin as base image for the alpine and none alpine version. Sadly the alpine version of temurin does not support arm yet. See: https://github.com/adoptium/containers/issues/158. Theoretically, I could switch to a different base image, but this would create increased maintenance. I hope temurin is updated soon-ish. Please use the none alpine version on a Mac for the time being. #### Images [Mappings](./images/mappings.png) diff --git a/src/main/java/com/github/tomakehurst/wiremock/standalone/WireMockServerRunner.java b/src/main/java/com/github/tomakehurst/wiremock/standalone/WireMockServerRunner.java index 7c3df91bb5..6f453ab5de 100644 --- a/src/main/java/com/github/tomakehurst/wiremock/standalone/WireMockServerRunner.java +++ b/src/main/java/com/github/tomakehurst/wiremock/standalone/WireMockServerRunner.java @@ -30,11 +30,6 @@ import com.github.tomakehurst.wiremock.matching.RequestPattern; import com.github.tomakehurst.wiremock.stubbing.StubMapping; import com.github.tomakehurst.wiremock.stubbing.StubMappings; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; public class WireMockServerRunner {