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 61c4158164..bac8d3938a 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 @@ -1,3 +1,5 @@ +import org.gradle.api.JavaVersion + buildscript { repositories { mavenCentral() @@ -21,13 +23,9 @@ ext { 'contract-gradle-plugin-libs-dir': contractVerifierGradlePluginLibsDir, "WORK_OFFLINE" : gradle.startParameter.isOffline() ? 'TRUE' : 'FALSE' ] - def javaVer = System.getProperty("java.version") - println "Java version is [${javaVer}]" - def splitJava = javaVer.split("\\.") - javaVersionNumber = Double.parseDouble(splitJava.length > 1 ? - (splitJava[0] + "." + splitJava[1]) : splitJava[0]) - println "Parsed Java version is [${javaVersionNumber}]" - incompatibleJdk = javaVersionNumber > 1.8 + JavaVersion javaVer = JavaVersion.current() + println "Current Java version equal to [${javaVer}]" + incompatibleJdk = javaVer.ordinal() > 8 } project.version = findProperty('verifierVersion')