From 3ff0ed942c5e60a315b3cee4fd82959126da717d Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 20 Jun 2017 09:26:11 +0200
Subject: [PATCH 1/4] Trying to make the shading work in intellij (again)

---
 spring-cloud-contract-shade/pom.xml           | 39 +++++++++++++++++++
 ...AutoConfigureWireMockApplicationTests.java |  2 +-
 .../WiremockHttpsServerApplicationTests.java  |  4 +-
 .../WiremockServerApplicationTests.java       |  4 +-
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml
index 8f8b0f0715..ba05441a7c 100644
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -48,6 +48,44 @@
 			<artifactId>maven-settings-builder</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.inject</artifactId>
+			<version>0.1.1</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.plexus</artifactId>
+			<version>0.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.enterprise</groupId>
+					<artifactId>cdi-api</artifactId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.sonatype.sisu</groupId>
+			<artifactId>sisu-guice</artifactId>
+			<version>3.1.6</version>
+			<classifier>no_aop</classifier>
+			<exclusions>
+				<exclusion>
+					<groupId>aopalliance</groupId>
+					<artifactId>aopalliance</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -66,6 +104,7 @@
 							<shadedArtifactAttached>false</shadedArtifactAttached>
 							<createSourcesJar>true</createSourcesJar>
 							<shadeSourcesContent>true</shadeSourcesContent>
+							<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
 							<relocations>
 								<relocation>
 									<pattern>org.eclipse.aether.connector</pattern>
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java
index 37af76fac6..b7df3fdf09 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java
@@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes=WiremockTestsApplication.class, properties="app.baseUrl=http://localhost:${wiremock.server.port}", webEnvironment=WebEnvironment.NONE)
 @DirtiesContext
-@AutoConfigureWireMock
+@AutoConfigureWireMock(port = 5432)
 public class AutoConfigureWireMockApplicationTests {
 
 	@Autowired
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java
index 2c097b345f..15d73ade30 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockHttpsServerApplicationTests.java
@@ -23,7 +23,9 @@ public class WiremockHttpsServerApplicationTests {
 
 	@ClassRule
 	public static WireMockClassRule wiremock = new WireMockClassRule(
-			WireMockSpring.options().httpsPort(8443));
+			WireMockSpring.options()
+					.port(5433)
+					.httpsPort(8443));
 
 	@Autowired
 	private Service service;
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java
index dd6a002d33..062a7e9012 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerApplicationTests.java
@@ -19,12 +19,12 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes=WiremockTestsApplication.class, properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE)
+@SpringBootTest(classes=WiremockTestsApplication.class, properties="app.baseUrl=http://localhost:5435", webEnvironment=WebEnvironment.NONE)
 @DirtiesContext
 public class WiremockServerApplicationTests {
 
 	@ClassRule
-	public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options());
+	public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options().port(5435));
 
 	@Autowired
 	private Service service;

From c286bf15aae1fb0905ffdf018fb91705bc04bb2f Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 20 Jun 2017 17:24:47 +0200
Subject: [PATCH 2/4] Trying to make things work

---
 spring-cloud-contract-shade/pom.xml | 41 +----------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml
index ba05441a7c..26341e3471 100644
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -48,44 +48,6 @@
 			<artifactId>maven-settings-builder</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.inject</artifactId>
-			<version>0.1.1</version>
-			<optional>true</optional>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.plexus</artifactId>
-			<version>0.1.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.enterprise</groupId>
-					<artifactId>cdi-api</artifactId>
-				</exclusion>
-			</exclusions>
-			<optional>true</optional>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.sonatype.sisu</groupId>
-			<artifactId>sisu-guice</artifactId>
-			<version>3.1.6</version>
-			<classifier>no_aop</classifier>
-			<exclusions>
-				<exclusion>
-					<groupId>aopalliance</groupId>
-					<artifactId>aopalliance</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.google.code.findbugs</groupId>
-					<artifactId>jsr305</artifactId>
-				</exclusion>
-			</exclusions>
-			<optional>true</optional>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -104,7 +66,6 @@
 							<shadedArtifactAttached>false</shadedArtifactAttached>
 							<createSourcesJar>true</createSourcesJar>
 							<shadeSourcesContent>true</shadeSourcesContent>
-							<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
 							<relocations>
 								<relocation>
 									<pattern>org.eclipse.aether.connector</pattern>
@@ -183,4 +144,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file

From 953f98d494d1df1858e04139891065238f7c1ef8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 20 Jun 2017 21:46:13 +0200
Subject: [PATCH 3/4] Fixed intellij shading dependencies

---
 spring-cloud-contract-shade/pom.xml | 46 +++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml
index 26341e3471..1a5e26a4d0 100644
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -48,6 +48,44 @@
 			<artifactId>maven-settings-builder</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.inject</artifactId>
+			<version>0.1.1</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.plexus</artifactId>
+			<version>0.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.enterprise</groupId>
+					<artifactId>cdi-api</artifactId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.sonatype.sisu</groupId>
+			<artifactId>sisu-guice</artifactId>
+			<version>3.1.6</version>
+			<classifier>no_aop</classifier>
+			<exclusions>
+				<exclusion>
+					<groupId>aopalliance</groupId>
+					<artifactId>aopalliance</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -66,6 +104,7 @@
 							<shadedArtifactAttached>false</shadedArtifactAttached>
 							<createSourcesJar>true</createSourcesJar>
 							<shadeSourcesContent>true</shadeSourcesContent>
+							<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
 							<relocations>
 								<relocation>
 									<pattern>org.eclipse.aether.connector</pattern>
@@ -92,6 +131,13 @@
 									<shadedPattern>shaded.org.apache.maven</shadedPattern>
 								</relocation>
 							</relocations>
+							<filters>
+								<filter>
+									<excludes>
+										<exclude>org/slf4j/</exclude>
+									</excludes>
+								</filter>
+							</filters>
 						</configuration>
 					</execution>
 				</executions>

