diff options
author | miroslav2 <miroslav2@yandex-team.com> | 2024-02-20 21:17:35 +0300 |
---|---|---|
committer | miroslav2 <miroslav2@yandex-team.com> | 2024-02-20 21:42:31 +0300 |
commit | d30dacf3e7f4d325eb310c4ba14d678af017bc67 (patch) | |
tree | e972c68b9e4f37051218eca3bbcc5b3689800c20 /build | |
parent | d6318eaf67795ef985797d2980c67d48bedcd7d3 (diff) | |
download | ydb-d30dacf3e7f4d325eb310c4ba14d678af017bc67.tar.gz |
Remove JDK 19 support from Arcadia Tier 0, remove build configuration for JDK
c6a795a78f562c87f8d5cb8f4368c9aae260d88b
Diffstat (limited to 'build')
-rw-r--r-- | build/conf/docs.conf | 4 | ||||
-rw-r--r-- | build/conf/java.conf | 30 | ||||
-rw-r--r-- | build/mapping.conf.json | 10 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk19/jdk.json | 20 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk19/ya.make | 17 | ||||
-rw-r--r-- | build/platform/java/jdk/ya.make | 4 | ||||
-rw-r--r-- | build/plugins/java.py | 2 |
7 files changed, 13 insertions, 74 deletions
diff --git a/build/conf/docs.conf b/build/conf/docs.conf index b0199a808c..6a4c3b5805 100644 --- a/build/conf/docs.conf +++ b/build/conf/docs.conf @@ -22,7 +22,7 @@ _DOCS_ENV= _DOCS_KV=${kv;hide:"p DO"} ${kv;hide:"pc light-cyan"} ${kv;hide:"show_out yes"} _DOCS_PLANTUML_ENV=\ -${env:"JAVA_PATH=$JDK19_RESOURCE_GLOBAL/bin/java"} \ +${env:"JAVA_PATH=$JDK21_RESOURCE_GLOBAL/bin/java"} \ ${env:"PLANTUML_PATH=contrib/tools/plantuml/plantuml.run.cp.jar"} \ ${env:"_JAVA_OPTIONS='-Dsun.awt.fontconfig=contrib/java/openjdk-fontconfig/fontconfig.properties -Djava.awt.headless=true'"} \ ${env:"LANG=en_US.UTF-8"} \ @@ -130,7 +130,7 @@ module _DOCS_BASE_UNIT: _DOCS_BARE_UNIT { ### This macr sets appropriate dependencies for use of plantuml plugin macro _DOCS_YFM_USE_PLANTUML() { when ($DOCSLIB == "yes") { - PEERDIR+=build/platform/java/jdk/jdk19 contrib/java/openjdk-fontconfig + PEERDIR+=build/platform/java/jdk/jdk21 contrib/java/openjdk-fontconfig _DOCS_ENV+=$_DOCS_PLANTUML_ENV _DOCS_EXTRA_TOOLS+=${hide;tool:"contrib/tools/plantuml"} diff --git a/build/conf/java.conf b/build/conf/java.conf index 5879bc488c..671206c899 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -410,7 +410,7 @@ when($JDK_VERSION == "8") { } # tag:java-specific -JDK_LATEST_VERSION=19 +JDK_LATEST_VERSION=21 JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION} # tag:java-specific @@ -1045,11 +1045,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE { JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS } - when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "19") { - 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 @@ -1199,9 +1194,6 @@ when ($JDK_VERSION == "21") { elsewhen ($JDK_VERSION == "20") { JDK_REAL_VERSION=20 } -elsewhen ($JDK_VERSION == "19") { - JDK_REAL_VERSION=19 -} elsewhen ($JDK_VERSION == "18") { JDK_REAL_VERSION=18 } @@ -1236,9 +1228,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk20 build/platform/java/jdk/jdk17 } - when ($JDK_REAL_VERSION == "19") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk19 build/platform/java/jdk/jdk17 - } when ($JDK_REAL_VERSION == "18") { JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk18 build/platform/java/jdk/jdk17 } @@ -1264,9 +1253,6 @@ when ($JDK_REAL_VERSION == "21") { when ($JDK_REAL_VERSION == "20") { UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar20 } -when ($JDK_REAL_VERSION == "19") { - UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar18 -} when ($JDK_REAL_VERSION == "18") { UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar18 } @@ -1295,9 +1281,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { JDK_RESOURCE=$JDK20_RESOURCE_GLOBAL } - when ($JDK_REAL_VERSION == "19") { - JDK_RESOURCE=$JDK19_RESOURCE_GLOBAL - } when ($JDK_REAL_VERSION == "18") { JDK_RESOURCE=$JDK18_RESOURCE_GLOBAL } @@ -1338,11 +1321,6 @@ when (!$USE_SYSTEM_ERROR_PRONE) { 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 == "19") { - ERROR_PRONE_VERSION=2.18.0 - ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0 - ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_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 @@ -1376,9 +1354,6 @@ otherwise { when ($JDK_REAL_VERSION == "20") { UBERJAR_RESOURCE=$UBERJAR20_RESOURCE_GLOBAL } - when ($JDK_REAL_VERSION == "19") { - UBERJAR_RESOURCE=$UBERJAR18_RESOURCE_GLOBAL - } when ($JDK_REAL_VERSION == "18") { UBERJAR_RESOURCE=$UBERJAR18_RESOURCE_GLOBAL } @@ -1403,9 +1378,6 @@ when ($JDK_REAL_VERSION == "21") { when ($JDK_REAL_VERSION == "20") { WITH_JDK_RESOURCE=$WITH_JDK20_RESOURCE_GLOBAL } -when ($JDK_REAL_VERSION == "19") { - WITH_JDK_RESOURCE=$WITH_JDK19_RESOURCE_GLOBAL -} when ($JDK_REAL_VERSION == "18") { WITH_JDK_RESOURCE=$WITH_JDK18_RESOURCE_GLOBAL } diff --git a/build/mapping.conf.json b/build/mapping.conf.json index e05933106c..9e21d8c282 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -189,10 +189,15 @@ "5517239368": "https://devtools-registry.s3.yandex.net/5517239368", "3833498694": "https://devtools-registry.s3.yandex.net/3833498694", "1277521710": "https://devtools-registry.s3.yandex.net/1277521710", + "5776380974": "https://devtools-registry.s3.yandex.net/5776380974", "5777101734": "https://devtools-registry.s3.yandex.net/5777101734", + "5776379446": "https://devtools-registry.s3.yandex.net/5776379446", "5777100597": "https://devtools-registry.s3.yandex.net/5777100597", + "5776375952": "https://devtools-registry.s3.yandex.net/5776375952", "5777098178": "https://devtools-registry.s3.yandex.net/5777098178", + "5776374505": "https://devtools-registry.s3.yandex.net/5776374505", "5777096988": "https://devtools-registry.s3.yandex.net/5777096988", + "5776377955": "https://devtools-registry.s3.yandex.net/5776377955", "5777099502": "https://devtools-registry.s3.yandex.net/5777099502", "3167009386": "https://devtools-registry.s3.yandex.net/3167009386", "3050798466": "https://devtools-registry.s3.yandex.net/3050798466", @@ -463,10 +468,15 @@ "5517239368": "flake8_linter for linux-aarch64", "3833498694": "gdb 11.2 for osx_10.15_catalina", "1277521710": "infra/kernel/tools/atop/build/atop-static.tar.gz", + "5776380974": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz", "5777101734": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz", + "5776379446": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz", "5777100597": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz", + "5776375952": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz", "5777098178": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz", + "5776374505": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz", "5777096988": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz", + "5776377955": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz", "5777099502": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz", "3167009386": "openjdk 11.0.15 vanilla for darwin", "3050798466": "openjdk 11.0.15 vanilla for darwin-arm64", diff --git a/build/platform/java/jdk/jdk19/jdk.json b/build/platform/java/jdk/jdk19/jdk.json deleted file mode 100644 index 8b64529ab3..0000000000 --- a/build/platform/java/jdk/jdk19/jdk.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "by_platform": { - "darwin-arm64": { - "uri": "sbr:3676730876" - }, - "darwin-x86_64": { - "uri": "sbr:3676726364" - }, - "linux-x86_64": { - "uri": "sbr:3676221325" - }, - "linux-aarch64": { - "uri": "sbr:3989113687" - }, - "win32-x86_64": { - "uri": "sbr:3676654632" - } - } -} - diff --git a/build/platform/java/jdk/jdk19/ya.make b/build/platform/java/jdk/jdk19/ya.make deleted file mode 100644 index b3d8780e05..0000000000 --- a/build/platform/java/jdk/jdk19/ya.make +++ /dev/null @@ -1,17 +0,0 @@ -RESOURCES_LIBRARY() - -DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK19 jdk.json) -SET_RESOURCE_URI_FROM_JSON(WITH_JDK19_URI jdk.json) - -IF (WITH_JDK19_URI) - DECLARE_EXTERNAL_RESOURCE(WITH_JDK19 ${WITH_JDK19_URI}) -ENDIF() - -END() - -IF (AUTOCHECK) - RECURSE_FOR_TESTS(ut) -ENDIF() -IF(YA_IDE_IDEA) - RECURSE_FOR_TESTS(ut) -ENDIF() diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index 4e2df0ed36..3272028012 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -9,9 +9,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 == "19") - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk19/jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk19/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) @@ -43,7 +40,6 @@ RECURSE( jdk15 jdk17 jdk18 - jdk19 jdk20 jdk21 testing diff --git a/build/plugins/java.py b/build/plugins/java.py index 69da60361d..68c00f72f9 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -143,7 +143,6 @@ def onjava_module(unit, *args): '15', '17', '18', - '19', '20', '21', ): @@ -416,7 +415,6 @@ def on_jdk_version_macro_check(unit, *args): '15', '17', '18', - '19', '20', '21', ) |