@@ -150,7 +150,7 @@ class BuildPlugin implements Plugin<Project> {
150
150
}
151
151
152
152
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))
154
154
155
155
// Build debugging info
156
156
println ' ======================================='
@@ -438,28 +438,28 @@ class BuildPlugin implements Plugin<Project> {
438
438
String versionInfoScript = ' print(' +
439
439
' java.lang.System.getProperty("java.vendor") + " " + java.lang.System.getProperty("java.version") + ' +
440
440
' " [" + 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()
442
442
}
443
443
444
444
/* * Finds the parsable java specification version */
445
445
private static String findJavaSpecificationVersion (Project project , String javaHome ) {
446
446
String versionScript = ' print(java.lang.System.getProperty("java.specification.version"));'
447
- return runJavascript (project, javaHome, versionScript)
447
+ return runJavaAsScript (project, javaHome, versionScript)
448
448
}
449
449
450
450
private static String findJavaVendor (Project project , String javaHome ) {
451
451
String vendorScript = ' print(java.lang.System.getProperty("java.vendor"));'
452
- return runJavascript (project, javaHome, vendorScript)
452
+ return runJavaAsScript (project, javaHome, vendorScript)
453
453
}
454
454
455
455
/* * Finds the parsable java specification version */
456
456
private static String findJavaVersion (Project project , String javaHome ) {
457
457
String versionScript = ' print(java.lang.System.getProperty("java.version"));'
458
- return runJavascript (project, javaHome, versionScript)
458
+ return runJavaAsScript (project, javaHome, versionScript)
459
459
}
460
460
461
461
/* * 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 ) {
463
463
ByteArrayOutputStream stdout = new ByteArrayOutputStream ()
464
464
ByteArrayOutputStream stderr = new ByteArrayOutputStream ()
465
465
if (Os . isFamily(Os . FAMILY_WINDOWS )) {
0 commit comments