Upload new jdk-22+36

https://a.yandex-team.ru/projects/committeejava/ci/actions/flow?dir=devtools%2Fcontrib%2Fprepare_jdk&id=prepare-new-pr&number=41
de043a99ab748eeb392faa161c639dbe11a8aff3

6 files changed, 81 insertions, 1 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 74a260e8ee..fed842aebe 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -413,7 +413,7 @@ when($JDK_VERSION == "8") {
 }
 
 # tag:java-specific
-JDK_LATEST_VERSION=21
+JDK_LATEST_VERSION=22
 JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION}
 
 # tag:java-specific
@@ -1057,6 +1057,11 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
     }
 
+    when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "22") {
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
+        JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
+    }
+
     when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") {
         JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS
         JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS
@@ -1190,6 +1195,9 @@ JAVA_SWIG_DELIM=JAVA_SWIG_DELIM
 JDK_REAL_VERSION=
 JDK_VERSION=
 
+when ($JDK_VERSION == "22") {
+    JDK_REAL_VERSION=22
+}
 when ($JDK_VERSION == "21") {
     JDK_REAL_VERSION=21
 }
@@ -1224,6 +1232,9 @@ when ($USE_SYSTEM_JDK) {
     JDK_RESOURCE_PEERDIR=
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "22") {
+        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk22 build/platform/java/jdk/jdk17
+    }
     when ($JDK_REAL_VERSION == "21") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk21 build/platform/java/jdk/jdk17
     }
@@ -1249,6 +1260,9 @@ otherwise {
 }
 
 # tag:java-specific
+when ($JDK_REAL_VERSION == "22") {
+    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar22
+}
 when ($JDK_REAL_VERSION == "21") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar21
 }
@@ -1277,6 +1291,9 @@ when ($USE_SYSTEM_JDK) {
     JDK_RESOURCE=$USE_SYSTEM_JDK
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "22") {
+        JDK_RESOURCE=$JDK22_RESOURCE_GLOBAL
+    }
     when ($JDK_REAL_VERSION == "21") {
         JDK_RESOURCE=$JDK21_RESOURCE_GLOBAL
     }