From 97380129a426f8e539c6be98d6d19ab92f55e704 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 20 Jun 2017 21:46:22 +0200
Subject: [PATCH 4/4] Fixed wrong contract pattern scanning

e.g. this worked

com/example/foo/...

this didn't

/contract/com/example/foo/...

fixes #335
---
 .../stubrunner/ContractDownloader.java        |   5 +-
 .../stubrunner/ContractDownloaderSpec.groovy  |   6 +-
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../functionalTest/bootSimple/gradlew         |  52 +++++++++---------
 .../functionalTest/bootSimple/gradlew.bat     |   8 +--
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../sampleJerseyProject/gradlew               |  52 +++++++++---------
 .../sampleJerseyProject/gradlew.bat           |   8 +--
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../functionalTest/sampleProject/gradlew      |  52 +++++++++---------
 .../functionalTest/sampleProject/gradlew.bat  |   8 +--
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../functionalTest/scenarioProject/gradlew    |  52 +++++++++---------
 .../scenarioProject/gradlew.bat               |   8 +--
 .../verifier/file/ContractFileScanner.groovy  |   1 +
 19 files changed, 136 insertions(+), 132 deletions(-)
 mode change 100755 => 100644 spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew.bat

diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java
index 2001b75d1f..9d261d8474 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java
@@ -57,9 +57,11 @@ public class ContractDownloader {
 		String includedAntPattern;
 		if (StringUtils.hasText(this.contractsPath)) {
 			pattern = patternFromProperty(contractsDirectory);
+			log.info("Will pick a pattern from the contractPath property");
 			includedAntPattern = wrapWithAntPattern(contractsPath());
 		} else {
 			pattern = groupArtifactToPattern(contractsDirectory);
+			log.info("Will pick a pattern from group id and artifact id");
 			includedAntPattern = wrapWithAntPattern(slashSeparatedGroupId() + "/" + this.projectArtifactId);
 		}
 		log.info("Pattern to pick contracts equals [" + pattern + "]");
@@ -71,6 +73,7 @@ public class ContractDownloader {
 
 	private String patternFromProperty(File contractsDirectory) {
 		return ("^" + contractsDirectory.getAbsolutePath() +
+				"(" + File.separator + ")?" + ".*" +
 				contractsPath().replace("/", File.separator) + ".*$").replace("\\", "\\\\");
 	}
 
@@ -101,7 +104,7 @@ public class ContractDownloader {
 	private String groupArtifactToPattern(File contractsDirectory) {
 		return ("^" +
 				contractsDirectory.getAbsolutePath() +
-				File.separator +
+				"(" + File.separator + ")?" + ".*" +
 				slashSeparatedGroupId() +
 				File.separator +
 				this.projectArtifactId
diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/ContractDownloaderSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/ContractDownloaderSpec.groovy
index e88b7df793..b673564072 100644
--- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/ContractDownloaderSpec.groovy
+++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/ContractDownloaderSpec.groovy
@@ -25,12 +25,12 @@ class ContractDownloaderSpec extends Specification {
 		then:
 			properties.includedContracts.startsWith('^')
 			properties.includedContracts.endsWith('$')
-			properties.includedContracts.contains(fileSeparated('/some/path/to/somewhere/a/b/c/d/.*'))
+			properties.includedContracts.contains(fileSeparated('/some/path/to/somewhere(/)?.*/a/b/c/d/.*'))
 	}
 
 	def 'should set inclusion pattern on config when path pattern was explicitly provided without a separator at the beginning'() {
 		given:
-			String contractPath = File.separator + ['a','b','c','d'].join(File.separator)
+			String contractPath = ['a','b','c','d'].join(File.separator)
 			ContractDownloader contractDownloader = new ContractDownloader(stubDownloader,
 					stubConfiguration, contractPath, '', '')
 			ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties()
@@ -41,7 +41,7 @@ class ContractDownloaderSpec extends Specification {
 		then:
 			properties.includedContracts.startsWith('^')
 			properties.includedContracts.endsWith('$')
-			properties.includedContracts.contains(fileSeparated('/some/path/to/somewhere/a/b/c/d/.*'))
+			properties.includedContracts.contains(fileSeparated('/some/path/to/somewhere(/)?.*/a/b/c/d/.*'))
 	}
 
 	private static String fileSeparated(String string) {
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 d3b83982b9b1bccad955349d702be9b884c6e049..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 2176
zcmZWp3rtg27(TtXg$ixK@+#g!E0`*xQ<y{$U*Lld)G(vgIUH=DC=eZx_#m6eoO6?j
z;z_m{b+UjA#Gwcg5;uyJ7NrG5hlwJaI5#j72gJyHvj6^<bi3N*=KTH6_kHJooO@eK
zSVsw~OiW;<ZiL9?M7nIGSZPqgVvLT8d>Ts#F%>Uf>oed#k~5qmA^$N)myQ%yOlJAT
zF%6f|+5AGMOZxb=R>kBp2z)N>M_`+*41ro7xt9wfp{iQ~;ySTcib%iD5dq25gt#J7
zu3P7Y!C1ILhJh;5*ByhYOGe!=n7pc2FqEuy73A)wwQ_!orY0vTA1xg*+V?xkcS1FX
zs3TdQZ~sNrtoL5rchVHLwISuH|N1*gNsncZ{*0XxaysPK{`!624=1PsHuae*D?QG>
zpQ!%2?rvGvs-D96UNzktY$w_0Wn|9t6*;!3AoUNDhXG+x9opd&O@-G_g>HM<yZlPS
z<0%Wb{(btVxq~4U6RN#lJjh-X|J=juY@U=rN;E5F1`BKL@suwaKA?uw2MDOs#uyc!
z^v`Ekh8Hu0?32;r>Y24G(rb`-A%jYg_)VrxjzL4Nj>X{ij%Xp!<lT@V@+kkAKz>-z
z?TU!yt1bcgwy+BQYL^vNsBvqkWLQA%m);eE*7A!|+}c~k3eI0t4+&elYc>i#w=Tp8
zoPhdk0y5OFM&QI<qNt+1jfpJWDmvRdM|`_zwmAYPRcYq@PQrw?=cLa{Opq|%tZ*gy
zDfXDTd6&oc(sMpc%i8oh#R$6uT7^Ha@s$uy@-k+S&Tb0QfsJv?XK9;DVXqsWU?+!=
zx&j@|ZVK1)9P4lUZ+e5#$5KL;ia0Do!<u~PER&qxZHhp0|KR%EGeGKrCrCuzEk$zt
zWe$nb%DmnraD5kCXNriaG9;dBaiJxb^+?v<+t_235%LTg@V1ETCP#9VTu(JE3arVY
z{9rkMN1nR8?yRSao9AO|^P4&5g(pfwCkD`tW(C5%0N?RJ*u$bhXu5@Cwrc?LrKdD%
zy4@l$_W*ochs^U9e`GoUdK`|>D~kd1Hr}kCaszS>)(|pHls6kmW16)zrDYOoKW*U{
z?Gn_UYYE0OZgouDRRSf{sb24-FCA_PLr#W1<4B!^kaa8}ks|*mG{zc-)`eD%Attn*
zWl~YQRVd)Lm6NQePpsj3{=IU348R0(b^huK>XT_#@+7LYDfmlIvu&ItjUKWE;=gJe
z$Iuiy?C_`eZ3cvttsE1WN++iU)0M4WXudjjLO=x!WE85I@3iJGnOhnV7t+R7!Mq)`
zigeWK_qxy(>Av)wU4b40!OD?1s5Ak5!bBebYz2XqhGzIt|2BcV$ZyM7t1BS~;My+`
zk&80X{Ys{m=8u!LnZ7mc;MxP(%@vW)=Q>jv%Jp=na{r_5seK^W1}7{M39j!zfnsMM
z@2=w;8<cl-!%?`o$CQK^L}X7obTtBNJCT*t`6JX;{>Bvl${)|bk2l2r7PWEA9|iPq
zRS<1&Q{x$hF%emxfZiSS^F(J{qOaQCL0P<=V-6Rh+d+F6LX7||C;}*mzO<_`lVp#D
z*Gr+a5GYOjo(+_scC{lAiE&+<2af{r1e7Kw-YFeV*@bG$6runBZt?xtWw^H{1z!0{
z?u0~(ay8Q-M?5CBpq*oORY8ewIVXCt>3r^YaNZdhl6azfs-5RGR{J`qI#p^^_(M<9
z`D#SxWY>T|OJ~?QJnX#=j_JC99`3c=8~IWaeT?tz3-E~&`S{S^JB(;Cy^~`G8qgx6
mGXSB304=(NP+O+~r{pnaF?oZ78Xld<shfIS3wJS?dGKFWP5xs5

delta 2138
zcmZ9M4Nz276vywr-DMZuT^14c<FV}Gl&}hcAVvZSS`#5DV}h0_DA*2yTHv5EmQq>~
z6N;x&M;f<KbEGIfMDv5?YXM=|Mavj9#gAr^atu?)GSlum7qRD?*}Zpu_kaH9-gD1;
zF1xhLE>)+^mdeHuqEwRj6nCY1qM8oLx@i4ZiG+~!%EWZP;li7R67pC#h3XClONGH5
zio@TL!T@2C%fi^8<%&22@5_Eg@TPn(f(D(^&kISo<}4%Lz87RjhWxiNvO#ZEAUR;p
z@WY8DS|!JcHa1`^POP);j?vIm$!FcZ>+D{HG-{wyW(2iU(~vReAj=_5S1?EQf^?-2
z2FtTD)m9pn8Zs<fLyuPm?kvm3?mA7IMN9fmIF>ED5jxYb@aN3T+lq?ceP2$=EBWz{
zft`PK?x?7DdFH(scP8AJsL+J3TT?xwb)e;&pH8nX`sIZkVVi@iNgS80$qtFG^lN(e
zT32G(2VZXeblTg8f}+DGwJ$0TUwLAC%2Zq9!z1RHlMiZq9v9P^B5}i8*<n(;uLgVe
zhnz5h$vHy^bh!@^G#G3{Y$9I)5?tDyZ&u>uM3GsFlfmLRHZhg_AV+d*<2@!GE<K|_
z(p`3nk*e|<W|&fOU>q*pvEO85sQMC{xb`>6aA`}8lsT8z4zs0q>J~Gfi}guNGvRPQ
zBX^F>XPVSwfKhOzIZaBt3St~n#oYzPju^a{S_iM&O)q41p)De9wuBomWi2UO+9d}s
zaln0t5tW7(Uh*6Grt2WJ1$zNrZ{azU1ionVhct;6s#;Vitf5%KjbLv`;6g#u%9c#6
zJhxVcOLJR!RIj9HsT|Rs)`=FOwF0j!KJSzha*u8$n(pn<(^#rhqA*Tr0b?7pw6^hF
zkOuLR4h1aK_)UJ|9Lc#QuEFgxLK3_QiF{;6$HvloU~ij&IrpuPJet8#Nb{OSnsfeW
zt`1OvrJd!BXy>_=dc=0UA1GZa^oYIKbb<FH<hqp*i^yY_8O1KMnl_-g$fu~+pHaB{
zbhHsn9V|sy2Q6YO;w2ryXusLGx2B$!WTu{wNg{jWEEMi(^@5`vCM@eY8b5vxVwICs
zdXkgpZqG+#*Q+7V`4lR*QT!kSahgO4J<f562c5hm1O9PFnMLm{%}djdK8>Y^Ahk0j
zQ_u)dsG#upuz~(-$-hZi*{s2Ag-de_mPh0i<cWGs2;SCx`?Gi&{VJ{hl+j?}jw-;@
znP?F-QCZ8k?x$<l=r2^HG33Cd-U*PIqlDMGR4AS|)7x}_8s4SfsCbcBo{Qq-+(76#
z$;8LMekH1sir=Hz6GUQ#4aGN#6wvJQf}rj|;k|@}Zl1f9N0$O2a)k~)?p7hLqPQ#{
zBV73=*yLgMf%yS-eboLu-OIBg`<kK=dmTJ8;!$vt=lY5fYuB0u541i@@z@f~m|UWQ
zpdN<9dwA~h#t{<*Oy1-xMBtq*TDNNFCkjHkd<mH-%6bvL?TNuEl_$j%Y>*H#R!Ycp
zk*28(2Fl_gv6tnU+sktwm1CZYUe*&^_BHBk;|S@b%_#Pdg~49tpXKxX>1uj%E8U0q
zRlaIRGq=YJGF=AT%uA=<xW1i=tLQC=#RJu&Cv0}<Sv_1lcXU7WcN)N_FB0S7^W*-<
zX}pEThlvhTR0H4jOo0CvuBwmc*4K{Ow$}!XURQ`LS!JL_u?ZU&`4rUAfIvue^SFm4
zZk}`1qlZsJAbjs;*9|0Ymr&IEH2yhJy!J3mIUF}y)CdpHT|I*Ft2{wyxs{^n#}K(a
iA$TmGhwTf-QyW_9Cq7O6&2Y0h7^d}Wy@DM=qW=KW9K%`w

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 fe18faa66a..95d7279349 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,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:38:58 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew
index 91a7e269e1..27309d9231 100755
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew.bat b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew.bat
old mode 100755
new mode 100644
index 8a0b282aa6..832fdb6079
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew.bat
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.jar
index d3b83982b9b1bccad955349d702be9b884c6e049..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 2176
zcmZWp3rtg27(TtXg$ixK@+#g!E0`*xQ<y{$U*Lld)G(vgIUH=DC=eZx_#m6eoO6?j
z;z_m{b+UjA#Gwcg5;uyJ7NrG5hlwJaI5#j72gJyHvj6^<bi3N*=KTH6_kHJooO@eK
zSVsw~OiW;<ZiL9?M7nIGSZPqgVvLT8d>Ts#F%>Uf>oed#k~5qmA^$N)myQ%yOlJAT
zF%6f|+5AGMOZxb=R>kBp2z)N>M_`+*41ro7xt9wfp{iQ~;ySTcib%iD5dq25gt#J7
zu3P7Y!C1ILhJh;5*ByhYOGe!=n7pc2FqEuy73A)wwQ_!orY0vTA1xg*+V?xkcS1FX
zs3TdQZ~sNrtoL5rchVHLwISuH|N1*gNsncZ{*0XxaysPK{`!624=1PsHuae*D?QG>
zpQ!%2?rvGvs-D96UNzktY$w_0Wn|9t6*;!3AoUNDhXG+x9opd&O@-G_g>HM<yZlPS
z<0%Wb{(btVxq~4U6RN#lJjh-X|J=juY@U=rN;E5F1`BKL@suwaKA?uw2MDOs#uyc!
z^v`Ekh8Hu0?32;r>Y24G(rb`-A%jYg_)VrxjzL4Nj>X{ij%Xp!<lT@V@+kkAKz>-z
z?TU!yt1bcgwy+BQYL^vNsBvqkWLQA%m);eE*7A!|+}c~k3eI0t4+&elYc>i#w=Tp8
zoPhdk0y5OFM&QI<qNt+1jfpJWDmvRdM|`_zwmAYPRcYq@PQrw?=cLa{Opq|%tZ*gy
zDfXDTd6&oc(sMpc%i8oh#R$6uT7^Ha@s$uy@-k+S&Tb0QfsJv?XK9;DVXqsWU?+!=
zx&j@|ZVK1)9P4lUZ+e5#$5KL;ia0Do!<u~PER&qxZHhp0|KR%EGeGKrCrCuzEk$zt
zWe$nb%DmnraD5kCXNriaG9;dBaiJxb^+?v<+t_235%LTg@V1ETCP#9VTu(JE3arVY
z{9rkMN1nR8?yRSao9AO|^P4&5g(pfwCkD`tW(C5%0N?RJ*u$bhXu5@Cwrc?LrKdD%
zy4@l$_W*ochs^U9e`GoUdK`|>D~kd1Hr}kCaszS>)(|pHls6kmW16)zrDYOoKW*U{
z?Gn_UYYE0OZgouDRRSf{sb24-FCA_PLr#W1<4B!^kaa8}ks|*mG{zc-)`eD%Attn*
zWl~YQRVd)Lm6NQePpsj3{=IU348R0(b^huK>XT_#@+7LYDfmlIvu&ItjUKWE;=gJe
z$Iuiy?C_`eZ3cvttsE1WN++iU)0M4WXudjjLO=x!WE85I@3iJGnOhnV7t+R7!Mq)`
zigeWK_qxy(>Av)wU4b40!OD?1s5Ak5!bBebYz2XqhGzIt|2BcV$ZyM7t1BS~;My+`
zk&80X{Ys{m=8u!LnZ7mc;MxP(%@vW)=Q>jv%Jp=na{r_5seK^W1}7{M39j!zfnsMM
z@2=w;8<cl-!%?`o$CQK^L}X7obTtBNJCT*t`6JX;{>Bvl${)|bk2l2r7PWEA9|iPq
zRS<1&Q{x$hF%emxfZiSS^F(J{qOaQCL0P<=V-6Rh+d+F6LX7||C;}*mzO<_`lVp#D
z*Gr+a5GYOjo(+_scC{lAiE&+<2af{r1e7Kw-YFeV*@bG$6runBZt?xtWw^H{1z!0{
z?u0~(ay8Q-M?5CBpq*oORY8ewIVXCt>3r^YaNZdhl6azfs-5RGR{J`qI#p^^_(M<9
z`D#SxWY>T|OJ~?QJnX#=j_JC99`3c=8~IWaeT?tz3-E~&`S{S^JB(;Cy^~`G8qgx6
mGXSB304=(NP+O+~r{pnaF?oZ78Xld<shfIS3wJS?dGKFWP5xs5

delta 2138
zcmZ9M4Nz276vywr-DMZuT^14c<FV}Gl&}hcAVvZSS`#5DV}h0_DA*2yTHv5EmQq>~
z6N;x&M;f<KbEGIfMDv5?YXM=|Mavj9#gAr^atu?)GSlum7qRD?*}Zpu_kaH9-gD1;
zF1xhLE>)+^mdeHuqEwRj6nCY1qM8oLx@i4ZiG+~!%EWZP;li7R67pC#h3XClONGH5
zio@TL!T@2C%fi^8<%&22@5_Eg@TPn(f(D(^&kISo<}4%Lz87RjhWxiNvO#ZEAUR;p
z@WY8DS|!JcHa1`^POP);j?vIm$!FcZ>+D{HG-{wyW(2iU(~vReAj=_5S1?EQf^?-2
z2FtTD)m9pn8Zs<fLyuPm?kvm3?mA7IMN9fmIF>ED5jxYb@aN3T+lq?ceP2$=EBWz{
zft`PK?x?7DdFH(scP8AJsL+J3TT?xwb)e;&pH8nX`sIZkVVi@iNgS80$qtFG^lN(e
zT32G(2VZXeblTg8f}+DGwJ$0TUwLAC%2Zq9!z1RHlMiZq9v9P^B5}i8*<n(;uLgVe
zhnz5h$vHy^bh!@^G#G3{Y$9I)5?tDyZ&u>uM3GsFlfmLRHZhg_AV+d*<2@!GE<K|_
z(p`3nk*e|<W|&fOU>q*pvEO85sQMC{xb`>6aA`}8lsT8z4zs0q>J~Gfi}guNGvRPQ
zBX^F>XPVSwfKhOzIZaBt3St~n#oYzPju^a{S_iM&O)q41p)De9wuBomWi2UO+9d}s
zaln0t5tW7(Uh*6Grt2WJ1$zNrZ{azU1ionVhct;6s#;Vitf5%KjbLv`;6g#u%9c#6
zJhxVcOLJR!RIj9HsT|Rs)`=FOwF0j!KJSzha*u8$n(pn<(^#rhqA*Tr0b?7pw6^hF
zkOuLR4h1aK_)UJ|9Lc#QuEFgxLK3_QiF{;6$HvloU~ij&IrpuPJet8#Nb{OSnsfeW
zt`1OvrJd!BXy>_=dc=0UA1GZa^oYIKbb<FH<hqp*i^yY_8O1KMnl_-g$fu~+pHaB{
zbhHsn9V|sy2Q6YO;w2ryXusLGx2B$!WTu{wNg{jWEEMi(^@5`vCM@eY8b5vxVwICs
zdXkgpZqG+#*Q+7V`4lR*QT!kSahgO4J<f562c5hm1O9PFnMLm{%}djdK8>Y^Ahk0j
zQ_u)dsG#upuz~(-$-hZi*{s2Ag-de_mPh0i<cWGs2;SCx`?Gi&{VJ{hl+j?}jw-;@
znP?F-QCZ8k?x$<l=r2^HG33Cd-U*PIqlDMGR4AS|)7x}_8s4SfsCbcBo{Qq-+(76#
z$;8LMekH1sir=Hz6GUQ#4aGN#6wvJQf}rj|;k|@}Zl1f9N0$O2a)k~)?p7hLqPQ#{
zBV73=*yLgMf%yS-eboLu-OIBg`<kK=dmTJ8;!$vt=lY5fYuB0u541i@@z@f~m|UWQ
zpdN<9dwA~h#t{<*Oy1-xMBtq*TDNNFCkjHkd<mH-%6bvL?TNuEl_$j%Y>*H#R!Ycp
zk*28(2Fl_gv6tnU+sktwm1CZYUe*&^_BHBk;|S@b%_#Pdg~49tpXKxX>1uj%E8U0q
zRlaIRGq=YJGF=AT%uA=<xW1i=tLQC=#RJu&Cv0}<Sv_1lcXU7WcN)N_FB0S7^W*-<
zX}pEThlvhTR0H4jOo0CvuBwmc*4K{Ow$}!XURQ`LS!JL_u?ZU&`4rUAfIvue^SFm4
zZk}`1qlZsJAbjs;*9|0Ymr&IEH2yhJy!J3mIUF}y)CdpHT|I*Ft2{wyxs{^n#}K(a
iA$TmGhwTf-QyW_9Cq7O6&2Y0h7^d}Wy@DM=qW=KW9K%`w

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..95d7279349 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:38:58 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew
index 91a7e269e1..27309d9231 100755
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew.bat b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew.bat
index 8a0b282aa6..832fdb6079 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew.bat
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.jar
index d3b83982b9b1bccad955349d702be9b884c6e049..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 2176
zcmZWp3rtg27(TtXg$ixK@+#g!E0`*xQ<y{$U*Lld)G(vgIUH=DC=eZx_#m6eoO6?j
z;z_m{b+UjA#Gwcg5;uyJ7NrG5hlwJaI5#j72gJyHvj6^<bi3N*=KTH6_kHJooO@eK
zSVsw~OiW;<ZiL9?M7nIGSZPqgVvLT8d>Ts#F%>Uf>oed#k~5qmA^$N)myQ%yOlJAT
zF%6f|+5AGMOZxb=R>kBp2z)N>M_`+*41ro7xt9wfp{iQ~;ySTcib%iD5dq25gt#J7
zu3P7Y!C1ILhJh;5*ByhYOGe!=n7pc2FqEuy73A)wwQ_!orY0vTA1xg*+V?xkcS1FX
zs3TdQZ~sNrtoL5rchVHLwISuH|N1*gNsncZ{*0XxaysPK{`!624=1PsHuae*D?QG>
zpQ!%2?rvGvs-D96UNzktY$w_0Wn|9t6*;!3AoUNDhXG+x9opd&O@-G_g>HM<yZlPS
z<0%Wb{(btVxq~4U6RN#lJjh-X|J=juY@U=rN;E5F1`BKL@suwaKA?uw2MDOs#uyc!
z^v`Ekh8Hu0?32;r>Y24G(rb`-A%jYg_)VrxjzL4Nj>X{ij%Xp!<lT@V@+kkAKz>-z
z?TU!yt1bcgwy+BQYL^vNsBvqkWLQA%m);eE*7A!|+}c~k3eI0t4+&elYc>i#w=Tp8
zoPhdk0y5OFM&QI<qNt+1jfpJWDmvRdM|`_zwmAYPRcYq@PQrw?=cLa{Opq|%tZ*gy
zDfXDTd6&oc(sMpc%i8oh#R$6uT7^Ha@s$uy@-k+S&Tb0QfsJv?XK9;DVXqsWU?+!=
zx&j@|ZVK1)9P4lUZ+e5#$5KL;ia0Do!<u~PER&qxZHhp0|KR%EGeGKrCrCuzEk$zt
zWe$nb%DmnraD5kCXNriaG9;dBaiJxb^+?v<+t_235%LTg@V1ETCP#9VTu(JE3arVY
z{9rkMN1nR8?yRSao9AO|^P4&5g(pfwCkD`tW(C5%0N?RJ*u$bhXu5@Cwrc?LrKdD%
zy4@l$_W*ochs^U9e`GoUdK`|>D~kd1Hr}kCaszS>)(|pHls6kmW16)zrDYOoKW*U{
z?Gn_UYYE0OZgouDRRSf{sb24-FCA_PLr#W1<4B!^kaa8}ks|*mG{zc-)`eD%Attn*
zWl~YQRVd)Lm6NQePpsj3{=IU348R0(b^huK>XT_#@+7LYDfmlIvu&ItjUKWE;=gJe
z$Iuiy?C_`eZ3cvttsE1WN++iU)0M4WXudjjLO=x!WE85I@3iJGnOhnV7t+R7!Mq)`
zigeWK_qxy(>Av)wU4b40!OD?1s5Ak5!bBebYz2XqhGzIt|2BcV$ZyM7t1BS~;My+`
zk&80X{Ys{m=8u!LnZ7mc;MxP(%@vW)=Q>jv%Jp=na{r_5seK^W1}7{M39j!zfnsMM
z@2=w;8<cl-!%?`o$CQK^L}X7obTtBNJCT*t`6JX;{>Bvl${)|bk2l2r7PWEA9|iPq
zRS<1&Q{x$hF%emxfZiSS^F(J{qOaQCL0P<=V-6Rh+d+F6LX7||C;}*mzO<_`lVp#D
z*Gr+a5GYOjo(+_scC{lAiE&+<2af{r1e7Kw-YFeV*@bG$6runBZt?xtWw^H{1z!0{
z?u0~(ay8Q-M?5CBpq*oORY8ewIVXCt>3r^YaNZdhl6azfs-5RGR{J`qI#p^^_(M<9
z`D#SxWY>T|OJ~?QJnX#=j_JC99`3c=8~IWaeT?tz3-E~&`S{S^JB(;Cy^~`G8qgx6
mGXSB304=(NP+O+~r{pnaF?oZ78Xld<shfIS3wJS?dGKFWP5xs5

delta 2138
zcmZ9M4Nz276vywr-DMZuT^14c<FV}Gl&}hcAVvZSS`#5DV}h0_DA*2yTHv5EmQq>~
z6N;x&M;f<KbEGIfMDv5?YXM=|Mavj9#gAr^atu?)GSlum7qRD?*}Zpu_kaH9-gD1;
zF1xhLE>)+^mdeHuqEwRj6nCY1qM8oLx@i4ZiG+~!%EWZP;li7R67pC#h3XClONGH5
zio@TL!T@2C%fi^8<%&22@5_Eg@TPn(f(D(^&kISo<}4%Lz87RjhWxiNvO#ZEAUR;p
z@WY8DS|!JcHa1`^POP);j?vIm$!FcZ>+D{HG-{wyW(2iU(~vReAj=_5S1?EQf^?-2
z2FtTD)m9pn8Zs<fLyuPm?kvm3?mA7IMN9fmIF>ED5jxYb@aN3T+lq?ceP2$=EBWz{
zft`PK?x?7DdFH(scP8AJsL+J3TT?xwb)e;&pH8nX`sIZkVVi@iNgS80$qtFG^lN(e
zT32G(2VZXeblTg8f}+DGwJ$0TUwLAC%2Zq9!z1RHlMiZq9v9P^B5}i8*<n(;uLgVe
zhnz5h$vHy^bh!@^G#G3{Y$9I)5?tDyZ&u>uM3GsFlfmLRHZhg_AV+d*<2@!GE<K|_
z(p`3nk*e|<W|&fOU>q*pvEO85sQMC{xb`>6aA`}8lsT8z4zs0q>J~Gfi}guNGvRPQ
zBX^F>XPVSwfKhOzIZaBt3St~n#oYzPju^a{S_iM&O)q41p)De9wuBomWi2UO+9d}s
zaln0t5tW7(Uh*6Grt2WJ1$zNrZ{azU1ionVhct;6s#;Vitf5%KjbLv`;6g#u%9c#6
zJhxVcOLJR!RIj9HsT|Rs)`=FOwF0j!KJSzha*u8$n(pn<(^#rhqA*Tr0b?7pw6^hF
zkOuLR4h1aK_)UJ|9Lc#QuEFgxLK3_QiF{;6$HvloU~ij&IrpuPJet8#Nb{OSnsfeW
zt`1OvrJd!BXy>_=dc=0UA1GZa^oYIKbb<FH<hqp*i^yY_8O1KMnl_-g$fu~+pHaB{
zbhHsn9V|sy2Q6YO;w2ryXusLGx2B$!WTu{wNg{jWEEMi(^@5`vCM@eY8b5vxVwICs
zdXkgpZqG+#*Q+7V`4lR*QT!kSahgO4J<f562c5hm1O9PFnMLm{%}djdK8>Y^Ahk0j
zQ_u)dsG#upuz~(-$-hZi*{s2Ag-de_mPh0i<cWGs2;SCx`?Gi&{VJ{hl+j?}jw-;@
znP?F-QCZ8k?x$<l=r2^HG33Cd-U*PIqlDMGR4AS|)7x}_8s4SfsCbcBo{Qq-+(76#
z$;8LMekH1sir=Hz6GUQ#4aGN#6wvJQf}rj|;k|@}Zl1f9N0$O2a)k~)?p7hLqPQ#{
zBV73=*yLgMf%yS-eboLu-OIBg`<kK=dmTJ8;!$vt=lY5fYuB0u541i@@z@f~m|UWQ
zpdN<9dwA~h#t{<*Oy1-xMBtq*TDNNFCkjHkd<mH-%6bvL?TNuEl_$j%Y>*H#R!Ycp
zk*28(2Fl_gv6tnU+sktwm1CZYUe*&^_BHBk;|S@b%_#Pdg~49tpXKxX>1uj%E8U0q
zRlaIRGq=YJGF=AT%uA=<xW1i=tLQC=#RJu&Cv0}<Sv_1lcXU7WcN)N_FB0S7^W*-<
zX}pEThlvhTR0H4jOo0CvuBwmc*4K{Ow$}!XURQ`LS!JL_u?ZU&`4rUAfIvue^SFm4
zZk}`1qlZsJAbjs;*9|0Ymr&IEH2yhJy!J3mIUF}y)CdpHT|I*Ft2{wyxs{^n#}K(a
iA$TmGhwTf-QyW_9Cq7O6&2Y0h7^d}Wy@DM=qW=KW9K%`w

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..95d7279349 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:38:58 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew
index 91a7e269e1..27309d9231 100755
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew.bat b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew.bat
index 8a0b282aa6..832fdb6079 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew.bat
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
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 d3b83982b9b1bccad955349d702be9b884c6e049..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 2176
zcmZWp3rtg27(TtXg$ixK@+#g!E0`*xQ<y{$U*Lld)G(vgIUH=DC=eZx_#m6eoO6?j
z;z_m{b+UjA#Gwcg5;uyJ7NrG5hlwJaI5#j72gJyHvj6^<bi3N*=KTH6_kHJooO@eK
zSVsw~OiW;<ZiL9?M7nIGSZPqgVvLT8d>Ts#F%>Uf>oed#k~5qmA^$N)myQ%yOlJAT
zF%6f|+5AGMOZxb=R>kBp2z)N>M_`+*41ro7xt9wfp{iQ~;ySTcib%iD5dq25gt#J7
zu3P7Y!C1ILhJh;5*ByhYOGe!=n7pc2FqEuy73A)wwQ_!orY0vTA1xg*+V?xkcS1FX
zs3TdQZ~sNrtoL5rchVHLwISuH|N1*gNsncZ{*0XxaysPK{`!624=1PsHuae*D?QG>
zpQ!%2?rvGvs-D96UNzktY$w_0Wn|9t6*;!3AoUNDhXG+x9opd&O@-G_g>HM<yZlPS
z<0%Wb{(btVxq~4U6RN#lJjh-X|J=juY@U=rN;E5F1`BKL@suwaKA?uw2MDOs#uyc!
z^v`Ekh8Hu0?32;r>Y24G(rb`-A%jYg_)VrxjzL4Nj>X{ij%Xp!<lT@V@+kkAKz>-z
z?TU!yt1bcgwy+BQYL^vNsBvqkWLQA%m);eE*7A!|+}c~k3eI0t4+&elYc>i#w=Tp8
zoPhdk0y5OFM&QI<qNt+1jfpJWDmvRdM|`_zwmAYPRcYq@PQrw?=cLa{Opq|%tZ*gy
zDfXDTd6&oc(sMpc%i8oh#R$6uT7^Ha@s$uy@-k+S&Tb0QfsJv?XK9;DVXqsWU?+!=
zx&j@|ZVK1)9P4lUZ+e5#$5KL;ia0Do!<u~PER&qxZHhp0|KR%EGeGKrCrCuzEk$zt
zWe$nb%DmnraD5kCXNriaG9;dBaiJxb^+?v<+t_235%LTg@V1ETCP#9VTu(JE3arVY
z{9rkMN1nR8?yRSao9AO|^P4&5g(pfwCkD`tW(C5%0N?RJ*u$bhXu5@Cwrc?LrKdD%
zy4@l$_W*ochs^U9e`GoUdK`|>D~kd1Hr}kCaszS>)(|pHls6kmW16)zrDYOoKW*U{
z?Gn_UYYE0OZgouDRRSf{sb24-FCA_PLr#W1<4B!^kaa8}ks|*mG{zc-)`eD%Attn*
zWl~YQRVd)Lm6NQePpsj3{=IU348R0(b^huK>XT_#@+7LYDfmlIvu&ItjUKWE;=gJe
z$Iuiy?C_`eZ3cvttsE1WN++iU)0M4WXudjjLO=x!WE85I@3iJGnOhnV7t+R7!Mq)`
zigeWK_qxy(>Av)wU4b40!OD?1s5Ak5!bBebYz2XqhGzIt|2BcV$ZyM7t1BS~;My+`
zk&80X{Ys{m=8u!LnZ7mc;MxP(%@vW)=Q>jv%Jp=na{r_5seK^W1}7{M39j!zfnsMM
z@2=w;8<cl-!%?`o$CQK^L}X7obTtBNJCT*t`6JX;{>Bvl${)|bk2l2r7PWEA9|iPq
zRS<1&Q{x$hF%emxfZiSS^F(J{qOaQCL0P<=V-6Rh+d+F6LX7||C;}*mzO<_`lVp#D
z*Gr+a5GYOjo(+_scC{lAiE&+<2af{r1e7Kw-YFeV*@bG$6runBZt?xtWw^H{1z!0{
z?u0~(ay8Q-M?5CBpq*oORY8ewIVXCt>3r^YaNZdhl6azfs-5RGR{J`qI#p^^_(M<9
z`D#SxWY>T|OJ~?QJnX#=j_JC99`3c=8~IWaeT?tz3-E~&`S{S^JB(;Cy^~`G8qgx6
mGXSB304=(NP+O+~r{pnaF?oZ78Xld<shfIS3wJS?dGKFWP5xs5

delta 2138
zcmZ9M4Nz276vywr-DMZuT^14c<FV}Gl&}hcAVvZSS`#5DV}h0_DA*2yTHv5EmQq>~
z6N;x&M;f<KbEGIfMDv5?YXM=|Mavj9#gAr^atu?)GSlum7qRD?*}Zpu_kaH9-gD1;
zF1xhLE>)+^mdeHuqEwRj6nCY1qM8oLx@i4ZiG+~!%EWZP;li7R67pC#h3XClONGH5
zio@TL!T@2C%fi^8<%&22@5_Eg@TPn(f(D(^&kISo<}4%Lz87RjhWxiNvO#ZEAUR;p
z@WY8DS|!JcHa1`^POP);j?vIm$!FcZ>+D{HG-{wyW(2iU(~vReAj=_5S1?EQf^?-2
z2FtTD)m9pn8Zs<fLyuPm?kvm3?mA7IMN9fmIF>ED5jxYb@aN3T+lq?ceP2$=EBWz{
zft`PK?x?7DdFH(scP8AJsL+J3TT?xwb)e;&pH8nX`sIZkVVi@iNgS80$qtFG^lN(e
zT32G(2VZXeblTg8f}+DGwJ$0TUwLAC%2Zq9!z1RHlMiZq9v9P^B5}i8*<n(;uLgVe
zhnz5h$vHy^bh!@^G#G3{Y$9I)5?tDyZ&u>uM3GsFlfmLRHZhg_AV+d*<2@!GE<K|_
z(p`3nk*e|<W|&fOU>q*pvEO85sQMC{xb`>6aA`}8lsT8z4zs0q>J~Gfi}guNGvRPQ
zBX^F>XPVSwfKhOzIZaBt3St~n#oYzPju^a{S_iM&O)q41p)De9wuBomWi2UO+9d}s
zaln0t5tW7(Uh*6Grt2WJ1$zNrZ{azU1ionVhct;6s#;Vitf5%KjbLv`;6g#u%9c#6
zJhxVcOLJR!RIj9HsT|Rs)`=FOwF0j!KJSzha*u8$n(pn<(^#rhqA*Tr0b?7pw6^hF
zkOuLR4h1aK_)UJ|9Lc#QuEFgxLK3_QiF{;6$HvloU~ij&IrpuPJet8#Nb{OSnsfeW
zt`1OvrJd!BXy>_=dc=0UA1GZa^oYIKbb<FH<hqp*i^yY_8O1KMnl_-g$fu~+pHaB{
zbhHsn9V|sy2Q6YO;w2ryXusLGx2B$!WTu{wNg{jWEEMi(^@5`vCM@eY8b5vxVwICs
zdXkgpZqG+#*Q+7V`4lR*QT!kSahgO4J<f562c5hm1O9PFnMLm{%}djdK8>Y^Ahk0j
zQ_u)dsG#upuz~(-$-hZi*{s2Ag-de_mPh0i<cWGs2;SCx`?Gi&{VJ{hl+j?}jw-;@
znP?F-QCZ8k?x$<l=r2^HG33Cd-U*PIqlDMGR4AS|)7x}_8s4SfsCbcBo{Qq-+(76#
z$;8LMekH1sir=Hz6GUQ#4aGN#6wvJQf}rj|;k|@}Zl1f9N0$O2a)k~)?p7hLqPQ#{
zBV73=*yLgMf%yS-eboLu-OIBg`<kK=dmTJ8;!$vt=lY5fYuB0u541i@@z@f~m|UWQ
zpdN<9dwA~h#t{<*Oy1-xMBtq*TDNNFCkjHkd<mH-%6bvL?TNuEl_$j%Y>*H#R!Ycp
zk*28(2Fl_gv6tnU+sktwm1CZYUe*&^_BHBk;|S@b%_#Pdg~49tpXKxX>1uj%E8U0q
zRlaIRGq=YJGF=AT%uA=<xW1i=tLQC=#RJu&Cv0}<Sv_1lcXU7WcN)N_FB0S7^W*-<
zX}pEThlvhTR0H4jOo0CvuBwmc*4K{Ow$}!XURQ`LS!JL_u?ZU&`4rUAfIvue^SFm4
zZk}`1qlZsJAbjs;*9|0Ymr&IEH2yhJy!J3mIUF}y)CdpHT|I*Ft2{wyxs{^n#}K(a
iA$TmGhwTf-QyW_9Cq7O6&2Y0h7^d}Wy@DM=qW=KW9K%`w

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 fe18faa66a..95d7279349 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,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:38:58 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew
index 91a7e269e1..27309d9231 100755
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew.bat b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew.bat
index 8a0b282aa6..832fdb6079 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew.bat
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScanner.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScanner.groovy
index 10921806d5..c2eb6ada61 100755
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScanner.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScanner.groovy
@@ -154,6 +154,7 @@ class ContractFileScanner {
 			if (matcher.matches(file.toPath())) {
 				return true
 			}
+			log.debug("Path [{}] doesn't match the pattern [{}]", file.toPath(), matcher)
 		}
 		return false
 	}