|
@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
|
|
|
elsewhen ($JDK_VERSION == "17") {
|
|
|
JDK_REAL_VERSION=17
|
|
|
}
|
|
|
-elsewhen ($JDK_VERSION == "15") {
|
|
|
- JDK_REAL_VERSION=15
|
|
|
-}
|
|
|
elsewhen ($JDK_VERSION == "11") {
|
|
|
JDK_REAL_VERSION=11
|
|
|
}
|
|
@@ -1261,9 +1258,6 @@ otherwise {
|
|
|
# need jdk11 for spare parts in "host" platform
|
|
|
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "15") {
|
|
|
- JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "11") {
|
|
|
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
|
|
|
}
|
|
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
|
|
|
}
|
|
|
-when ($JDK_REAL_VERSION == "15") {
|
|
|
- UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
|
|
|
-}
|
|
|
when ($JDK_REAL_VERSION == "11") {
|
|
|
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
|
|
|
}
|
|
@@ -1307,9 +1298,6 @@ otherwise {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "15") {
|
|
|
- JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "11") {
|
|
|
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
|
|
|
}
|
|
@@ -1318,7 +1306,7 @@ otherwise {
|
|
|
# tag:java-specific
|
|
|
when (!$USE_SYSTEM_ERROR_PRONE) {
|
|
|
# Still not done: DTCC-667
|
|
|
- when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
|
|
|
+ when ($JDK_REAL_VERSION == "11") {
|
|
|
ERROR_PRONE_VERSION=2.7.1
|
|
|
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
|
|
|
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
|
|
@@ -1372,9 +1360,6 @@ otherwise {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
- when ($JDK_REAL_VERSION == "15") {
|
|
|
- UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
|
|
|
- }
|
|
|
when ($JDK_REAL_VERSION == "11") {
|
|
|
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
|
|
|
}
|
|
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
|
|
|
when ($JDK_REAL_VERSION == "17") {
|
|
|
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
|
|
|
}
|
|
|
-when ($JDK_REAL_VERSION == "15") {
|
|
|
- WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
|
|
|
-}
|
|
|
when ($JDK_REAL_VERSION == "11") {
|
|
|
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
|
|
|
}
|