@@ -1333,6 +1350,11 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
         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 == "22") {
+        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
+    }
     otherwise {
         ERROR_PRONE_VERSION=2.7.1
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone
@@ -1350,6 +1372,9 @@ when ($USE_SYSTEM_UBERJAR) {
     UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR
 }
 otherwise {
+    when ($JDK_REAL_VERSION == "22") {
+        UBERJAR_RESOURCE=$UBERJAR22_RESOURCE_GLOBAL
+    }
     when ($JDK_REAL_VERSION == "21") {
         UBERJAR_RESOURCE=$UBERJAR21_RESOURCE_GLOBAL
     }
@@ -1374,6 +1399,9 @@ otherwise {
 }
 
 # tag:java-specific
+when ($JDK_REAL_VERSION == "22") {
+    WITH_JDK_RESOURCE=$WITH_JDK22_RESOURCE_GLOBAL
+}
 when ($JDK_REAL_VERSION == "21") {
     WITH_JDK_RESOURCE=$WITH_JDK21_RESOURCE_GLOBAL
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 666079e468..cd3f53693a 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -311,18 +311,23 @@
         "5776380974": "https://devtools-registry.s3.yandex.net/5776380974",
         "5777101734": "https://devtools-registry.s3.yandex.net/5777101734",
         "5909068951": "https://devtools-registry.s3.yandex.net/5909068951",
+        "6043999575": "https://devtools-registry.s3.yandex.net/6043999575",
         "5776379446": "https://devtools-registry.s3.yandex.net/5776379446",
         "5777100597": "https://devtools-registry.s3.yandex.net/5777100597",
         "5909067709": "https://devtools-registry.s3.yandex.net/5909067709",
+        "6043999100": "https://devtools-registry.s3.yandex.net/6043999100",
         "5776375952": "https://devtools-registry.s3.yandex.net/5776375952",
         "5777098178": "https://devtools-registry.s3.yandex.net/5777098178",
         "5909065014": "https://devtools-registry.s3.yandex.net/5909065014",
+        "6043997813": "https://devtools-registry.s3.yandex.net/6043997813",
         "5776374505": "https://devtools-registry.s3.yandex.net/5776374505",
         "5777096988": "https://devtools-registry.s3.yandex.net/5777096988",
         "5909063641": "https://devtools-registry.s3.yandex.net/5909063641",
+        "6043997124": "https://devtools-registry.s3.yandex.net/6043997124",
         "5776377955": "https://devtools-registry.s3.yandex.net/5776377955",
         "5777099502": "https://devtools-registry.s3.yandex.net/5777099502",
         "5909066324": "https://devtools-registry.s3.yandex.net/5909066324",
+        "6043998448": "https://devtools-registry.s3.yandex.net/6043998448",
         "3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
         "3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
         "3064614561": "https://devtools-registry.s3.yandex.net/3064614561",
@@ -715,18 +720,23 @@
         "5776380974": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "5777101734": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "5909068951": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
+        "6043999575": "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",
         "5909067709": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
+        "6043999100": "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",
         "5909065014": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
+        "6043997813": "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",
         "5909063641": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
+        "6043997124": "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",
         "5909066324": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
+        "6043998448": "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",
         "3064614561": "openjdk 11.0.15 vanilla for linux",
diff --git a/build/platform/java/jdk/jdk22/jdk.json b/build/platform/java/jdk/jdk22/jdk.json
new file mode 100644
index 0000000000..854f39d54f
--- /dev/null
+++ b/build/platform/java/jdk/jdk22/jdk.json
@@ -0,0 +1,19 @@
+{
+  "by_platform": {
+    "darwin-arm64": {
+      "uri": "sbr:6043999575"
+    },
+    "darwin-x86_64": {
+      "uri": "sbr:6043999100"
+    },
+    "linux-x86_64": {
+      "uri": "sbr:6043997124"
+    },
+    "linux-aarch64": {
+      "uri": "sbr:6043997813"
+    },
+    "win32-x86_64": {
+      "uri": "sbr:6043998448"
+    }
+  }
+}
diff --git a/build/platform/java/jdk/jdk22/ya.make b/build/platform/java/jdk/jdk22/ya.make
new file mode 100644
index 0000000000..2c8aebe513
--- /dev/null
+++ b/build/platform/java/jdk/jdk22/ya.make
@@ -0,0 +1,17 @@
+RESOURCES_LIBRARY()
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK22 jdk.json)
+SET_RESOURCE_URI_FROM_JSON(WITH_JDK22_URI jdk.json)
+
+IF (WITH_JDK22_URI)
+    DECLARE_EXTERNAL_RESOURCE(WITH_JDK22 ${WITH_JDK22_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 3272028012..17c55396a2 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -3,6 +3,9 @@ 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 == "22")
+    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk22/jdk.json)
+    SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk22/jdk.json)
 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)
@@ -42,6 +45,7 @@ RECURSE(
     jdk18
     jdk20
     jdk21
+    jdk22
     testing
 )
 
diff --git a/build/plugins/java.py b/build/plugins/java.py
index 68c00f72f9..ffd41aa66a 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -145,6 +145,7 @@ def onjava_module(unit, *args):
         '18',
         '20',
         '21',
+        '22',
     ):
         data['ENABLE_PREVIEW'] = extract_macro_calls(unit, 'ENABLE_PREVIEW_VALUE', args_delim)
 
@@ -417,6 +418,7 @@ def on_jdk_version_macro_check(unit, *args):
         '18',
         '20',
         '21',
+        '22',
     )
     if jdk_version not in available_versions:
         ymake.report_configure_error(