@@ -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 ' ======================================='
@@ -431,28 +431,28 @@ class BuildPlugin implements Plugin<Project> {
431431 String versionInfoScript = ' print(' +
432432 ' java.lang.System.getProperty("java.vendor") + " " + java.lang.System.getProperty("java.version") + ' +
433433 ' " [" + java.lang.System.getProperty("java.vm.name") + " " + java.lang.System.getProperty("java.vm.version") + "]");'
434- return runJavascript (project, javaHome, versionInfoScript). trim()
434+ return runJavaAsScript (project, javaHome, versionInfoScript). trim()
435435 }
436436
437437 /* * Finds the parsable java specification version */
438438 private static String findJavaSpecificationVersion (Project project , String javaHome ) {
439439 String versionScript = ' print(java.lang.System.getProperty("java.specification.version"));'
440- return runJavascript (project, javaHome, versionScript)
440+ return runJavaAsScript (project, javaHome, versionScript)
441441 }
442442
443443 private static String findJavaVendor (Project project , String javaHome ) {
444444 String vendorScript = ' print(java.lang.System.getProperty("java.vendor"));'
445- return runJavascript (project, javaHome, vendorScript)
445+ return runJavaAsScript (project, javaHome, vendorScript)
446446 }
447447
448448 /* * Finds the parsable java specification version */
449449 private static String findJavaVersion (Project project , String javaHome ) {
450450 String versionScript = ' print(java.lang.System.getProperty("java.version"));'
451- return runJavascript (project, javaHome, versionScript)
451+ return runJavaAsScript (project, javaHome, versionScript)
452452 }
453453
454454 /* * Runs the given javascript using jjs from the jdk, and returns the output */
455- private static String runJavascript (Project project , String javaHome , String script ) {
455+ private static String runJavaAsScript (Project project , String javaHome , String script ) {
456456 ByteArrayOutputStream stdout = new ByteArrayOutputStream ()
457457 ByteArrayOutputStream stderr = new ByteArrayOutputStream ()
458458 if (Os . isFamily(Os . FAMILY_WINDOWS )) {
0 commit comments