Browse Source

Fix building bwc versions (#40361)

Account for openjdk when figuring out what java version to
use for building bwc versions.
Alpar Torok 6 years ago
parent
commit
195aa64b3f
1 changed files with 2 additions and 1 deletions
  1. 2 1
      distribution/bwc/build.gradle

+ 2 - 1
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("!!")
                         ))
                 )