diff --git a/README.adoc b/README.adoc index 8b55dc2868..c236be76fc 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,6 @@ If you prefer to learn about the project by doing some tutorials, you can check workshops under https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. - == Project page You can read more about Spring Cloud Contract by going to https://spring.io/projects/spring-cloud-contract[the project page] diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index fef8d335b9..6680e25f56 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.0.2-SNAPSHOT -springBootVersion=2.4.3-SNAPSHOT +springBootVersion=2.4.3 camelVersion=3.4.3 \ No newline at end of file diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 2777063bb8..282885fd1c 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 1c25d4b569..7a77ad4331 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 52cbf65dbd..587b9b1fe5 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index b8911b8eca..cb426cbfeb 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 7afeab37f7..c601823e27 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index ab4675217d..13edd55aab 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 7c464fabf1..77190d77c8 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index a829343f80..b149fdeef1 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 48466da426..33238180c9 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index e4229030bd..6591ec4acf 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3-SNAPSHOT + 2.4.3 diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java index 2f2dc1ce08..fbeac94183 100644 --- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java +++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java @@ -93,13 +93,11 @@ public final class RegexPatterns { + value + "\r?\n--.*"; } - public static String multipartFile(Object name, Object filename, Object content, - Object contentType) { - return ".*--(.*)\r?\nContent-Disposition: form-data; name=\"" + name - + "\"; filename=\"" + filename + "\"\r?\n(Content-Type: " - + toContentType(contentType) - + "\r?\n)?(Content-Transfer-Encoding: .*\r?\n)?(Content-Length: \\d+\r?\n)?\r?\n" - + content + "\r?\n--.*"; + public static String multipartFile(Object name, Object filename, Object content, Object contentType) { + return ".*--(.*)\r?\nContent-Disposition: form-data; name=\"" + name + "\"; filename=\"" + filename + + "\"\r?\n(Content-Type: " + toContentType(contentType) + + "\r?\n)?(Content-Transfer-Encoding: .*\r?\n)?(Content-Length: \\d+\r?\n)?\r?\n" + content + + "\r?\n--.*"; } private static String toContentType(Object contentType) { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index dd076b11b2..1a2670dad6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.27.0 jsonAssertVersion=0.4.13 verifierVersion=3.0.2-SNAPSHOT -bootVersion=2.4.3-SNAPSHOT +bootVersion=2.4.3 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index dd076b11b2..1a2670dad6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.27.0 jsonAssertVersion=0.4.13 verifierVersion=3.0.2-SNAPSHOT -bootVersion=2.4.3-SNAPSHOT +bootVersion=2.4.3 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests.java index 58541a8847..90276d5837 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests.java @@ -47,7 +47,7 @@ class AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests { @Test @Order(1) - void outerTest() { + void outerTest() { this.wireMockServer .givenThat(WireMock.get("/should_register_mapping").willReturn(WireMock.aResponse().withBody("bar"))); @@ -73,12 +73,15 @@ class AutoConfigureWireMockWithResetAfterEachTestNestedApplicationTests { @Test @Order(3) void innerTwo() { - WireMock.givenThat(WireMock.get("/should_register_mapping").willReturn(WireMock.aResponse().withBody("bar"))); + WireMock.givenThat( + WireMock.get("/should_register_mapping").willReturn(WireMock.aResponse().withBody("bar"))); String result = new RestTemplate().getForObject("http://" + hostname + "/should_register_mapping", String.class); then(result).isEqualTo("bar"); } + } + }