From ceca07cfd21c1fdbb8fd9bd0cc300afed88ecf49 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 2 Apr 2020 09:50:34 +0200
Subject: [PATCH] Fixing Gradle build

---
 .../spring-cloud-contract-gradle-plugin/build.gradle | 12 +-----------
 .../GradleContractsDownloaderHelperSpec.groovy       |  6 ++++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
index 56837aae7f..1b794027c2 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
@@ -29,7 +29,6 @@ ext {
 	JavaVersion javaVer = JavaVersion.current()
 	println "Current Java version equal to [${javaVer}]"
 	javaVersionNumber = javaVer.toString()
-	incompatibleJdk = javaVer.ordinal() > 8
 }
 
 project.version = findProperty('verifierVersion')
@@ -89,21 +88,12 @@ task libtest() {
 	}
 }
 
-task checkJdkVersion {
-	doLast {
-		if (incompatibleJdk) {
-			logger.warn("Java Version is equal to [${javaVersionNumber}]. The tests will be disabled (due to issues with compilation)")
-		}
-	}
-}
-
 test {
 	testLogging {
 		exceptionFormat = 'full'
 	}
 	systemProperties = testSystemProperties
-	dependsOn(checkJdkVersion)
-	enabled = !project.hasProperty('fast') && !incompatibleJdk
+	enabled = !project.hasProperty('fast')
 }
 
 groovydoc {
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderHelperSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderHelperSpec.groovy
index 79f4aba806..4c2212467d 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderHelperSpec.groovy
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderHelperSpec.groovy
@@ -17,8 +17,10 @@
 package org.springframework.cloud.contract.verifier.plugin
 
 import org.gradle.api.internal.provider.DefaultProperty
+import org.gradle.api.internal.provider.PropertyHost
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
+import org.gradle.internal.service.scopes.ProjectBackedPropertyHost
 import spock.lang.Specification
 
 import org.springframework.cloud.contract.stubrunner.StubConfiguration
@@ -97,7 +99,7 @@ class GradleContractsDownloaderHelperSpec extends Specification {
 	}
 
 	// Have to use this internal property impl here. Is there some better way?
-	static <T> Property<T> prop(Class<T> aClass) {
-		return new DefaultProperty(aClass)
+	public <T> Property<T> prop(Class<T> aClass) {
+		return new DefaultProperty(Stub(PropertyHost), aClass)
 	}
 }