diff options
author | miroslav2 <miroslav2@yandex-team.com> | 2024-04-22 14:04:09 +0300 |
---|---|---|
committer | miroslav2 <miroslav2@yandex-team.com> | 2024-04-22 14:19:30 +0300 |
commit | e781f56739e56e6012d43a53d6a9a5b26720b9bf (patch) | |
tree | 381bbd3e360a77ce8e97ab518d35af82db334226 | |
parent | 915f6d1c9c9826e2f24184576174ca99c4dee8be (diff) | |
download | ydb-e781f56739e56e6012d43a53d6a9a5b26720b9bf.tar.gz |
Remove JDK 18 support from Arcadia Tier 0, remove build configuration for JDK
0e989a0fc3519d203e2dbc837a772d2d99808f0b
-rw-r--r-- | build/conf/java.conf | 28 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk18/jdk.json | 17 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk18/ya.make | 10 | ||||
-rw-r--r-- | build/platform/java/jdk/ya.make | 4 | ||||
-rw-r--r-- | build/plugins/java.py | 2 |
5 files changed, 0 insertions, 61 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index f2cd6861b0..dc8fe68d67 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1042,11 +1042,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE { JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS } - when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "18") { - JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS - JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS - } - when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "20") { JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS @@ -1204,9 +1199,6 @@ when ($JDK_VERSION == "21") { elsewhen ($JDK_VERSION == "20") { JDK_REAL_VERSION=20 } -elsewhen ($JDK_VERSION == "18") { - JDK_REAL_VERSION=18 -} elsewhen ($JDK_VERSION == "17") { JDK_REAL_VERSION=17 } @@ -1238,9 +1230,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk20 build/platform/java/jdk/jdk17 } - when ($JDK_REAL_VERSION == "18") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk18 build/platform/java/jdk/jdk17 - } when ($JDK_REAL_VERSION == "17") { # need jdk11 for spare parts in "host" platform JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11 @@ -1263,9 +1252,6 @@ when ($JDK_REAL_VERSION == "21") { when ($JDK_REAL_VERSION == "20") { UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar20 } -when ($JDK_REAL_VERSION == "18") { - UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar18 -} when ($JDK_REAL_VERSION == "17") { UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17 } @@ -1291,9 +1277,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { JDK_RESOURCE=$JDK20_RESOURCE_GLOBAL } - when ($JDK_REAL_VERSION == "18") { - JDK_RESOURCE=$JDK18_RESOURCE_GLOBAL - } when ($JDK_REAL_VERSION == "17") { JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL } @@ -1318,11 +1301,6 @@ when (!$USE_SYSTEM_ERROR_PRONE) { ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.10.0 ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_10_0_RESOURCE_GLOBAL } - elsewhen ($JDK_REAL_VERSION == "18") { - ERROR_PRONE_VERSION=2.14.0 - ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.14.0 - ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_14_0_RESOURCE_GLOBAL - } elsewhen ($JDK_REAL_VERSION == "20") { ERROR_PRONE_VERSION=2.18.0 ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0 @@ -1364,9 +1342,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { UBERJAR_RESOURCE=$UBERJAR20_RESOURCE_GLOBAL } - when ($JDK_REAL_VERSION == "18") { - UBERJAR_RESOURCE=$UBERJAR18_RESOURCE_GLOBAL - } when ($JDK_REAL_VERSION == "17") { UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL } @@ -1388,9 +1363,6 @@ when ($JDK_REAL_VERSION == "21") { when ($JDK_REAL_VERSION == "20") { WITH_JDK_RESOURCE=$WITH_JDK20_RESOURCE_GLOBAL } -when ($JDK_REAL_VERSION == "18") { - WITH_JDK_RESOURCE=$WITH_JDK18_RESOURCE_GLOBAL -} when ($JDK_REAL_VERSION == "17") { WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL } diff --git a/build/platform/java/jdk/jdk18/jdk.json b/build/platform/java/jdk/jdk18/jdk.json deleted file mode 100644 index 388b0280e2..0000000000 --- a/build/platform/java/jdk/jdk18/jdk.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "by_platform": { - "darwin-arm64": { - "uri": "sbr:3230746914" - }, - "darwin-x86_64": { - "uri": "sbr:3230741134" - }, - "linux-x86_64": { - "uri": "sbr:3230733063" - }, - "win32-x86_64": { - "uri": "sbr:3230867750" - } - } -} - diff --git a/build/platform/java/jdk/jdk18/ya.make b/build/platform/java/jdk/jdk18/ya.make deleted file mode 100644 index 100fb99fa0..0000000000 --- a/build/platform/java/jdk/jdk18/ya.make +++ /dev/null @@ -1,10 +0,0 @@ -RESOURCES_LIBRARY() - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK18 jdk.json) -SET_RESOURCE_URI_FROM_JSON(WITH_JDK18_URI jdk.json) - -IF (WITH_JDK18_URI) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK18 ${WITH_JDK18_URI}) -ENDIF() - -END() diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 34094807c9..b696766faf 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -12,9 +12,6 @@ ELSEIF(JDK_REAL_VERSION == "21") ELSEIF(JDK_REAL_VERSION == "20") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk20/jdk.json) SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk20/jdk.json) -ELSEIF(JDK_REAL_VERSION == "18") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk18/jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk18/jdk.json) ELSEIF(JDK_REAL_VERSION == "17") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk17/jdk.json) SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk17/jdk.json) @@ -38,7 +35,6 @@ RECURSE( jdk11 jdk15 jdk17 - jdk18 jdk20 jdk21 jdk22 diff --git a/build/plugins/java.py b/build/plugins/java.py index ffd41aa66a..4905451d8e 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -142,7 +142,6 @@ def onjava_module(unit, *args): if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in ( '15', '17', - '18', '20', '21', '22', @@ -415,7 +414,6 @@ def on_jdk_version_macro_check(unit, *args): '11', '15', '17', - '18', '20', '21', '22', |