All: Wiremock 3.x

bitxon · Sep 29, 2023 · 9d92170 · 9d92170
1 parent 6de3e00
commit 9d92170
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
 
   wiremock:
     container_name: wiremock
-    image: wiremock/wiremock:2.35.0
+    image: wiremock/wiremock:3.0.0-1
     ports:
       - "8888:8080"
     command: [ "--async-response-enabled=true", "--no-request-journal" ]

diff --git a/dropwizard-app/build.gradle b/dropwizard-app/build.gradle
@@ -30,8 +30,8 @@ dependencies {
 
     testImplementation 'io.dropwizard:dropwizard-testing'
     testImplementation project(":common-wiremock")
-    // TODO switch to wiremock 3 after https://github.com/wiremock/wiremock/issues/1967
-    testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.2.0'
+    testImplementation 'com.google.code.findbugs:jsr305:3.0.2' //TODO research - dep should be transitive from wiremock
     testImplementation 'org.testcontainers:testcontainers:1.17.6'
     testImplementation 'org.testcontainers:junit-jupiter:1.17.6'
     testImplementation 'org.testcontainers:postgresql:1.17.6'

diff --git a/dropwizard-app/src/test/java/bitxon/dropwizard/test/AbstractDropwizardTest.java b/dropwizard-app/src/test/java/bitxon/dropwizard/test/AbstractDropwizardTest.java
@@ -24,7 +24,7 @@ abstract class AbstractDropwizardTest {
         .withUsername("postgres")
         .withPassword("postgres")
         .withInitScript("sql/db-test-data.sql");
-    static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:2.35.0")
+    static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:3.0.0-1")
         .withExposedPorts(8080)
         .withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
         .waitingFor(Wait

diff --git a/micronaut-app/build.gradle b/micronaut-app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     testImplementation("org.testcontainers:postgresql")
     testImplementation("org.testcontainers:testcontainers")
     testImplementation project(":common-wiremock")
-    testImplementation("com.github.tomakehurst:wiremock-jre8:2.35.0")
+    testImplementation("org.wiremock:wiremock:3.2.0")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
 }
 

diff --git a/micronaut-app/src/test/java/bitxon/micronaut/test/AbstractMicronautTest.java b/micronaut-app/src/test/java/bitxon/micronaut/test/AbstractMicronautTest.java
@@ -27,7 +27,7 @@ abstract class AbstractMicronautTest implements TestPropertyProvider {
         .withUsername("postgres")
         .withPassword("postgres")
         .withInitScript("sql/db-test-data.sql");
-    static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:2.35.0")
+    static GenericContainer WIREMOCK = new GenericContainer("wiremock/wiremock:3.0.0-1")
         .withExposedPorts(8080)
         .withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
         .waitingFor(Wait

diff --git a/quarkus-app/build.gradle b/quarkus-app/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.testcontainers:testcontainers'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.2.0'
     testImplementation project(":common-wiremock")
 }
 

diff --git a/quarkus-app/src/test/java/bitxon/quarkus/test/ext/WiremockTestResourceLifecycleManager.java b/quarkus-app/src/test/java/bitxon/quarkus/test/ext/WiremockTestResourceLifecycleManager.java
@@ -18,7 +18,7 @@ public class WiremockTestResourceLifecycleManager implements QuarkusTestResource
 
     @Override
     public void init(Map<String, String> initArgs) {
-        wiremockContainer = new GenericContainer("wiremock/wiremock:2.35.0")
+        wiremockContainer = new GenericContainer("wiremock/wiremock:3.0.0-1")
             .withExposedPorts(8080)
             .withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
             .waitingFor(Wait

diff --git a/spring-app/build.gradle b/spring-app/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.boot:spring-boot-testcontainers'
     testImplementation project(":common-wiremock")
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation 'org.wiremock:wiremock:3.2.0'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'io.rest-assured:rest-assured'
 }

diff --git a/spring-app/src/test/java/bitxon/spring/test/ext/TestcontainersConfig.java b/spring-app/src/test/java/bitxon/spring/test/ext/TestcontainersConfig.java
@@ -24,7 +24,7 @@ public PostgreSQLContainer postgreSQLContainer() {
 
     @Bean
     public GenericContainer wiremockContainer(DynamicPropertyRegistry registry) {
-        var container = new GenericContainer("wiremock/wiremock:2.35.0")
+        var container = new GenericContainer("wiremock/wiremock:3.0.0-1")
             .withExposedPorts(8080)
             .withCopyFileToContainer(MountableFile.forClasspathResource("stubs"), "/home/wiremock")
             .waitingFor(Wait