@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
1229
1229
elsewhen ($JDK_VERSION == "17") {
1230
1230
JDK_REAL_VERSION=17
1231
1231
}
1232
- elsewhen ($JDK_VERSION == "15") {
1233
- JDK_REAL_VERSION=15
1234
- }
1235
1232
elsewhen ($JDK_VERSION == "11") {
1236
1233
JDK_REAL_VERSION=11
1237
1234
}
@@ -1261,9 +1258,6 @@ otherwise {
1261
1258
# need jdk11 for spare parts in "host" platform
1262
1259
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
1263
1260
}
1264
- when ($JDK_REAL_VERSION == "15") {
1265
- JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
1266
- }
1267
1261
when ($JDK_REAL_VERSION == "11") {
1268
1262
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
1269
1263
}
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
1282
1276
when ($JDK_REAL_VERSION == "17") {
1283
1277
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
1284
1278
}
1285
- when ($JDK_REAL_VERSION == "15") {
1286
- UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
1287
- }
1288
1279
when ($JDK_REAL_VERSION == "11") {
1289
1280
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
1290
1281
}
@@ -1307,9 +1298,6 @@ otherwise {
1307
1298
when ($JDK_REAL_VERSION == "17") {
1308
1299
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
1309
1300
}
1310
- when ($JDK_REAL_VERSION == "15") {
1311
- JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
1312
- }
1313
1301
when ($JDK_REAL_VERSION == "11") {
1314
1302
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
1315
1303
}
@@ -1318,7 +1306,7 @@ otherwise {
1318
1306
# tag:java-specific
1319
1307
when (!$USE_SYSTEM_ERROR_PRONE) {
1320
1308
# Still not done: DTCC-667
1321
- when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15" ) {
1309
+ when ($JDK_REAL_VERSION == "11") {
1322
1310
ERROR_PRONE_VERSION=2.7.1
1323
1311
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
1324
1312
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1372,9 +1360,6 @@ otherwise {
1372
1360
when ($JDK_REAL_VERSION == "17") {
1373
1361
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
1374
1362
}
1375
- when ($JDK_REAL_VERSION == "15") {
1376
- UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
1377
- }
1378
1363
when ($JDK_REAL_VERSION == "11") {
1379
1364
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
1380
1365
}
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
1393
1378
when ($JDK_REAL_VERSION == "17") {
1394
1379
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
1395
1380
}
1396
- when ($JDK_REAL_VERSION == "15") {
1397
- WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
1398
- }
1399
1381
when ($JDK_REAL_VERSION == "11") {
1400
1382
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
1401
1383
}
0 commit comments