diff options
| author | pazus <pazus@yandex-team.com> | 2023-10-19 14:28:51 +0300 |
|---|---|---|
| committer | pazus <pazus@yandex-team.com> | 2023-10-19 15:00:08 +0300 |
| commit | 06137dfedfcaa35dcd14688f3e4460c4c83dbfba (patch) | |
| tree | 738e84121b6c703a211580f5dc346ac5e2ec64e9 /build/platform/java | |
| parent | c9b7da28978d2ef37df7504cd8cb0ae9c7f9a355 (diff) | |
| download | ydb-06137dfedfcaa35dcd14688f3e4460c4c83dbfba.tar.gz | |
Import Temurin JDK21
Diffstat (limited to 'build/platform/java')
| -rw-r--r-- | build/platform/java/jdk/jdk21/jdk.json | 20 | ||||
| -rw-r--r-- | build/platform/java/jdk/jdk21/ya.make | 10 | ||||
| -rw-r--r-- | build/platform/java/jdk/ya.make | 5 |
3 files changed, 35 insertions, 0 deletions
diff --git a/build/platform/java/jdk/jdk21/jdk.json b/build/platform/java/jdk/jdk21/jdk.json new file mode 100644 index 00000000000..1b4361b55dd --- /dev/null +++ b/build/platform/java/jdk/jdk21/jdk.json @@ -0,0 +1,20 @@ +{ + "by_platform": { + "darwin-arm64": { + "uri": "sbr:5251005068" + }, + "darwin-x86_64": { + "uri": "sbr:5251004826" + }, + "linux-x86_64": { + "uri": "sbr:5251003964" + }, + "linux-aarch64": { + "uri": "sbr:5251004291" + }, + "win32-x86_64": { + "uri": "sbr:5251004470" + } + } +} + diff --git a/build/platform/java/jdk/jdk21/ya.make b/build/platform/java/jdk/jdk21/ya.make new file mode 100644 index 00000000000..51f60e58cc1 --- /dev/null +++ b/build/platform/java/jdk/jdk21/ya.make @@ -0,0 +1,10 @@ +RESOURCES_LIBRARY() + +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}) +ENDIF() + +END() diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make index dd2914f19d2..3c3a23a63f5 100644 --- a/build/platform/java/jdk/ya.make +++ b/build/platform/java/jdk/ya.make @@ -1,7 +1,11 @@ RESOURCES_LIBRARY() +# Add new JDK to build/plugins/java.py (2 times) IF(USE_SYSTEM_JDK) MESSAGE(WARNING DEFAULT_JDK are disabled) +ELSEIF(JDK_REAL_VERSION == "21") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk21/jdk.json) + SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk21/jdk.json) 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) @@ -41,5 +45,6 @@ RECURSE( jdk18 jdk19 jdk20 + jdk21 testing ) |