From 012eac8f3c80213bbb0c7c91afa7519ccbe72ae8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 22 Aug 2016 11:33:17 +0200
Subject: [PATCH] Fixing the build (#63)

we are installing artifacts twice. With Maven and Gradle then. We need to change that.

fixes #62
---
 pom.xml                                       |   7 --
 samples/pom.xml                               |  69 ++++++++++--------
 .../standalone/dsl/http-client/build.gradle   |   1 +
 .../dsl/http-client/gradle.properties         |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../dsl/http-client/settings.gradle           |   2 +-
 .../test/resources/application-gradle.yaml    |   3 +
 .../standalone/dsl/http-server/build.gradle   |   3 +-
 .../dsl/http-server/gradle.properties         |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 samples/standalone/dsl/http-server/pom.xml    |   6 --
 .../dsl/http-server/settings.gradle           |   2 +-
 .../messaging/stream-sink/build.gradle        |   1 +
 .../messaging/stream-sink/gradle.properties   |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../messaging/stream-sink/settings.gradle     |   2 +-
 .../src/test/resources/application-gradle.yml |   3 +
 .../messaging/stream-source/build.gradle      |   3 +-
 .../messaging/stream-source/gradle.properties |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../messaging/stream-source/pom.xml           |   6 --
 .../messaging/stream-source/settings.gradle   |   2 +-
 .../restdocs/http-client/build.gradle         |   1 +
 .../restdocs/http-client/gradle.properties    |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../restdocs/http-client/settings.gradle      |   2 +-
 .../restdocs/http-server/build.gradle         |   3 +-
 .../restdocs/http-server/gradle.properties    |   1 +
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53319 -> 53324 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 .../standalone/restdocs/http-server/pom.xml   |  15 ++++
 .../restdocs/http-server/settings.gradle      |   2 +-
 scripts/generateDocs.sh                       |   2 +-
 38 files changed, 95 insertions(+), 70 deletions(-)
 create mode 100644 samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml
 create mode 100644 samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml

diff --git a/pom.xml b/pom.xml
index bf1fdc9b9e..51049478d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,12 +200,6 @@
 						<fileset>
 							<directory>target</directory>
 						</fileset>
-						<fileset>
-							<directory>${env.HOME}/.m2/repository/com/example/</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-						</fileset>
 						<fileset>
 							<directory>${env.HOME}/.m2/repository/org/springframework/cloud/contract/verifier/stubs/</directory>
 							<includes>
@@ -218,7 +212,6 @@
 		</plugins>
 	</build>
 
-
 	<profiles>
 		<profile>
 			<id>spring</id>
diff --git a/samples/pom.xml b/samples/pom.xml
index 13a997514b..a0b575190b 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -37,36 +37,47 @@
 		        <skip>true</skip>
 		      </configuration>
 	        </plugin>
-			<plugin>
-				<!-- Invoke integration tests in the install phase, after the maven-plugin
-					 is available -->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-invoker-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<settingsFile>src/it/settings.xml</settingsFile>
-					<projectsDirectory>standalone</projectsDirectory>
-					<skipInvocation>${skipTests}</skipInvocation>
-					<streamLogs>true</streamLogs>
-					<profiles>
-						<profile>integration</profile>
-					</profiles>
-					<pomIncludes>
-						<pomInclude>*/pom.xml</pomInclude>
-					</pomIncludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>integration</id>
-						<phase>install</phase>
-						<goals>
-							<goal>install</goal>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>integration</id>
+			<build>
+				<plugins>
+					<plugin>
+						<!-- Invoke integration tests in the install phase, after the maven-plugin
+							 is available -->
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-invoker-plugin</artifactId>
+						<configuration>
+							<settingsFile>src/it/settings.xml</settingsFile>
+							<projectsDirectory>standalone</projectsDirectory>
+							<skipInvocation>${skipTests}</skipInvocation>
+							<streamLogs>true</streamLogs>
+							<profiles>
+								<profile>integration</profile>
+							</profiles>
+							<pomIncludes>
+								<pomInclude>*/pom.xml</pomInclude>
+							</pomIncludes>
+							<goals>
+								<goal>clean</goal>
+								<goal>install</goal>
+							</goals>
+						</configuration>
+						<executions>
+							<execution>
+								<id>integration</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle
index 47600cdecf..383f8e79bb 100644
--- a/samples/standalone/dsl/http-client/build.gradle
+++ b/samples/standalone/dsl/http-client/build.gradle
@@ -42,6 +42,7 @@ dependencies {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/dsl/http-client/gradle.properties
+++ b/samples/standalone/dsl/http-client/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/dsl/http-client/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/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..ff3de523bd 100644
--- a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:39:05 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/samples/standalone/dsl/http-client/settings.gradle b/samples/standalone/dsl/http-client/settings.gradle
index 882c555fec..35a147b560 100644
--- a/samples/standalone/dsl/http-client/settings.gradle
+++ b/samples/standalone/dsl/http-client/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-client-dsl'
+rootProject.name = 'http-client-dsl-gradle'
diff --git a/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml b/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml
new file mode 100644
index 0000000000..a029079b57
--- /dev/null
+++ b/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml
@@ -0,0 +1,3 @@
+stubrunner:
+  work-offline: true
+  stubs.ids: 'com.example:http-server-dsl-gradle:+:stubs:8080'
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle
index 4cfcbf5de7..8d6a2ce3de 100644
--- a/samples/standalone/dsl/http-server/build.gradle
+++ b/samples/standalone/dsl/http-server/build.gradle
@@ -49,6 +49,7 @@ dependencies {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
@@ -59,7 +60,7 @@ task wrapper(type: Wrapper) {
 }
 
 clean.doFirst {
-	delete "~/.m2/repository/com/example/"
+	delete "~/.m2/repository/com/example/http-server-dsl-gradle"
 }
 
 task resolveDependencies {
diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/dsl/http-server/gradle.properties
+++ b/samples/standalone/dsl/http-server/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/dsl/http-server/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/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..95d7279349 100644
--- a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/dsl/http-server/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/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml
index 8c8adf7951..9565266463 100644
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -97,12 +97,6 @@
 						<fileset>
 							<directory>target</directory>
 						</fileset>
-						<fileset>
-							<directory>${env.HOME}/.m2/repository/com/example/</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
diff --git a/samples/standalone/dsl/http-server/settings.gradle b/samples/standalone/dsl/http-server/settings.gradle
index 74f9e986d4..90a672de8a 100644
--- a/samples/standalone/dsl/http-server/settings.gradle
+++ b/samples/standalone/dsl/http-server/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-server-dsl'
+rootProject.name = 'http-server-dsl-gradle'
diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle
index bce74b0836..33d066554d 100644
--- a/samples/standalone/messaging/stream-sink/build.gradle
+++ b/samples/standalone/messaging/stream-sink/build.gradle
@@ -43,6 +43,7 @@ dependencies {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/messaging/stream-sink/gradle.properties
+++ b/samples/standalone/messaging/stream-sink/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/messaging/stream-sink/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/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..d7cdc356ad 100644
--- a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:39:28 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/samples/standalone/messaging/stream-sink/settings.gradle b/samples/standalone/messaging/stream-sink/settings.gradle
index eed1c62d9a..6cac6f4dc1 100644
--- a/samples/standalone/messaging/stream-sink/settings.gradle
+++ b/samples/standalone/messaging/stream-sink/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'stream-sink'
+rootProject.name = 'stream-sink-gradle'
diff --git a/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml b/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml
new file mode 100644
index 0000000000..e6dd107c89
--- /dev/null
+++ b/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml
@@ -0,0 +1,3 @@
+stubrunner:
+  work-offline: true
+  stubs.ids: 'com.example:stream-source-gradle'
\ No newline at end of file
diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle
index 779854fe75..413afaa979 100644
--- a/samples/standalone/messaging/stream-source/build.gradle
+++ b/samples/standalone/messaging/stream-source/build.gradle
@@ -73,6 +73,7 @@ publishing {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
@@ -83,7 +84,7 @@ task wrapper(type: Wrapper) {
 }
 
 clean.doFirst {
-	delete "~/.m2/repository/com/example/"
+	delete "~/.m2/repository/com/example/stream-source-gradle"
 }
 
 task resolveDependencies {
diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/messaging/stream-source/gradle.properties
+++ b/samples/standalone/messaging/stream-source/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/messaging/stream-source/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/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..fed2c38616 100644
--- a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:39:21 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/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml
index 39e600d3ec..0416e3cb19 100644
--- a/samples/standalone/messaging/stream-source/pom.xml
+++ b/samples/standalone/messaging/stream-source/pom.xml
@@ -93,12 +93,6 @@
 						<fileset>
 							<directory>target</directory>
 						</fileset>
-						<fileset>
-							<directory>${env.HOME}/.m2/repository/com/example/</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
diff --git a/samples/standalone/messaging/stream-source/settings.gradle b/samples/standalone/messaging/stream-source/settings.gradle
index f9a80faf09..a1970d8283 100644
--- a/samples/standalone/messaging/stream-source/settings.gradle
+++ b/samples/standalone/messaging/stream-source/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'stream-source'
+rootProject.name = 'stream-source-gradle'
diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle
index 23424e685a..e07b075353 100644
--- a/samples/standalone/restdocs/http-client/build.gradle
+++ b/samples/standalone/restdocs/http-client/build.gradle
@@ -43,6 +43,7 @@ dependencies {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/restdocs/http-client/gradle.properties
+++ b/samples/standalone/restdocs/http-client/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/restdocs/http-client/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/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..04160e9888 100644
--- a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:39:49 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/samples/standalone/restdocs/http-client/settings.gradle b/samples/standalone/restdocs/http-client/settings.gradle
index dce437c739..877b12b9ab 100644
--- a/samples/standalone/restdocs/http-client/settings.gradle
+++ b/samples/standalone/restdocs/http-client/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-client-restdocs'
+rootProject.name = 'http-client-restdocs-gradle'
diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle
index 376e8fd835..1aec68a960 100644
--- a/samples/standalone/restdocs/http-server/build.gradle
+++ b/samples/standalone/restdocs/http-server/build.gradle
@@ -49,6 +49,7 @@ dependencies {
 }
 
 test {
+	systemProperty 'spring.profiles.active', 'gradle'
 	testLogging {
 		exceptionFormat = 'full'
 	}
@@ -87,7 +88,7 @@ task copyClasses(type: Copy) {
 
 clean.doFirst {
 	delete 'target/snippets/stubs'
-	delete "~/.m2/repository/com/example/"
+	delete "~/.m2/repository/com/example/http-server-restdocs-gradle"
 }
 
 task resolveDependencies {
diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties
index fc29ae128a..3a4bf021b7 100644
--- a/samples/standalone/restdocs/http-server/gradle.properties
+++ b/samples/standalone/restdocs/http-server/gradle.properties
@@ -1,2 +1,3 @@
+org.gradle.daemon=false
 verifierVersion=1.0.0.BUILD-SNAPSHOT
 BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/restdocs/http-server/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/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties
index fe18faa66a..8b8a75c0ac 100644
--- a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 10:16:50 CEST 2016
+#Fri Aug 19 15:39:42 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/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml
index bff6997b6f..54d62a7429 100644
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -80,6 +80,21 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>build</directory>
+						</fileset>
+						<fileset>
+							<directory>target</directory>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
diff --git a/samples/standalone/restdocs/http-server/settings.gradle b/samples/standalone/restdocs/http-server/settings.gradle
index 06780ec1e9..a27eed8db1 100644
--- a/samples/standalone/restdocs/http-server/settings.gradle
+++ b/samples/standalone/restdocs/http-server/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'http-server-restdocs'
+rootProject.name = 'http-server-restdocs-gradle'
diff --git a/scripts/generateDocs.sh b/scripts/generateDocs.sh
index 07b3a38d85..c730dd17c3 100755
--- a/scripts/generateDocs.sh
+++ b/scripts/generateDocs.sh
@@ -4,7 +4,7 @@ source common.sh || source scripts/common.sh || echo "No common.sh script found.
 
 set -e
 
-echo "Generating docs for Spring Cloud Contract version [$VERIFIER_VERSION]"
+echo "Generating docs for Spring Cloud Contract"
 
 echo "Building main docs"
 ./mvnw clean install -P docs -DskipTests=true --pl docs