From 796103cb48af159cff95654ae1d751e2f697cd48 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Wed, 4 Sep 2019 08:56:52 +0200
Subject: [PATCH] Bumped libs

fixes gh-1193
fixes gh-1194
fixes gh-1195
fixes gh-1196
fixes gh-1197
fixes gh-1198
---
 docker/spring-cloud-contract-docker/pom.xml                   | 3 ++-
 pom.xml                                                       | 4 ++--
 spring-cloud-contract-shade/pom.xml                           | 4 ++--
 .../spring-cloud-contract-maven-plugin/pom.xml                | 2 +-
 .../verifier/spec/pact/PactContractConverterSpec.groovy       | 2 +-
 .../test/resources/contracts/grouped/shouldWorkWithBeer.json  | 2 +-
 .../test/resources/contracts/shouldConvertAllGenerators.json  | 2 +-
 .../src/test/resources/contracts/shouldMarkClientAsFraud.json | 2 +-
 .../test/resources/contracts/shouldMarkClientAsNotFraud.json  | 2 +-
 .../src/test/resources/contracts/shouldReturnFraudStats.json  | 2 +-
 .../contracts/shouldSendMessageWhenBookReturned.json          | 2 +-
 .../contracts/shouldSendMessageWhenMessageReceived.json       | 2 +-
 .../resources/contracts/shouldVerifyWhenBookWasDeleted.json   | 2 +-
 tests/spring-cloud-contract-stub-runner-moco/pom.xml          | 3 ++-
 .../stubrunner/provider/moco/MocoHttpServerStub.groovy        | 4 +++-
 15 files changed, 21 insertions(+), 17 deletions(-)

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 @@
 	<modelVersion>4.0.0</modelVersion>
 	<properties>
 		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
+		<plexus-archiver.version>4.1.0</plexus-archiver.version>
 	</properties>
 
 	<parent>
@@ -132,7 +133,7 @@
 					<dependency>
 						<groupId>org.codehaus.plexus</groupId>
 						<artifactId>plexus-archiver</artifactId>
-						<version>3.4</version>
+						<version>${plexus-archiver.version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/pom.xml b/pom.xml
index e2fb5139ee..17cdbad940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 		<activemq.version>5.15.9</activemq.version>
 		<camel.version>2.24.1</camel.version>
 		<checkstyle.version>2.17</checkstyle.version>
-		<pact.version>3.6.7</pact.version>
+		<pact.version>3.6.12</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
 		<spring-cloud-build.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-zookeeper.version>2.2.0.BUILD-SNAPSHOT
@@ -54,7 +54,7 @@
 		<gmavenplus-plugin.version>1.6.3</gmavenplus-plugin.version>
 
 		<!-- We need to have compatibility with Gradle -->
-		<groovy.version>2.5.7</groovy.version>
+		<groovy.version>2.5.8</groovy.version>
 		<!-- For Takari plugin -->
 		<maven.version>3.3.9</maven.version>
 		<aether.version>1.1.0</aether.version>
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">
 	<modelVersion>4.0.0</modelVersion>
 	<properties>
-		<org.eclipse.sisu.inject.version>0.1.1</org.eclipse.sisu.inject.version>
+		<org.eclipse.sisu.inject.version>0.3.3</org.eclipse.sisu.inject.version>
 		<org.eclipse.sisu.plexus.version>0.1.1</org.eclipse.sisu.plexus.version>
 		<sisu-guice.version>4.2.0</sisu-guice.version>
 		<guice.version>4.2.2</guice.version>
 		<guava.version>27.1-jre</guava.version>
 		<asm.version>7.1</asm.version>
-		<checker.version>2.8.2</checker.version>
+		<checker.version>2.11.0</checker.version>
 
 		<maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
 		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
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 @@
 		</maven-project-info-reports-plugin.version>
 		<maven-plugin-annotations.version>3.5.2</maven-plugin-annotations.version>
 		<maven-archiver.version>3.4.0</maven-archiver.version>
-		<plexus-archiver.version>3.6.0</plexus-archiver.version>
+		<plexus-archiver.version>4.1.0</plexus-archiver.version>
 		<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
 		<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
 		<plexus-component-metadata.version>2.0.0</plexus-component-metadata.version>
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 @@
 	<description>Spring Cloud Contract Stub Runner Moco</description>
 	<properties>
 		<java.version>1.8</java.version>
+		<moco-runner.version>1.0.0</moco-runner.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -24,7 +25,7 @@
 		<dependency>
 			<groupId>com.github.dreamhead</groupId>
 			<artifactId>moco-runner</artifactId>
-			<version>0.11.1</version>
+			<version>${moco-runner.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
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) {