honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add runtimeJavaDetails property in BuildParams (#61901) (#61961) 

Relates to #61857
This commit is contained in:
Ioannis Kakavas 2020-09-04 11:47:44 +03:00 committed by GitHub
parent cdfb163c7c
commit 6d250e0f44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java
View File

@ -38,6 +38,7 @@ public class BuildParams {
private static JavaVersion minimumRuntimeVersion; private static JavaVersion minimumRuntimeVersion;
private static JavaVersion gradleJavaVersion; private static JavaVersion gradleJavaVersion;
private static JavaVersion runtimeJavaVersion; private static JavaVersion runtimeJavaVersion;
private static String runtimeJavaDetails;
private static Boolean inFipsJvm; private static Boolean inFipsJvm;
private static String gitRevision; private static String gitRevision;
private static String gitOrigin; private static String gitOrigin;
@ -89,6 +90,10 @@ public class BuildParams {
return value(runtimeJavaVersion); return value(runtimeJavaVersion);
} }
public static String getRuntimeJavaDetails() {
return value(runtimeJavaDetails);
}
public static Boolean isInFipsJvm() { public static Boolean isInFipsJvm() {
return value(inFipsJvm); return value(inFipsJvm);
} }
@ -198,6 +203,10 @@ public class BuildParams {
BuildParams.runtimeJavaVersion = requireNonNull(runtimeJavaVersion); BuildParams.runtimeJavaVersion = requireNonNull(runtimeJavaVersion);
} }
public void setRuntimeJavaDetails(String runtimeJavaDetails) {
BuildParams.runtimeJavaDetails = runtimeJavaDetails;
}
public void setInFipsJvm(boolean inFipsJvm) { public void setInFipsJvm(boolean inFipsJvm) {
BuildParams.inFipsJvm = inFipsJvm; BuildParams.inFipsJvm = inFipsJvm;
} }

1
buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java
View File

@ -105,6 +105,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
params.setRuntimeJavaHome(runtimeJavaHome); params.setRuntimeJavaHome(runtimeJavaHome);
params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion)); params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion));
params.setIsRutimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false); params.setIsRutimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false);
params.setRuntimeJavaDetails(getJavaInstallation(runtimeJavaHome).getImplementationName());
params.setJavaVersions(getAvailableJavaVersions(minimumCompilerVersion)); params.setJavaVersions(getAvailableJavaVersions(minimumCompilerVersion));
params.setMinimumCompilerVersion(minimumCompilerVersion); params.setMinimumCompilerVersion(minimumCompilerVersion);
params.setMinimumRuntimeVersion(minimumRuntimeVersion); params.setMinimumRuntimeVersion(minimumRuntimeVersion);