Skip to content

Commit b516b7a

Browse files
author
miroslav2
committed
Remove Java 15 and tools from build/conf/java.conf, build/plugins/java.py, build/platforms/java and build/ya.conf.json
1e4f1616bb7e1dd81dd80cd22295b0b4f0e819ef
1 parent 9ffc849 commit b516b7a

File tree

5 files changed

+1
-52
lines changed

5 files changed

+1
-52
lines changed

build/conf/java.conf

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
12291229
elsewhen ($JDK_VERSION == "17") {
12301230
JDK_REAL_VERSION=17
12311231
}
1232-
elsewhen ($JDK_VERSION == "15") {
1233-
JDK_REAL_VERSION=15
1234-
}
12351232
elsewhen ($JDK_VERSION == "11") {
12361233
JDK_REAL_VERSION=11
12371234
}
@@ -1261,9 +1258,6 @@ otherwise {
12611258
# need jdk11 for spare parts in "host" platform
12621259
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
12631260
}
1264-
when ($JDK_REAL_VERSION == "15") {
1265-
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
1266-
}
12671261
when ($JDK_REAL_VERSION == "11") {
12681262
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
12691263
}
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
12821276
when ($JDK_REAL_VERSION == "17") {
12831277
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
12841278
}
1285-
when ($JDK_REAL_VERSION == "15") {
1286-
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
1287-
}
12881279
when ($JDK_REAL_VERSION == "11") {
12891280
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
12901281
}
@@ -1307,9 +1298,6 @@ otherwise {
13071298
when ($JDK_REAL_VERSION == "17") {
13081299
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
13091300
}
1310-
when ($JDK_REAL_VERSION == "15") {
1311-
JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
1312-
}
13131301
when ($JDK_REAL_VERSION == "11") {
13141302
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
13151303
}
@@ -1318,7 +1306,7 @@ otherwise {
13181306
# tag:java-specific
13191307
when (!$USE_SYSTEM_ERROR_PRONE) {
13201308
# Still not done: DTCC-667
1321-
when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
1309+
when ($JDK_REAL_VERSION == "11") {
13221310
ERROR_PRONE_VERSION=2.7.1
13231311
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
13241312
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1372,9 +1360,6 @@ otherwise {
13721360
when ($JDK_REAL_VERSION == "17") {
13731361
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
13741362
}
1375-
when ($JDK_REAL_VERSION == "15") {
1376-
UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
1377-
}
13781363
when ($JDK_REAL_VERSION == "11") {
13791364
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
13801365
}
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
13931378
when ($JDK_REAL_VERSION == "17") {
13941379
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
13951380
}
1396-
when ($JDK_REAL_VERSION == "15") {
1397-
WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
1398-
}
13991381
when ($JDK_REAL_VERSION == "11") {
14001382
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
14011383
}

build/platform/java/jdk/jdk15/jdk.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/platform/java/jdk/jdk15/ya.make

Lines changed: 0 additions & 10 deletions
This file was deleted.

build/platform/java/jdk/ya.make

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ ELSEIF(JDK_REAL_VERSION == "20")
1515
ELSEIF(JDK_REAL_VERSION == "17")
1616
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk17/jdk.json)
1717
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk17/jdk.json)
18-
ELSEIF(JDK_REAL_VERSION == "15")
19-
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk15/jdk.json)
20-
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk15/jdk.json)
2118
ELSEIF(JDK_REAL_VERSION == "11")
2219
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk11/jdk.json)
2320
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk11/jdk.json)
@@ -33,7 +30,6 @@ END()
3330

3431
RECURSE(
3532
jdk11
36-
jdk15
3733
jdk17
3834
jdk20
3935
jdk21

build/plugins/java.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ def onjava_module(unit, *args):
100100
'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
101101
}
102102
if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in (
103-
'15',
104103
'17',
105104
'20',
106105
'21',
@@ -372,7 +371,6 @@ def on_jdk_version_macro_check(unit, *args):
372371
jdk_version = args[0]
373372
available_versions = (
374373
'11',
375-
'15',
376374
'17',
377375
'20',
378376
'21',

0 commit comments

Comments
 (0)