Fix building bwc versions (#40361)

Account for openjdk when figuring out what java version to use for building bwc versions.
elastic · Mar 22, 2019 · 86b8132 · 86b8132
1 parent f38f7dc
commit 86b8132
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle
@@ -163,8 +163,9 @@ bwcVersions.forPreviousUnreleased { VersionCollection.UnreleasedVersionInfo unre
                         '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("!!")
                         ))
                 )