diff options
author | AlexSm <alex@ydb.tech> | 2024-03-05 10:40:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 12:40:59 +0300 |
commit | 1ac13c847b5358faba44dbb638a828e24369467b (patch) | |
tree | 07672b4dd3604ad3dee540a02c6494cb7d10dc3d /build/platform/java | |
parent | ffcca3e7f7958ddc6487b91d3df8c01054bd0638 (diff) | |
download | ydb-1ac13c847b5358faba44dbb638a828e24369467b.tar.gz |
Library import 16 (#2433)
Co-authored-by: robot-piglet <robot-piglet@yandex-team.com>
Co-authored-by: deshevoy <deshevoy@yandex-team.com>
Co-authored-by: robot-contrib <robot-contrib@yandex-team.com>
Co-authored-by: thegeorg <thegeorg@yandex-team.com>
Co-authored-by: robot-ya-builder <robot-ya-builder@yandex-team.com>
Co-authored-by: svidyuk <svidyuk@yandex-team.com>
Co-authored-by: shadchin <shadchin@yandex-team.com>
Co-authored-by: robot-ratatosk <robot-ratatosk@yandex-team.com>
Co-authored-by: innokentii <innokentii@yandex-team.com>
Co-authored-by: arkady-e1ppa <arkady-e1ppa@yandex-team.com>
Co-authored-by: snermolaev <snermolaev@yandex-team.com>
Co-authored-by: dimdim11 <dimdim11@yandex-team.com>
Co-authored-by: kickbutt <kickbutt@yandex-team.com>
Co-authored-by: abdullinsaid <abdullinsaid@yandex-team.com>
Co-authored-by: korsunandrei <korsunandrei@yandex-team.com>
Co-authored-by: petrk <petrk@yandex-team.com>
Co-authored-by: miroslav2 <miroslav2@yandex-team.com>
Co-authored-by: serjflint <serjflint@yandex-team.com>
Co-authored-by: akhropov <akhropov@yandex-team.com>
Co-authored-by: prettyboy <prettyboy@yandex-team.com>
Co-authored-by: ilikepugs <ilikepugs@yandex-team.com>
Co-authored-by: hiddenpath <hiddenpath@yandex-team.com>
Co-authored-by: mikhnenko <mikhnenko@yandex-team.com>
Co-authored-by: spreis <spreis@yandex-team.com>
Co-authored-by: andreyshspb <andreyshspb@yandex-team.com>
Co-authored-by: dimaandreev <dimaandreev@yandex-team.com>
Co-authored-by: rashid <rashid@yandex-team.com>
Co-authored-by: robot-ydb-importer <robot-ydb-importer@yandex-team.com>
Co-authored-by: r-vetrov <r-vetrov@yandex-team.com>
Co-authored-by: ypodlesov <ypodlesov@yandex-team.com>
Co-authored-by: zaverden <zaverden@yandex-team.com>
Co-authored-by: vpozdyayev <vpozdyayev@yandex-team.com>
Co-authored-by: robot-cozmo <robot-cozmo@yandex-team.com>
Co-authored-by: v-korovin <v-korovin@yandex-team.com>
Co-authored-by: arikon <arikon@yandex-team.com>
Co-authored-by: khoden <khoden@yandex-team.com>
Co-authored-by: psydmm <psydmm@yandex-team.com>
Co-authored-by: robot-javacom <robot-javacom@yandex-team.com>
Co-authored-by: dtorilov <dtorilov@yandex-team.com>
Co-authored-by: sennikovmv <sennikovmv@yandex-team.com>
Co-authored-by: hcpp <hcpp@ydb.tech>
Diffstat (limited to 'build/platform/java')
-rw-r--r-- | build/platform/java/jdk/jdk11/jdk.json | 33 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk11/ya.make | 9 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk17/ya.make | 9 | ||||
-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/jdk20/jdk.json | 33 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk20/ya.make | 9 | ||||
-rw-r--r-- | build/platform/java/jdk/jdk21/ya.make | 9 | ||||
-rw-r--r-- | build/platform/java/jdk/ya.make | 4 |
9 files changed, 40 insertions, 103 deletions
diff --git a/build/platform/java/jdk/jdk11/jdk.json b/build/platform/java/jdk/jdk11/jdk.json index 2f3d886402..f7e8782b6d 100644 --- a/build/platform/java/jdk/jdk11/jdk.json +++ b/build/platform/java/jdk/jdk11/jdk.json @@ -1,20 +1,19 @@ { - "by_platform": { - "darwin-arm64": { - "uri": "sbr:3050798466" - }, - "darwin-x86_64": { - "uri": "sbr:3167009386" - }, - "linux-x86_64": { - "uri": "sbr:3064614561" - }, - "linux-aarch64": { - "uri": "sbr:3989100748" - }, - "win32-x86_64": { - "uri": "sbr:3166999959" - } + "by_platform": { + "darwin-arm64": { + "uri": "sbr:5909068951" + }, + "darwin-x86_64": { + "uri": "sbr:5909067709" + }, + "linux-x86_64": { + "uri": "sbr:5909063641" + }, + "linux-aarch64": { + "uri": "sbr:5909065014" + }, + "win32-x86_64": { + "uri": "sbr:5909066324" } + } } - diff --git a/build/platform/java/jdk/jdk11/ya.make b/build/platform/java/jdk/jdk11/ya.make index 088f30ba20..10fedbf874 100644 --- a/build/platform/java/jdk/jdk11/ya.make +++ b/build/platform/java/jdk/jdk11/ya.make @@ -1,12 +1,7 @@ RESOURCES_LIBRARY() -IF(NEBIUS) - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK11 jdk_nebius.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK11_URI jdk_nebius.json) -ELSE() - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK11 jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK11_URI jdk.json) -ENDIF() +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK11 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK11_URI jdk.json) IF (WITH_JDK11_URI) DECLARE_EXTERNAL_RESOURCE(WITH_JDK11 ${WITH_JDK11_URI}) diff --git a/build/platform/java/jdk/jdk17/ya.make b/build/platform/java/jdk/jdk17/ya.make index 3a1ee069d6..c70a3a2eca 100644 --- a/build/platform/java/jdk/jdk17/ya.make +++ b/build/platform/java/jdk/jdk17/ya.make @@ -1,12 +1,7 @@ RESOURCES_LIBRARY() -IF(NEBIUS) - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK17 jdk_nebius.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK17_URI jdk_nebius.json) -ELSE() - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK17 jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK17_URI jdk.json) -ENDIF() +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK17 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK17_URI jdk.json) IF (WITH_JDK17_URI) DECLARE_EXTERNAL_RESOURCE(WITH_JDK17 ${WITH_JDK17_URI}) 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/jdk20/jdk.json b/build/platform/java/jdk/jdk20/jdk.json index 95ff250dfe..327cd9adba 100644 --- a/build/platform/java/jdk/jdk20/jdk.json +++ b/build/platform/java/jdk/jdk20/jdk.json @@ -1,20 +1,19 @@ { - "by_platform": { - "darwin-arm64": { - "uri": "sbr:4384866600" - }, - "darwin-x86_64": { - "uri": "sbr:4384863636" - }, - "linux-x86_64": { - "uri": "sbr:4384857315" - }, - "linux-aarch64": { - "uri": "sbr:4384859639" - }, - "win32-x86_64": { - "uri": "sbr:4384861822" - } + "by_platform": { + "darwin-arm64": { + "uri": "sbr:5920323347" + }, + "darwin-x86_64": { + "uri": "sbr:5920322428" + }, + "linux-x86_64": { + "uri": "sbr:5920320011" + }, + "linux-aarch64": { + "uri": "sbr:5920320608" + }, + "win32-x86_64": { + "uri": "sbr:5920321413" } + } } - diff --git a/build/platform/java/jdk/jdk20/ya.make b/build/platform/java/jdk/jdk20/ya.make index 66246045a4..c3039523ef 100644 --- a/build/platform/java/jdk/jdk20/ya.make +++ b/build/platform/java/jdk/jdk20/ya.make @@ -1,12 +1,7 @@ RESOURCES_LIBRARY() -IF(NEBIUS) - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK20 jdk_nebius.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK20_URI jdk_nebius.json) -ELSE() - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK20 jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK20_URI jdk.json) -ENDIF() +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK20 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK20_URI jdk.json) IF (WITH_JDK20_URI) DECLARE_EXTERNAL_RESOURCE(WITH_JDK20 ${WITH_JDK20_URI}) diff --git a/build/platform/java/jdk/jdk21/ya.make b/build/platform/java/jdk/jdk21/ya.make index b47725dc31..181698287f 100644 --- a/build/platform/java/jdk/jdk21/ya.make +++ b/build/platform/java/jdk/jdk21/ya.make @@ -1,12 +1,7 @@ RESOURCES_LIBRARY() -IF(NEBIUS) - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK21 jdk_nebius.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK21_URI jdk_nebius.json) -ELSE() - DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK21 jdk.json) - SET_RESOURCE_URI_FROM_JSON(WITH_JDK21_URI jdk.json) -ENDIF() +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK21 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK21_URI jdk.json) IF (WITH_JDK21_URI) DECLARE_EXTERNAL_RESOURCE(WITH_JDK21 ${WITH_JDK21_URI}) 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 |