diff --git a/pom.xml b/pom.xml index 62c584c26..c13e9ef44 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,6 @@ 3.0.0.BUILD-SNAPSHOT 3.0.0.BUILD-SNAPSHOT Horsham.BUILD-SNAPSHOT - - 2.2.1.RELEASE jacoco @@ -106,20 +104,6 @@ pom import - - org.springframework.cloud - spring-cloud-stream-dependencies - ${spring-cloud-stream.version} - pom - import - - - org.springframework.cloud - spring-cloud-contract-dependencies - ${donotreplacespring-cloud-contract.version} - pom - import - javax.inject javax.inject diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 6c6e11b1e..4c32e86da 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -13,6 +13,7 @@ https://projects.spring.io/spring-cloud/ 1.8.0 + 2.26.0 @@ -100,8 +101,9 @@ test - org.springframework.cloud - spring-cloud-contract-wiremock + com.github.tomakehurst + wiremock-jre8-standalone + ${wiremock.version} test diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java index fbab4b548..160936b3e 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/doc/AbstractDocumentationTests.java @@ -42,7 +42,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.cloud.contract.wiremock.restdocs.WireMockSnippet; import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; import org.springframework.cloud.netflix.eureka.server.doc.AbstractDocumentationTests.Application; @@ -55,11 +54,11 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; +import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyUris; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse; import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration; -import static org.springframework.restdocs.restassured3.operation.preprocess.RestAssuredPreprocessors.modifyUris; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, @@ -128,8 +127,7 @@ public abstract class AbstractDocumentationTests { private RequestSpecification spec(Object body, Filter... filters) { RequestSpecBuilder builder = new RequestSpecBuilder() - .addFilter(documentationConfiguration(this.restDocumentation).snippets() - .withAdditionalDefaults(new WireMockSnippet())); + .addFilter(documentationConfiguration(this.restDocumentation)); for (Filter filter : filters) { builder = builder.addFilter(filter); }