diff --git a/.gitignore b/.gitignore
index e92ba1f3f9..439afc42b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,14 @@
 .classpath
 .project
 .settings/
+.sts4-cache/
 target/
 build/
 bin/
 .gradle/
 
 *.class
+.attach*
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -36,4 +38,4 @@ hs_err_pid*
 *.log
 interpolated-settings.xml
 interpolated-pom.xml
-dependency-reduced-pom.xml
\ No newline at end of file
+dependency-reduced-pom.xml
diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml
index ae1a5d5051..7a8f63d88c 100644
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -46,7 +46,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
+			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -64,10 +64,6 @@
 		</dependency>
 		<!-- end::stub_runner[] -->
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-activemq</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml
index c2a7b2e727..4fe064e1de 100644
--- a/samples/standalone/webclient/http-client/pom.xml
+++ b/samples/standalone/webclient/http-client/pom.xml
@@ -46,7 +46,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
+			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -64,10 +64,6 @@
 		</dependency>
 		<!-- end::stub_runner[] -->
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-activemq</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -93,7 +89,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<excludes>
 						<exclude>**/*GradleTests.java</exclude>