diff --git a/pom.xml b/pom.xml index 23e372a7b2..fcb8cf0ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 1.5.20 1.9.4 + 2.6.0 true false @@ -421,6 +422,11 @@ maven-settings-builder ${maven.version} + + org.sonatype.sisu + sisu-inject-plexus + ${sisu-inject-plexus.version} + org.apache.maven.resolver maven-resolver diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 2e26400e29..c6d9014150 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-contract-dependencies Spring Cloud Contract Dependencies - 2.30.0 + 2.30.1 0.6.1 diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index c5b7462e1e..78df4d98bd 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -79,6 +79,10 @@ org.apache.maven.resolver maven-resolver-api + + org.sonatype.sisu + sisu-inject-plexus + diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessorTests.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessorTests.java index 66cbf4eafc..cbf006e6e2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessorTests.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessorTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.contract.verifier.wiremock; import java.util.HashMap; import java.util.Map; +import java.util.stream.Collectors; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -151,10 +152,12 @@ class DefaultWireMockStubPostProcessorTests { then(result.getRequest().getMethod().getName()).isEqualTo("GET"); then(result.getResponse().getStatus()).isEqualTo(200); then(result.getResponse().getBody()).isEqualTo("pong"); - then(result.getPostServeActions()).extracting("name").contains("webhook"); - PostServeActionDefinition webhook = result.getPostServeActions().stream() - .filter(def -> "webhook".equals(def.getName())).findFirst().get(); - then(webhook.getParameters().get("method")).isEqualTo("POST"); + then(result.getPostServeActions().stream().map(a -> a.getName()).collect(Collectors.toList())) + .contains("webhook"); + PostServeActionDefinition definition = result.getPostServeActions().stream() + .filter(a -> a.getName().equals("webhook")).findFirst() + .orElseThrow(() -> new AssertionError("No webhook action found")); + then(definition.getParameters().getString("method")).isEqualTo("POST"); } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index fcb6d478c7..09bc552f6d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.30.0 +wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.0-SNAPSHOT groovyVersion=2.4.17 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 f0e00c41fa..ae0f7932b0 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 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.30.0 +wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.0-SNAPSHOT bootVersion=2.6.0-M1 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 f0e00c41fa..ae0f7932b0 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 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.30.0 +wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.0-SNAPSHOT bootVersion=2.6.0-M1 diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/dsl/wiremock/DefaultResponseTransformer.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/dsl/wiremock/DefaultResponseTransformer.java index 9275ca4c0e..aa2b81a6d6 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/dsl/wiremock/DefaultResponseTransformer.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/dsl/wiremock/DefaultResponseTransformer.java @@ -42,7 +42,7 @@ public class DefaultResponseTransformer extends ResponseTemplateTransformer { super(global); } - public DefaultResponseTransformer(boolean global, String helperName, Helper helper) { + public DefaultResponseTransformer(boolean global, String helperName, Helper helper) { super(global, helperName, helper); }