From 6d250e0f446df9561a5f6a00f22b96d538ff7594 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Fri, 4 Sep 2020 11:47:44 +0300 Subject: [PATCH] Add runtimeJavaDetails property in BuildParams (#61901) (#61961) Relates to #61857 --- .../java/org/elasticsearch/gradle/info/BuildParams.java | 9 +++++++++ .../elasticsearch/gradle/info/GlobalBuildInfoPlugin.java | 1 + 2 files changed, 10 insertions(+) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java b/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java index 04d6f6902a6..71f7fd29189 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java @@ -38,6 +38,7 @@ public class BuildParams { private static JavaVersion minimumRuntimeVersion; private static JavaVersion gradleJavaVersion; private static JavaVersion runtimeJavaVersion; + private static String runtimeJavaDetails; private static Boolean inFipsJvm; private static String gitRevision; private static String gitOrigin; @@ -89,6 +90,10 @@ public class BuildParams { return value(runtimeJavaVersion); } + public static String getRuntimeJavaDetails() { + return value(runtimeJavaDetails); + } + public static Boolean isInFipsJvm() { return value(inFipsJvm); } @@ -198,6 +203,10 @@ public class BuildParams { BuildParams.runtimeJavaVersion = requireNonNull(runtimeJavaVersion); } + public void setRuntimeJavaDetails(String runtimeJavaDetails) { + BuildParams.runtimeJavaDetails = runtimeJavaDetails; + } + public void setInFipsJvm(boolean inFipsJvm) { BuildParams.inFipsJvm = inFipsJvm; } diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java index b9822c2c12e..78ba16e11ca 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java @@ -105,6 +105,7 @@ public class GlobalBuildInfoPlugin implements Plugin { params.setRuntimeJavaHome(runtimeJavaHome); params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion)); params.setIsRutimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false); + params.setRuntimeJavaDetails(getJavaInstallation(runtimeJavaHome).getImplementationName()); params.setJavaVersions(getAvailableJavaVersions(minimumCompilerVersion)); params.setMinimumCompilerVersion(minimumCompilerVersion); params.setMinimumRuntimeVersion(minimumRuntimeVersion);