upgrade to wiremock 3.2.0 (#1688)

Netflix · Oct 28, 2023 · 500c024 · 500c024
1 parent 1f53c18
commit 500c024
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/zuul-integration-test/build.gradle b/zuul-integration-test/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation 'commons-configuration:commons-configuration:1.10'
     annotationProcessor project(":zuul-processor")
 
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
+    testImplementation 'org.wiremock:wiremock:3.2.0'
     testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
     testImplementation libraries.truth, libraries.jupiterApi, libraries.jupiterParams, libraries.jupiterEngine, libraries.jupiterMockito, libraries.okhttp
     testImplementation "io.netty.incubator:netty-incubator-transport-classes-io_uring:${versions_netty_io_uring}"

diff --git a/zuul-integration-test/dependencies.lock b/zuul-integration-test/dependencies.lock
@@ -492,23 +492,20 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "2.14.2"
+            "locked": "2.15.2"
         },
         "com.fasterxml.jackson.core:jackson-databind": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "2.14.2"
-        },
-        "com.github.tomakehurst:wiremock-jre8": {
-            "locked": "2.35.0"
+            "locked": "2.15.2"
         },
         "com.google.guava:guava": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
                 "com.netflix.zuul:zuul-discovery"
             ],
-            "locked": "32.0.1-android"
+            "locked": "32.1.2-jre"
         },
         "com.google.inject:guice": {
             "firstLevelTransitive": [
@@ -734,7 +731,10 @@
                 "com.netflix.zuul:zuul-core",
                 "com.netflix.zuul:zuul-discovery"
             ],
-            "locked": "1.7.36"
+            "locked": "2.0.7"
+        },
+        "org.wiremock:wiremock": {
+            "locked": "3.2.0"
         }
     },
     "runtimeClasspath": {
@@ -956,10 +956,7 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "2.14.2"
-        },
-        "com.github.tomakehurst:wiremock-jre8": {
-            "locked": "2.35.0"
+            "locked": "2.15.2"
         },
         "com.google.inject:guice": {
             "firstLevelTransitive": [
@@ -1109,7 +1106,10 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "1.7.36"
+            "locked": "2.0.7"
+        },
+        "org.wiremock:wiremock": {
+            "locked": "3.2.0"
         }
     },
     "testRuntimeClasspath": {
@@ -1132,23 +1132,20 @@
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "2.14.2"
+            "locked": "2.15.2"
         },
         "com.fasterxml.jackson.core:jackson-databind": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core"
             ],
-            "locked": "2.14.2"
-        },
-        "com.github.tomakehurst:wiremock-jre8": {
-            "locked": "2.35.0"
+            "locked": "2.15.2"
         },
         "com.google.guava:guava": {
             "firstLevelTransitive": [
                 "com.netflix.zuul:zuul-core",
                 "com.netflix.zuul:zuul-discovery"
             ],
-            "locked": "32.0.1-android"
+            "locked": "32.1.2-jre"
         },
         "com.google.inject:guice": {
             "firstLevelTransitive": [
@@ -1368,7 +1365,10 @@
                 "com.netflix.zuul:zuul-core",
                 "com.netflix.zuul:zuul-discovery"
             ],
-            "locked": "1.7.36"
+            "locked": "2.0.7"
+        },
+        "org.wiremock:wiremock": {
+            "locked": "3.2.0"
         }
     }
 }
diff --git a/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java b/zuul-integration-test/src/test/java/com/netflix/zuul/integration/IntegrationTest.java
@@ -138,9 +138,9 @@ static void afterAll() {
     }
 
     @BeforeEach
-    void beforeEachTest(final WireMockRuntimeInfo wmRuntimeInfo) {
+    void beforeEachTest() {
         this.pathSegment = randomPathSegment();
-        this.wmRuntimeInfo = wmRuntimeInfo;
+        this.wmRuntimeInfo = wireMockExtension.getRuntimeInfo();
     }
 
     private static OkHttpClient setupOkHttpClient(final Protocol... protocols) {