diff --git a/pom.xml b/pom.xml index 5beaa98c8e..db5784400b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,9 @@ 5.15.11 - 2.24.2 + 3.1.0 2.17 - 3.6.14 + 4.0.9 0.0.9 3.0.0.BUILD-SNAPSHOT 3.0.0.BUILD-SNAPSHOT @@ -51,10 +51,10 @@ 5.5.2 3.0.0-M4 3.0.0-M3 - 1.6.3 + 1.8.1 - 2.5.9 + 2.5.10 3.5.4 @@ -113,7 +113,7 @@ - org.apache.camel + org.apache.camel.springboot camel-spring-boot-starter ${camel.version} @@ -123,7 +123,7 @@ ${camel.version} - org.apache.camel + org.apache.camel.springboot camel-spring-boot ${camel.version} @@ -148,9 +148,9 @@ ${camel.version} - org.apache.activemq - activemq-camel - ${activemq.version} + org.apache.camel + camel-activemq + ${camel.version} org.apache.activemq @@ -214,7 +214,7 @@ au.com.dius - pact-jvm-consumer-java8_2.12 + pact-jvm-consumer-java8 ${pact.version} @@ -229,7 +229,7 @@ au.com.dius - pact-jvm-provider-junit_2.12 + pact-jvm-provider-junit ${pact.version} diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index e9d32dc9ef..ac608fe0a7 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -89,12 +89,12 @@ true - org.apache.camel + org.apache.camel.springboot camel-spring-boot-starter true - org.apache.camel + org.apache.camel.springboot camel-spring-boot true diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java index a7f546f53c..e3b18f34cd 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java @@ -99,8 +99,8 @@ public class StubRunnerCamelConfiguration { @Override public void process(Exchange exchange) { - if (log.isDebugEnabled()) { - log.debug("Got exchange [" + exchange + "]"); + if (log.isTraceEnabled()) { + log.trace("Got exchange [" + exchange + "]"); } } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy index 3f094732d7..fec4c18000 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy @@ -19,8 +19,8 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel import org.apache.camel.Exchange import org.apache.camel.Message import org.apache.camel.impl.DefaultCamelContext -import org.apache.camel.impl.DefaultExchange -import org.apache.camel.impl.DefaultMessage +import org.apache.camel.support.DefaultExchange +import org.apache.camel.support.DefaultMessage import spock.lang.Specification import org.springframework.cloud.contract.spec.Contract @@ -30,7 +30,7 @@ import org.springframework.cloud.contract.spec.Contract */ class StubRunnerCamelPredicateSpec extends Specification { Exchange exchange = new DefaultExchange(new DefaultCamelContext()) - Message message = new DefaultMessage() + Message message = new DefaultMessage(exchange) def "should return false if headers don't match"() { given: diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.jar index 87b738cbd0..490fda8577 100644 Binary files a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.jar and b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties index b0acbdcd73..a4b4429748 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.jar index 87b738cbd0..490fda8577 100644 Binary files a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.jar and b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties index b0acbdcd73..a4b4429748 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.jar index 87b738cbd0..490fda8577 100644 Binary files a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.jar and b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.properties index b0acbdcd73..a4b4429748 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml index 4a0112b832..c4633aefda 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml @@ -40,11 +40,11 @@ au.com.dius - pact-jvm-consumer-java8_2.12 + pact-jvm-consumer-java8 au.com.dius - pact-jvm-provider-junit_2.12 + pact-jvm-provider-junit org.springframework.boot diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java index 74290c7ea8..0861464dd0 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java @@ -31,14 +31,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import au.com.dius.pact.model.Pact; -import au.com.dius.pact.model.PactSpecVersion; +import au.com.dius.pact.core.model.Pact; +import au.com.dius.pact.core.model.PactSpecVersion; +import au.com.dius.pact.core.support.expressions.SystemPropertyResolver; +import au.com.dius.pact.core.support.expressions.ValueResolver; import au.com.dius.pact.provider.junit.loader.PactBroker; import au.com.dius.pact.provider.junit.loader.PactBrokerAuth; import au.com.dius.pact.provider.junit.loader.PactBrokerLoader; import au.com.dius.pact.provider.junit.loader.PactLoader; -import au.com.dius.pact.support.expressions.SystemPropertyResolver; -import au.com.dius.pact.support.expressions.ValueResolver; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; @@ -267,11 +267,6 @@ class PactStubDownloader implements StubDownloader { .resolveValue("pactbroker.port:" + pactBrokerUrl.getPort()); } - @Override - public String protocol() { - return scheme(); - } - @Override public String scheme() { return resolver @@ -288,11 +283,6 @@ class PactStubDownloader implements StubDownloader { return new String[] { resolver.resolveValue("pactbroker.consumers:") }; } - @Override - public boolean failIfNoPactsFound() { - return true; - } - @Override public PactBrokerAuth authentication() { return new PactBrokerAuth() { @@ -317,6 +307,11 @@ class PactStubDownloader implements StubDownloader { return resolver.resolveValue( "pactbroker.auth.password:" + stubRunnerPassword); } + + @Override + public String token() { + return resolver.resolveValue("pactbroker.auth.token:"); + } }; } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/BodyConverter.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/BodyConverter.groovy index 49082f10f1..9e2774af33 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/BodyConverter.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/BodyConverter.groovy @@ -21,11 +21,11 @@ import java.util.regex.Pattern import au.com.dius.pact.consumer.dsl.DslPart import au.com.dius.pact.consumer.dsl.PactDslJsonArray import au.com.dius.pact.consumer.dsl.PactDslJsonBody -import au.com.dius.pact.model.OptionalBody -import au.com.dius.pact.model.Request -import au.com.dius.pact.model.Response -import au.com.dius.pact.model.generators.Generator -import au.com.dius.pact.model.v3.messaging.Message +import au.com.dius.pact.core.model.OptionalBody +import au.com.dius.pact.core.model.Request +import au.com.dius.pact.core.model.Response +import au.com.dius.pact.core.model.generators.Generator +import au.com.dius.pact.core.model.messaging.Message import com.jayway.jsonpath.Configuration import com.jayway.jsonpath.internal.EvaluationContext import com.jayway.jsonpath.internal.Path @@ -158,9 +158,9 @@ class BodyConverter { def body = parseBody(request.body) if (request.generators.isNotEmpty() && request.generators.categories. - containsKey(au.com.dius.pact.model.generators.Category.BODY)) { + containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) { applyGenerators(body, request.generators.categories. - get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> + get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> return new DslProperty(new ClientDslProperty(pattern, generatedValue), currentValue) } } @@ -171,9 +171,9 @@ class BodyConverter { def body = parseBody(response.body) if (response.generators.isNotEmpty() && response.generators.categories. - containsKey(au.com.dius.pact.model.generators.Category.BODY)) { + containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) { applyGenerators(body, response.generators.categories. - get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> + get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> return new DslProperty(currentValue, new ServerDslProperty(pattern, generatedValue)) } } @@ -184,9 +184,9 @@ class BodyConverter { def body = parseBody(message.contents) if (message.generators.isNotEmpty() && message.generators.categories. - containsKey(au.com.dius.pact.model.generators.Category.BODY)) { + containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) { applyGenerators(body, message.generators.categories. - get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> + get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue -> return new DslProperty(new ClientDslProperty(pattern, generatedValue), currentValue) } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MatchingRulesConverter.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MatchingRulesConverter.groovy index 9eb79d19e5..c11728171b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MatchingRulesConverter.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MatchingRulesConverter.groovy @@ -16,18 +16,18 @@ package org.springframework.cloud.contract.verifier.spec.pact -import au.com.dius.pact.model.matchingrules.Category -import au.com.dius.pact.model.matchingrules.DateMatcher -import au.com.dius.pact.model.matchingrules.EqualsMatcher -import au.com.dius.pact.model.matchingrules.MaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinTypeMatcher -import au.com.dius.pact.model.matchingrules.NullMatcher -import au.com.dius.pact.model.matchingrules.NumberTypeMatcher -import au.com.dius.pact.model.matchingrules.RegexMatcher -import au.com.dius.pact.model.matchingrules.TimeMatcher -import au.com.dius.pact.model.matchingrules.TimestampMatcher -import au.com.dius.pact.model.matchingrules.TypeMatcher +import au.com.dius.pact.core.model.matchingrules.Category +import au.com.dius.pact.core.model.matchingrules.DateMatcher +import au.com.dius.pact.core.model.matchingrules.EqualsMatcher +import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher +import au.com.dius.pact.core.model.matchingrules.NullMatcher +import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher +import au.com.dius.pact.core.model.matchingrules.RegexMatcher +import au.com.dius.pact.core.model.matchingrules.TimeMatcher +import au.com.dius.pact.core.model.matchingrules.TimestampMatcher +import au.com.dius.pact.core.model.matchingrules.TypeMatcher import groovy.transform.CompileStatic import groovy.transform.PackageScope diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagePactCreator.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagePactCreator.groovy index 10793b4491..41421ec082 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagePactCreator.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagePactCreator.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.spec.pact import au.com.dius.pact.consumer.MessagePactBuilder import au.com.dius.pact.consumer.dsl.DslPart -import au.com.dius.pact.model.v3.messaging.MessagePact +import au.com.dius.pact.core.model.messaging.MessagePact import groovy.transform.CompileStatic import groovy.transform.PackageScope diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagingSCContractCreator.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagingSCContractCreator.groovy index cd56135af0..188d328e03 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagingSCContractCreator.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagingSCContractCreator.groovy @@ -16,22 +16,22 @@ package org.springframework.cloud.contract.verifier.spec.pact -import au.com.dius.pact.model.matchingrules.Category -import au.com.dius.pact.model.matchingrules.DateMatcher -import au.com.dius.pact.model.matchingrules.MatchingRule -import au.com.dius.pact.model.matchingrules.MatchingRuleGroup -import au.com.dius.pact.model.matchingrules.MaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinTypeMatcher -import au.com.dius.pact.model.matchingrules.NullMatcher -import au.com.dius.pact.model.matchingrules.NumberTypeMatcher -import au.com.dius.pact.model.matchingrules.RegexMatcher -import au.com.dius.pact.model.matchingrules.RuleLogic -import au.com.dius.pact.model.matchingrules.TimeMatcher -import au.com.dius.pact.model.matchingrules.TimestampMatcher -import au.com.dius.pact.model.matchingrules.TypeMatcher -import au.com.dius.pact.model.v3.messaging.Message -import au.com.dius.pact.model.v3.messaging.MessagePact +import au.com.dius.pact.core.model.matchingrules.Category +import au.com.dius.pact.core.model.matchingrules.DateMatcher +import au.com.dius.pact.core.model.matchingrules.MatchingRule +import au.com.dius.pact.core.model.matchingrules.MatchingRuleGroup +import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher +import au.com.dius.pact.core.model.matchingrules.NullMatcher +import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher +import au.com.dius.pact.core.model.matchingrules.RegexMatcher +import au.com.dius.pact.core.model.matchingrules.RuleLogic +import au.com.dius.pact.core.model.matchingrules.TimeMatcher +import au.com.dius.pact.core.model.matchingrules.TimestampMatcher +import au.com.dius.pact.core.model.matchingrules.TypeMatcher +import au.com.dius.pact.core.model.messaging.Message +import au.com.dius.pact.core.model.messaging.MessagePact import groovy.transform.CompileStatic import groovy.transform.PackageScope @@ -144,7 +144,8 @@ class MessagingSCContractCreator { } if (!message.metaData.isEmpty()) { headers { - message.metaData.each { String k, String v -> + message.metaData.each { String k, Object val -> + String v = val.toString() if (k.equalsIgnoreCase("contentType")) { messagingContentType(v) } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverter.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverter.groovy index ad84f49269..2273db548b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverter.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverter.groovy @@ -16,17 +16,16 @@ package org.springframework.cloud.contract.verifier.spec.pact -import au.com.dius.pact.model.Pact -import au.com.dius.pact.model.PactReader -import au.com.dius.pact.model.PactSpecVersion -import au.com.dius.pact.model.RequestResponsePact -import au.com.dius.pact.model.v3.messaging.MessagePact +import au.com.dius.pact.core.model.DefaultPactReader +import au.com.dius.pact.core.model.Pact +import au.com.dius.pact.core.model.PactSpecVersion +import au.com.dius.pact.core.model.RequestResponsePact +import au.com.dius.pact.core.model.messaging.MessagePact import groovy.json.JsonOutput import groovy.transform.CompileStatic import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.spec.ContractConverter - /** * Converter of JSON PACT file * @@ -45,7 +44,7 @@ class PactContractConverter implements ContractConverter> { @Override boolean isAccepted(File file) { try { - PactReader.loadPact(file) + DefaultPactReader.INSTANCE.loadPact(file) return true } catch (Exception e) { @@ -55,7 +54,7 @@ class PactContractConverter implements ContractConverter> { @Override Collection convertFrom(File file) { - Pact pact = PactReader.loadPact(file) + Pact pact = DefaultPactReader.INSTANCE.loadPact(file) if (pact instanceof RequestResponsePact) { return requestResponseSCContractCreator. convertFrom(pact as RequestResponsePact) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponsePactCreator.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponsePactCreator.groovy index 9987c8bfe7..36910e6d30 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponsePactCreator.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponsePactCreator.groovy @@ -23,7 +23,7 @@ import au.com.dius.pact.consumer.dsl.DslPart import au.com.dius.pact.consumer.dsl.PactDslRequestWithPath import au.com.dius.pact.consumer.dsl.PactDslResponse import au.com.dius.pact.consumer.dsl.PactDslWithProvider -import au.com.dius.pact.model.RequestResponsePact +import au.com.dius.pact.core.model.RequestResponsePact import groovy.transform.CompileStatic import groovy.transform.PackageScope diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponseSCContractCreator.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponseSCContractCreator.groovy index f453b4e7ff..d3d26c0bfb 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponseSCContractCreator.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponseSCContractCreator.groovy @@ -18,26 +18,26 @@ package org.springframework.cloud.contract.verifier.spec.pact import java.util.regex.Pattern -import au.com.dius.pact.model.OptionalBody -import au.com.dius.pact.model.ProviderState -import au.com.dius.pact.model.Request -import au.com.dius.pact.model.RequestResponseInteraction -import au.com.dius.pact.model.RequestResponsePact -import au.com.dius.pact.model.Response -import au.com.dius.pact.model.matchingrules.Category -import au.com.dius.pact.model.matchingrules.DateMatcher -import au.com.dius.pact.model.matchingrules.MatchingRule -import au.com.dius.pact.model.matchingrules.MatchingRuleGroup -import au.com.dius.pact.model.matchingrules.MaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher -import au.com.dius.pact.model.matchingrules.MinTypeMatcher -import au.com.dius.pact.model.matchingrules.NullMatcher -import au.com.dius.pact.model.matchingrules.NumberTypeMatcher -import au.com.dius.pact.model.matchingrules.RegexMatcher -import au.com.dius.pact.model.matchingrules.RuleLogic -import au.com.dius.pact.model.matchingrules.TimeMatcher -import au.com.dius.pact.model.matchingrules.TimestampMatcher -import au.com.dius.pact.model.matchingrules.TypeMatcher +import au.com.dius.pact.core.model.OptionalBody +import au.com.dius.pact.core.model.ProviderState +import au.com.dius.pact.core.model.Request +import au.com.dius.pact.core.model.RequestResponseInteraction +import au.com.dius.pact.core.model.RequestResponsePact +import au.com.dius.pact.core.model.Response +import au.com.dius.pact.core.model.matchingrules.Category +import au.com.dius.pact.core.model.matchingrules.DateMatcher +import au.com.dius.pact.core.model.matchingrules.MatchingRule +import au.com.dius.pact.core.model.matchingrules.MatchingRuleGroup +import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher +import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher +import au.com.dius.pact.core.model.matchingrules.NullMatcher +import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher +import au.com.dius.pact.core.model.matchingrules.RegexMatcher +import au.com.dius.pact.core.model.matchingrules.RuleLogic +import au.com.dius.pact.core.model.matchingrules.TimeMatcher +import au.com.dius.pact.core.model.matchingrules.TimestampMatcher +import au.com.dius.pact.core.model.matchingrules.TypeMatcher import groovy.transform.CompileStatic import groovy.transform.PackageScope diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/ValueGeneratorConverter.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/ValueGeneratorConverter.groovy index 1945f6725d..022b04bc95 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/ValueGeneratorConverter.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/ValueGeneratorConverter.groovy @@ -18,19 +18,19 @@ package org.springframework.cloud.contract.verifier.spec.pact import java.util.regex.Pattern -import au.com.dius.pact.model.generators.Category -import au.com.dius.pact.model.generators.DateGenerator -import au.com.dius.pact.model.generators.DateTimeGenerator -import au.com.dius.pact.model.generators.Generator -import au.com.dius.pact.model.generators.Generators -import au.com.dius.pact.model.generators.RandomBooleanGenerator -import au.com.dius.pact.model.generators.RandomDecimalGenerator -import au.com.dius.pact.model.generators.RandomHexadecimalGenerator -import au.com.dius.pact.model.generators.RandomIntGenerator -import au.com.dius.pact.model.generators.RandomStringGenerator -import au.com.dius.pact.model.generators.RegexGenerator -import au.com.dius.pact.model.generators.TimeGenerator -import au.com.dius.pact.model.generators.UuidGenerator +import au.com.dius.pact.core.model.generators.Category +import au.com.dius.pact.core.model.generators.DateGenerator +import au.com.dius.pact.core.model.generators.DateTimeGenerator +import au.com.dius.pact.core.model.generators.Generator +import au.com.dius.pact.core.model.generators.Generators +import au.com.dius.pact.core.model.generators.RandomBooleanGenerator +import au.com.dius.pact.core.model.generators.RandomDecimalGenerator +import au.com.dius.pact.core.model.generators.RandomHexadecimalGenerator +import au.com.dius.pact.core.model.generators.RandomIntGenerator +import au.com.dius.pact.core.model.generators.RandomStringGenerator +import au.com.dius.pact.core.model.generators.RegexGenerator +import au.com.dius.pact.core.model.generators.TimeGenerator +import au.com.dius.pact.core.model.generators.UuidGenerator import groovy.transform.CompileStatic import groovy.transform.PackageScope diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy index 7d37c996ab..005738aa0f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy @@ -18,10 +18,10 @@ package org.springframework.cloud.contract.stubrunner import java.nio.file.Files -import au.com.dius.pact.model.Pact -import au.com.dius.pact.model.PactSource +import au.com.dius.pact.core.model.Pact +import au.com.dius.pact.core.model.PactSource import au.com.dius.pact.provider.junit.loader.PactLoader -import au.com.dius.pact.support.expressions.ValueResolver +import au.com.dius.pact.core.support.expressions.ValueResolver import com.github.tomakehurst.wiremock.stubbing.StubMapping import org.jetbrains.annotations.NotNull import spock.lang.Ignore diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy index 5e7dbbadd6..8bdfbd00c6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy @@ -18,8 +18,8 @@ package org.springframework.cloud.contract.verifier.spec.pact import java.nio.file.Files -import au.com.dius.pact.model.Pact -import au.com.dius.pact.model.PactSpecVersion +import au.com.dius.pact.core.model.Pact +import au.com.dius.pact.core.model.PactSpecVersion import groovy.json.JsonOutput import org.skyscreamer.jsonassert.JSONAssert import spock.lang.Issue @@ -65,12 +65,12 @@ class PactContractConverterSpec extends Specification { converter.isAccepted(pactJson) } - def "should reject json files that are pact files"() { + def "should reject json files that are invalid pact files"() { given: File invalidPact = new File(PactContractConverterSpec. getResource("/pact/invalid_pact.json").toURI()) expect: - converter.isAccepted(invalidPact) + !converter.isAccepted(invalidPact) } def "should convert from pact to contract"() { @@ -347,7 +347,7 @@ class PactContractConverterSpec extends Specification { ], "metadata": { "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json index 9e13d8bce0..fde5e3a1f3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json @@ -147,7 +147,7 @@ ], "metadata": { "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json index 2faddd6f49..2172b530d8 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json @@ -274,7 +274,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json index 20219f2e0e..08f13ee80d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json @@ -98,7 +98,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json index 7e2887cdf9..5d5edd6d7c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json @@ -90,7 +90,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json index 9a6915f70d..4de1a9fad8 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json @@ -70,7 +70,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json index ea7c519089..d77c4d46f2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json @@ -39,7 +39,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json index ef8016f1e6..3efb57d187 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json @@ -38,7 +38,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json index e6af30b61a..24892cd0a2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json @@ -22,7 +22,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "3.6.14" + "version": "4.0.9" } } } diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index a1125313c4..7f727b6663 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -59,7 +59,7 @@ true - org.apache.camel + org.apache.camel.springboot camel-spring-boot-starter true diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java index 793d6c0d94..aa5263a167 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java @@ -92,9 +92,8 @@ public interface TestFrameworkDefinition { /** * @param annotationValue value of the annotation - * @return the test rule or extension annotation with the annotationValue passed as - * an argument. E.g. for JUnit 5 tests that could be - * {@code @ExtendWith(Example.class)} + * @return the test rule or extension annotation with the annotationValue passed as an + * argument. E.g. for JUnit 5 tests that could be {@code @ExtendWith(Example.class)} */ String getRuleAnnotation(String annotationValue); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java index 05d17bcbfd..317c0907f6 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java @@ -24,7 +24,7 @@ import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.ProducerTemplate; -import org.apache.camel.impl.DefaultExchange; +import org.apache.camel.support.DefaultExchange; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java index 20a085a2d7..bc3b50942c 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Message; -import org.apache.camel.impl.DefaultMessage; +import org.apache.camel.support.DefaultMessage; /** * @author Marcin Grzejszczak diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index eb42905ffd..fb8d1bc83b 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -15,7 +15,7 @@ Spring Cloud Contract Sample Camel - org.apache.camel + org.apache.camel.springboot camel-spring-boot-starter @@ -23,8 +23,8 @@ camel-jms - org.apache.activemq - activemq-camel + org.apache.camel + camel-activemq org.apache.activemq diff --git a/tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java b/tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java index c8bc7a3407..87d3ccb1dd 100644 --- a/tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java +++ b/tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java @@ -16,10 +16,10 @@ package com.example; -import org.apache.activemq.camel.component.ActiveMQComponent; import org.apache.camel.RoutesBuilder; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.activemq.ActiveMQComponent; import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.spring.SpringRouteBuilder; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -41,7 +41,7 @@ public class BookRouteConfiguration { @Bean RoutesBuilder myRouter(final BookService bookService, final BookDeleter bookDeleter) { - return new SpringRouteBuilder() { + return new RouteBuilder() { @Override public void configure() throws Exception { diff --git a/tests/samples-messaging-camel/src/main/java/com/example/BookService.java b/tests/samples-messaging-camel/src/main/java/com/example/BookService.java index 727f8cc01f..eac6f57739 100644 --- a/tests/samples-messaging-camel/src/main/java/com/example/BookService.java +++ b/tests/samples-messaging-camel/src/main/java/com/example/BookService.java @@ -36,9 +36,9 @@ public class BookService { */ public void returnBook(Exchange exchange) { BookReturned bookReturned = exchange.getIn().getBody(BookReturned.class); - log.info("Returning book [$bookReturned]"); - exchange.getOut().setBody(bookReturned); - exchange.getOut().setHeader("BOOK-NAME", bookReturned.bookName); + log.info("Returning book [" + bookReturned + "]"); + exchange.getMessage().setBody(bookReturned); + exchange.getMessage().setHeader("BOOK-NAME", bookReturned.bookName); } } diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index 855e6e2c49..234ab38669 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -24,7 +24,7 @@ test - org.apache.camel + org.apache.camel.springboot camel-spring-boot-starter @@ -56,8 +56,8 @@ test - org.apache.activemq - activemq-camel + org.apache.camel + camel-activemq test diff --git a/tests/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy b/tests/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy index c9cc787240..97bcae4871 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy @@ -18,14 +18,14 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel import groovy.json.JsonOutput import groovy.json.JsonSlurper -import org.apache.activemq.camel.component.ActiveMQComponent import org.apache.activemq.spring.ActiveMQConnectionFactory import org.apache.camel.CamelContext import org.apache.camel.ConsumerTemplate import org.apache.camel.Exchange import org.apache.camel.ProducerTemplate +import org.apache.camel.component.activemq.ActiveMQComponent import org.apache.camel.component.jms.JmsConfiguration -import org.apache.camel.impl.DefaultShutdownStrategy +import org.apache.camel.impl.engine.DefaultShutdownStrategy import spock.lang.IgnoreIf import spock.lang.Specification