diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml
index e98b86a345..73f45e81f4 100644
--- a/docker/spring-cloud-contract-docker/pom.xml
+++ b/docker/spring-cloud-contract-docker/pom.xml
@@ -5,6 +5,7 @@
4.0.0
1.0.8.RELEASE
+ 4.1.0
@@ -132,7 +133,7 @@
org.codehaus.plexus
plexus-archiver
- 3.4
+ ${plexus-archiver.version}
diff --git a/pom.xml b/pom.xml
index e2fb5139ee..17cdbad940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
5.15.9
2.24.1
2.17
- 3.6.7
+ 3.6.12
0.0.9
2.2.0.BUILD-SNAPSHOT
2.2.0.BUILD-SNAPSHOT
@@ -54,7 +54,7 @@
1.6.3
- 2.5.7
+ 2.5.8
3.3.9
1.1.0
diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml
index eb61e48f5c..f5900c1070 100644
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.1.1
+ 0.3.3
0.1.1
4.2.0
4.2.2
27.1-jre
7.1
- 2.8.2
+ 2.11.0
3.2.1
3.1.1
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 54c43e4ed4..9a41fced11 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -39,7 +39,7 @@
3.5.2
3.4.0
- 3.6.0
+ 4.1.0
4.3.0
3.7.1
2.0.0
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 7ff4d8cf61..efe28fed7a 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
@@ -339,7 +339,7 @@ class PactContractConverterSpec extends Specification {
],
"metadata": {
"pact-jvm": {
- "version": "3.6.7"
+ "version": "3.6.12"
}
}
}
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 66ccb60dda..6b5cdf8703 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.7"
+ "version": "3.6.12"
}
}
}
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 4ded0853aa..7a81371ecc 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.7"
+ "version": "3.6.12"
}
}
}
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 24709fde7c..f1ab329561 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.7"
+ "version": "3.6.12"
}
}
}
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 8b19aac3e6..26afd3f052 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.7"
+ "version": "3.6.12"
}
}
}
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 f34a0dff84..4fc8d49476 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.7"
+ "version": "3.6.12"
}
}
}
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 1d1bf3973a..04bcb6cec1 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.7"
+ "version": "3.6.12"
}
}
}
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 6eb20a150a..b387a361a9 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.7"
+ "version": "3.6.12"
}
}
}
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 53e435ed23..d897d5d45c 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.7"
+ "version": "3.6.12"
}
}
}
diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
index 71d81e6b82..ad6355f199 100644
--- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
@@ -15,6 +15,7 @@
Spring Cloud Contract Stub Runner Moco
1.8
+ 1.0.0
@@ -24,7 +25,7 @@
com.github.dreamhead
moco-runner
- 0.11.1
+ ${moco-runner.version}
org.springframework.cloud
diff --git a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy
index 5a9304e267..57816bafc8 100644
--- a/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy
+++ b/tests/spring-cloud-contract-stub-runner-moco/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/moco/MocoHttpServerStub.groovy
@@ -19,12 +19,14 @@ package org.springframework.cloud.contract.stubrunner.provider.moco
import com.github.dreamhead.moco.bootstrap.arg.HttpArgs
import com.github.dreamhead.moco.runner.JsonRunner
import com.github.dreamhead.moco.runner.RunnerSetting
+import groovy.transform.CompileStatic
import groovy.util.logging.Commons
import org.springframework.cloud.contract.stubrunner.HttpServerStub
import org.springframework.util.SocketUtils
@Commons
+@CompileStatic
class MocoHttpServerStub implements HttpServerStub {
private boolean started
@@ -70,7 +72,7 @@ class MocoHttpServerStub implements HttpServerStub {
.collect {
log.info("Trying to parse [${it.name}]")
try {
- return RunnerSetting.aRunnerSetting().withStream(it.newInputStream()).
+ return RunnerSetting.aRunnerSetting().addStream(it.newInputStream()).
build()
}
catch (Exception e) {