diff --git a/pom.xml b/pom.xml index af031bbe44..800854291f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 6.1.0.202203080745-r 1 2.32.0 - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT 5.8.2 5.8.2 diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index e3e8d5eeaa..d37449a48f 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -22,7 +22,7 @@ UTF-8 17 4.0.0-SNAPSHOT - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 0a869972d4..fd36ba6fa1 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -2,4 +2,4 @@ org.gradle.daemon=false verifierVersion=4.0.0-SNAPSHOT BOM_VERSION=2022.0.0-SNAPSHOT bootVersion=3.0.0-SNAPSHOT -restAssuredVersion=6.0.0-SNAPSHOT +restAssuredVersion=5.0.2-SNAPSHOT diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index f2e30da53d..9ae4d633ab 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -22,7 +22,7 @@ UTF-8 17 4.0.0-SNAPSHOT - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index e3b7d452d2..1765a460f2 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -39,7 +39,7 @@ UTF-8 17 4.0.0-SNAPSHOT - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 0a869972d4..fd36ba6fa1 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -2,4 +2,4 @@ org.gradle.daemon=false verifierVersion=4.0.0-SNAPSHOT BOM_VERSION=2022.0.0-SNAPSHOT bootVersion=3.0.0-SNAPSHOT -restAssuredVersion=6.0.0-SNAPSHOT +restAssuredVersion=5.0.2-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 488109e399..de3f2d308a 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -24,7 +24,7 @@ 4.0.0-SNAPSHOT true - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 0a869972d4..fd36ba6fa1 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -2,4 +2,4 @@ org.gradle.daemon=false verifierVersion=4.0.0-SNAPSHOT BOM_VERSION=2022.0.0-SNAPSHOT bootVersion=3.0.0-SNAPSHOT -restAssuredVersion=6.0.0-SNAPSHOT +restAssuredVersion=5.0.2-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index 170b54a892..768f5616b4 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -22,7 +22,7 @@ UTF-8 17 4.0.0-SNAPSHOT - 6.0.0-SNAPSHOT + 5.0.2-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 19c727d3a3..41b84c0cd5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -20,7 +20,7 @@ org.gradle.daemon=false aetherVersion=1.1.0 springCloudBuildVersion=4.0.0-SNAPSHOT springVersion=6.0.0-M3 -jacksonDatabindVersion=2.11.4 +jacksonDatabindVersion=2.13.2.1 mavenResolverVersion=1.4.1 jgitVersion=5.12.0.202106070339-r -jschVersion=0.0.9 \ No newline at end of file +jschVersion=0.0.9 diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy index 77fe03f3ad..a426d1ebe5 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy @@ -843,8 +843,8 @@ class SingleTestGeneratorSpec extends Specification { // tag::context_path_baseclass[] import io.restassured.RestAssured; import org.junit.Before; - import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; + import org.springframework.boot.test.web.server.LocalServerPort; @SpringBootTest(classes = ContextPathTestingBaseClass.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class ContextPathTestingBaseClass { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerRestAssuredApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerRestAssuredApplicationTests.java index 2ec09d7642..b97d095eaa 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerRestAssuredApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerRestAssuredApplicationTests.java @@ -22,13 +22,13 @@ import org.junit.jupiter.api.Test; import wiremock.org.eclipse.jetty.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.ResponseEntity; @@ -46,7 +46,7 @@ public class WiremockServerRestAssuredApplicationTests { @Autowired private RequestSpecification documentationSpec; - @LocalServerPort + @Value("${local.server.port}") private int port; /* diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java b/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java index 315b9ab786..9917072cfa 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java +++ b/tests/spring-cloud-contract-stub-runner-context-path/src/test/java/com/example/loan/LoanApplicationServiceTests.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; 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.stubrunner.StubFinder; import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner; import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties; @@ -46,7 +46,7 @@ public class LoanApplicationServiceTests { // end::autoconfigure_stubrunner[] - @LocalServerPort + @Value("${local.server.port}") Integer port; @Autowired