Skip to content

Commit f373f93

Browse files
authored
Add runtimeJavaDetails property in BuildParams (#61901)
Relates to #61857
1 parent ccb3e22 commit f373f93

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class BuildParams {
3838
private static JavaVersion minimumRuntimeVersion;
3939
private static JavaVersion gradleJavaVersion;
4040
private static JavaVersion runtimeJavaVersion;
41+
private static String runtimeJavaDetails;
4142
private static Boolean inFipsJvm;
4243
private static String gitRevision;
4344
private static String gitOrigin;
@@ -89,6 +90,10 @@ public static JavaVersion getRuntimeJavaVersion() {
8990
return value(runtimeJavaVersion);
9091
}
9192

93+
public static String getRuntimeJavaDetails() {
94+
return value(runtimeJavaDetails);
95+
}
96+
9297
public static Boolean isInFipsJvm() {
9398
return value(inFipsJvm);
9499
}
@@ -198,6 +203,10 @@ public void setRuntimeJavaVersion(JavaVersion runtimeJavaVersion) {
198203
BuildParams.runtimeJavaVersion = requireNonNull(runtimeJavaVersion);
199204
}
200205

206+
public void setRuntimeJavaDetails(String runtimeJavaDetails) {
207+
BuildParams.runtimeJavaDetails = runtimeJavaDetails;
208+
}
209+
201210
public void setInFipsJvm(boolean inFipsJvm) {
202211
BuildParams.inFipsJvm = inFipsJvm;
203212
}

buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public void apply(Project project) {
105105
params.setRuntimeJavaHome(runtimeJavaHome);
106106
params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion));
107107
params.setIsRutimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false);
108+
params.setRuntimeJavaDetails(getJavaInstallation(runtimeJavaHome).getImplementationName());
108109
params.setJavaVersions(getAvailableJavaVersions(minimumCompilerVersion));
109110
params.setMinimumCompilerVersion(minimumCompilerVersion);
110111
params.setMinimumRuntimeVersion(minimumRuntimeVersion);

0 commit comments

Comments
 (0)