Ignore any other warnings when detecting Java version (#56150)

elastic · May 4, 2020 · b9ea5d5 · b9ea5d5
1 parent c03a3f8
commit b9ea5d5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -503,7 +503,12 @@ class BuildPlugin implements Plugin<Project> {
             result.rethrowFailure()
             result.assertNormalExitValue() // assert exit value in case the failure cause is null
         }
-        return (captureStdErr ? stderr : stdout).toString('UTF-8').trim()
+        String[] lines = (captureStdErr ? stderr : stdout).toString('UTF-8').trim().split('\n')
+        if (lines.length == 0) {
+            throw new GradleException("Expected command to produce output but it did not.")
+        }
+
+        return lines[lines.length - 1]
     }
 
     /** Return the configuration name used for finding transitive deps of the given dependency. */