diff --git a/pom.xml b/pom.xml
index 963eb2ec3d..2beacf36f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 		<!-- We need to have compatibility with Gradle -->
 		<groovy.version>2.4.15</groovy.version>
 		<!-- For Takari plugin -->
-		<maven.version>3.2.1</maven.version>
+		<maven.version>3.3.9</maven.version>
 		<aether.version>1.1.0</aether.version>
 		<xpath2.processor.version>2.1.100</xpath2.processor.version>
 		<xerces.version>2.11.0</xerces.version>
diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index dc7c6f1b14..9e9aabc2fd 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -18,6 +18,7 @@
 		<wiremock.version>2.20.0</wiremock.version>
 		<jsonassert.version>0.4.13</jsonassert.version>
 		<rest-assured.version>3.2.0</rest-assured.version>
+		<maven.version>3.3.9</maven.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -138,7 +139,7 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-settings-builder</artifactId>
-				<version>3.2.1</version>
+				<version>${maven.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
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 7a6b845977..86f6112015 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
@@ -51,7 +51,8 @@ public class AutoConfigureWireMockApplicationTests {
 	@Test
 	public void portsAreFixed() {
 		boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
-		boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
+		boolean httpsPortDynamic = this.wireMockProperties.getServer()
+				.isHttpsPortDynamic();
 		assertThat(!httpPortDynamic || !httpsPortDynamic).isTrue();
 	}
 
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java
index ab2aa2ba06..add4a9a165 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java
@@ -46,7 +46,8 @@ public class AutoConfigureWireMockAutoStubsApplicationTests {
 	@Test
 	public void portsAreNotFixed() {
 		boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
-		boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
+		boolean httpsPortDynamic = this.wireMockProperties.getServer()
+				.isHttpsPortDynamic();
 		assertThat(!httpPortDynamic || !httpsPortDynamic).isFalse();
 	}
 
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java
index d1e09f18c9..b6d55b3c03 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java
@@ -51,7 +51,8 @@ public class AutoConfigureWireMockHttpsPortApplicationTests {
 	@Test
 	public void portsAreFixed() {
 		boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
-		boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
+		boolean httpsPortDynamic = this.wireMockProperties.getServer()
+				.isHttpsPortDynamic();
 		assertThat(!httpPortDynamic || !httpsPortDynamic).isTrue();
 	}
 
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java
index dd92b66413..0fa5308c73 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java
@@ -51,7 +51,8 @@ public class AutoConfigureWireMockRandomPortHttpsApplicationTests {
 	@Test
 	public void portsAreNotFixed() {
 		boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
-		boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
+		boolean httpsPortDynamic = this.wireMockProperties.getServer()
+				.isHttpsPortDynamic();
 		assertThat(httpPortDynamic).isTrue();
 		assertThat(httpsPortDynamic).isTrue();
 	}
diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
index 3c0458d21f..69979f2727 100644
--- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
+++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
@@ -90,10 +90,9 @@ class Service {
 	public String pom() {
 		String requestUrl = this.base + "/pom.xml";
 		log.info("Will send a request to [" + requestUrl + "]");
-		return this.restTemplate
-				.exchange(RequestEntity.get(URI.create(requestUrl))
-						.accept(mediaTypes()).build(), String.class)
-				.getBody();
+		return this.restTemplate.exchange(
+				RequestEntity.get(URI.create(requestUrl)).accept(mediaTypes()).build(),
+				String.class).getBody();
 	}
 
 	private MediaType[] mediaTypes() {
@@ -106,8 +105,7 @@ class Service {
 	public String go2() {
 		String requestUrl = this.base + "/test2";
 		log.info("Will send a request to [" + requestUrl + "]");
-		return this.restTemplate.getForEntity(requestUrl, String.class)
-				.getBody();
+		return this.restTemplate.getForEntity(requestUrl, String.class).getBody();
 	}
 
 	public void setBase(String base) {
diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
index 2b6a3ac37c..9e98f276d0 100644
--- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
@@ -20,6 +20,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>spring-cloud-contract-shade</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.github.dreamhead</groupId>
@@ -29,6 +35,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>spring-cloud-contract-shade</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>