From 36efa18cafed5bcfa55e3696905a7f41f5beedb6 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 12 Nov 2020 18:21:29 +0100
Subject: [PATCH] Downgraded maven resolver to 1.4 to align with Maven 3.6

---
 pom.xml                                         |  4 ++--
 .../contract/stubrunner/MavenSettings.java      | 17 +----------------
 .../spring-cloud-contract-gradle-plugin/pom.xml |  3 +++
 .../src/main/fake/.gitkeep                      |  0
 4 files changed, 6 insertions(+), 18 deletions(-)
 create mode 100644 spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/fake/.gitkeep

diff --git a/pom.xml b/pom.xml
index f07c845ea8..ee7fc54d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,9 +55,9 @@
 		<!-- We need to have compatibility with Gradle -->
 		<groovy.version>2.5.12</groovy.version>
 		<!-- We need to have compatibility with Boot -->
-		<maven.version>3.6.0</maven.version>
+		<maven.version>3.6.3</maven.version>
 		<!-- Resolver has to be aligned with Maven (e.g resolver 1.4 and Maven 3.6 or resolver 1.3 and Maven 3.5) -->
-		<maven.resolver.version>1.6.1</maven.resolver.version>
+		<maven.resolver.version>1.4.1</maven.resolver.version>
 		<xpath2.processor.version>2.1.100</xpath2.processor.version>
 		<xerces.version>2.12.0</xerces.version>
 		<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
index 8590ce5915..6edadc72d1 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
@@ -17,7 +17,6 @@
 package org.springframework.cloud.contract.stubrunner;
 
 import java.io.File;
-import java.lang.reflect.Field;
 
 import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
 import org.sonatype.plexus.components.cipher.PlexusCipherException;
@@ -58,21 +57,7 @@ public class MavenSettings {
 	}
 
 	public SettingsDecrypter createSettingsDecrypter() {
-		SettingsDecrypter settingsDecrypter = new DefaultSettingsDecrypter();
-		setField(DefaultSettingsDecrypter.class, "securityDispatcher", settingsDecrypter,
-				new MavenSettings.SpringCloudContractSecDispatcher());
-		return settingsDecrypter;
-	}
-
-	private void setField(Class<?> sourceClass, String fieldName, Object target, Object value) {
-		try {
-			Field field = sourceClass.getDeclaredField(fieldName);
-			field.setAccessible(true);
-			field.set(target, value);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("Failed to set field '" + fieldName + "' on '" + target + "'", ex);
-		}
+		return new DefaultSettingsDecrypter(new SpringCloudContractSecDispatcher());
 	}
 
 	private class SpringCloudContractSecDispatcher extends DefaultSecDispatcher {
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
index 3754d86400..45267c18a4 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
@@ -25,6 +25,7 @@
 	</properties>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier</artifactId>
@@ -40,6 +41,8 @@
 	</dependencies>
 
 	<build>
+		<!-- We're building the project via Gradle and if we don't put in a fake source directory then Maven will try to actually compile the Gradle code -->
+		<sourceDirectory>src/main/fake</sourceDirectory>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/fake/.gitkeep b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/fake/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2