From ef8557509a65885e60d16f9d48b1a20056e27eea Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 19 Jan 2022 13:39:55 -0500 Subject: [PATCH] Updates wiremock to wiremock-jre8-standalone. This shades jetty and avoids javax.servlet issues --- spring-cloud-consul-binder/pom.xml | 2 +- .../cloud/consul/binder/ConsulBinderApplicationTests.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index c57603b3..d6bad7a6 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -58,7 +58,7 @@ com.github.tomakehurst - wiremock + wiremock-jre8-standalone 2.27.2 test diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java index 5ced667c..5c2d78dc 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderApplicationTests.java @@ -55,8 +55,6 @@ import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER /** * @author Spencer Gibb */ -// FIXME: 4.0.0 https://github.com/wiremock/wiremock/issues/1760 -@Ignore("wiremock missing jakartax.servlet") @RunWith(SpringRunner.class) @SpringBootTest(classes = ConsulBinderApplicationTests.Application.class) @DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)