Skip to content

Commit 0154052

Browse files
jsorefalpar-t
authored andcommitted
spelling: java script -- not JavaScript (#37057)
1 parent cde126d commit 0154052

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class BuildPlugin implements Plugin<Project> {
150150
}
151151

152152
String inFipsJvmScript = 'print(java.security.Security.getProviders()[0].name.toLowerCase().contains("fips"));'
153-
boolean inFipsJvm = Boolean.parseBoolean(runJavascript(project, runtimeJavaHome, inFipsJvmScript))
153+
boolean inFipsJvm = Boolean.parseBoolean(runJavaAsScript(project, runtimeJavaHome, inFipsJvmScript))
154154

155155
// Build debugging info
156156
println '======================================='
@@ -438,28 +438,28 @@ class BuildPlugin implements Plugin<Project> {
438438
String versionInfoScript = 'print(' +
439439
'java.lang.System.getProperty("java.vendor") + " " + java.lang.System.getProperty("java.version") + ' +
440440
'" [" + java.lang.System.getProperty("java.vm.name") + " " + java.lang.System.getProperty("java.vm.version") + "]");'
441-
return runJavascript(project, javaHome, versionInfoScript).trim()
441+
return runJavaAsScript(project, javaHome, versionInfoScript).trim()
442442
}
443443

444444
/** Finds the parsable java specification version */
445445
private static String findJavaSpecificationVersion(Project project, String javaHome) {
446446
String versionScript = 'print(java.lang.System.getProperty("java.specification.version"));'
447-
return runJavascript(project, javaHome, versionScript)
447+
return runJavaAsScript(project, javaHome, versionScript)
448448
}
449449

450450
private static String findJavaVendor(Project project, String javaHome) {
451451
String vendorScript = 'print(java.lang.System.getProperty("java.vendor"));'
452-
return runJavascript(project, javaHome, vendorScript)
452+
return runJavaAsScript(project, javaHome, vendorScript)
453453
}
454454

455455
/** Finds the parsable java specification version */
456456
private static String findJavaVersion(Project project, String javaHome) {
457457
String versionScript = 'print(java.lang.System.getProperty("java.version"));'
458-
return runJavascript(project, javaHome, versionScript)
458+
return runJavaAsScript(project, javaHome, versionScript)
459459
}
460460

461461
/** Runs the given javascript using jjs from the jdk, and returns the output */
462-
private static String runJavascript(Project project, String javaHome, String script) {
462+
private static String runJavaAsScript(Project project, String javaHome, String script) {
463463
ByteArrayOutputStream stdout = new ByteArrayOutputStream()
464464
ByteArrayOutputStream stderr = new ByteArrayOutputStream()
465465
if (Os.isFamily(Os.FAMILY_WINDOWS)) {

x-pack/plugin/sql/qa/security/with-ssl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ integTestCluster {
208208
}
209209
}
210210
Closure notRunningFips = {
211-
Boolean.parseBoolean(BuildPlugin.runJavascript(project, project.runtimeJavaHome,
211+
Boolean.parseBoolean(BuildPlugin.runJavaAsScript(project, project.runtimeJavaHome,
212212
'print(java.security.Security.getProviders()[0].name.toLowerCase().contains("fips"));')) == false
213213
}
214214

0 commit comments

Comments
 (0)