Browse Source

Set BWC builds for 6.x to use JDK 11

The BWC builds for the 6.x branch should be using JDK 11. This commit
fixes the BWC builds to specify that they use JDK 11 instead of JDK 10
which is now incompatible with the 6.x build.
Jason Tedor 7 years ago
parent
commit
9d36cbaf16
1 changed files with 3 additions and 1 deletions
  1. 3 1
      distribution/bwc/build.gradle

+ 3 - 1
distribution/bwc/build.gradle

@@ -157,8 +157,10 @@ subprojects {
       environment('JAVA_HOME', getJavaHome(it, 8))
       environment('JAVA_HOME', getJavaHome(it, 8))
     } else if ("6.2".equals(bwcBranch)) {
     } else if ("6.2".equals(bwcBranch)) {
       environment('JAVA_HOME', getJavaHome(it, 9))
       environment('JAVA_HOME', getJavaHome(it, 9))
-    } else if (["6.3", "6.4", "6.x"].contains(bwcBranch)) {
+    } else if (["6.3", "6.4"].contains(bwcBranch)) {
       environment('JAVA_HOME', getJavaHome(it, 10))
       environment('JAVA_HOME', getJavaHome(it, 10))
+    } else if (["6.x"].contains(bwcBranch)) {
+      environment('JAVA_HOME', getJavaHome(it, 11))
     } else {
     } else {
       environment('JAVA_HOME', project.compilerJavaHome)
       environment('JAVA_HOME', project.compilerJavaHome)
     }
     }