From 5596fd152924bc04e22a81eddb836fcfa78b01d1 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Fri, 22 Mar 2019 15:21:16 +0200 Subject: [PATCH] Fix building bwc versions we have to account for openjdk when figuring out what java version to use for building bwc versions. --- distribution/bwc/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 0481115d95cfc..ddd02497e8430 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -169,8 +169,9 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased 'JAVA_HOME', getJavaHome(it, Integer.parseInt( lines - .findAll({ it.startsWith("ES_BUILD_JAVA=java") }) + .findAll({ it.startsWith("ES_BUILD_JAVA=")}) .collect({ it.replace("ES_BUILD_JAVA=java", "").trim() }) + .collect({ it.replace("ES_BUILD_JAVA=openjdk", "").trim() }) .join("!!") )) )