diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index c2741ed5819f4..2d81f00a8af8a 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -150,7 +150,7 @@ class BuildPlugin implements Plugin { } String inFipsJvmScript = 'print(java.security.Security.getProviders()[0].name.toLowerCase().contains("fips"));' - boolean inFipsJvm = Boolean.parseBoolean(runJavascript(project, runtimeJavaHome, inFipsJvmScript)) + boolean inFipsJvm = Boolean.parseBoolean(runJavaAsScript(project, runtimeJavaHome, inFipsJvmScript)) // Build debugging info println '=======================================' @@ -431,28 +431,28 @@ class BuildPlugin implements Plugin { String versionInfoScript = 'print(' + 'java.lang.System.getProperty("java.vendor") + " " + java.lang.System.getProperty("java.version") + ' + '" [" + java.lang.System.getProperty("java.vm.name") + " " + java.lang.System.getProperty("java.vm.version") + "]");' - return runJavascript(project, javaHome, versionInfoScript).trim() + return runJavaAsScript(project, javaHome, versionInfoScript).trim() } /** Finds the parsable java specification version */ private static String findJavaSpecificationVersion(Project project, String javaHome) { String versionScript = 'print(java.lang.System.getProperty("java.specification.version"));' - return runJavascript(project, javaHome, versionScript) + return runJavaAsScript(project, javaHome, versionScript) } private static String findJavaVendor(Project project, String javaHome) { String vendorScript = 'print(java.lang.System.getProperty("java.vendor"));' - return runJavascript(project, javaHome, vendorScript) + return runJavaAsScript(project, javaHome, vendorScript) } /** Finds the parsable java specification version */ private static String findJavaVersion(Project project, String javaHome) { String versionScript = 'print(java.lang.System.getProperty("java.version"));' - return runJavascript(project, javaHome, versionScript) + return runJavaAsScript(project, javaHome, versionScript) } /** Runs the given javascript using jjs from the jdk, and returns the output */ - private static String runJavascript(Project project, String javaHome, String script) { + private static String runJavaAsScript(Project project, String javaHome, String script) { ByteArrayOutputStream stdout = new ByteArrayOutputStream() ByteArrayOutputStream stderr = new ByteArrayOutputStream() if (Os.isFamily(Os.FAMILY_WINDOWS)) { diff --git a/x-pack/plugin/sql/qa/security/with-ssl/build.gradle b/x-pack/plugin/sql/qa/security/with-ssl/build.gradle index cfc04f97188a4..02120b7ccfad3 100644 --- a/x-pack/plugin/sql/qa/security/with-ssl/build.gradle +++ b/x-pack/plugin/sql/qa/security/with-ssl/build.gradle @@ -206,7 +206,7 @@ integTestCluster { } } Closure notRunningFips = { - Boolean.parseBoolean(BuildPlugin.runJavascript(project, project.runtimeJavaHome, + Boolean.parseBoolean(BuildPlugin.runJavaAsScript(project, project.runtimeJavaHome, 'print(java.security.Security.getProviders()[0].name.toLowerCase().contains("fips"));')) == false }