intermediate changes

ref:489c487087adbbffdc59e875df6227bdb2f0bc23

4 files changed, 30 insertions, 30 deletions

diff --git a/build/platform/java/jdk/jdk11/ya.make b/build/platform/java/jdk/jdk11/ya.make
index ae450c9c97..fcba316390 100644
--- a/build/platform/java/jdk/jdk11/ya.make
+++ b/build/platform/java/jdk/jdk11/ya.make
@@ -22,7 +22,7 @@ ENDIF()
 
 IF(SANITIZER_TYPE == "address")
     IF(HOST_OS_LINUX)
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS11 ${JDK11_LINUX_ASAN})
+        DECLARE_EXTERNAL_RESOURCE(JDK11_FOR_TESTS ${JDK11_LINUX_ASAN})
     ELSE()
         MESSAGE(FATAL_ERROR Unsupported platform for JDK11 with asan)
     ENDIF()
diff --git a/build/platform/java/jdk/jdk13/ya.make b/build/platform/java/jdk/jdk13/ya.make
index 527af68fb2..508cb6c750 100644
--- a/build/platform/java/jdk/jdk13/ya.make
+++ b/build/platform/java/jdk/jdk13/ya.make
@@ -19,7 +19,7 @@ ENDIF()
 
 IF(SANITIZER_TYPE == "address")
     IF(HOST_OS_LINUX)
-        DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
+        DECLARE_EXTERNAL_RESOURCE(JDK13_FOR_TESTS ${JDK13_LINUX_ASAN})
     ELSE()
         MESSAGE(FATAL_ERROR Unsupported platform for JDK13 with asan)
     ENDIF()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 909ae36e18..2d9eb394fa 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -3,7 +3,7 @@ OWNER(heretic)
 
 INCLUDE(resources.inc)
 
-IF(JDK_VERSION == "17")
+IF(JDK_REAL_VERSION == "17")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK17_DARWIN} FOR DARWIN
@@ -14,7 +14,7 @@ IF(JDK_VERSION == "17")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK17)
     ENDIF()
-ELSEIF(JDK_VERSION == "16")
+ELSEIF(JDK_REAL_VERSION == "16")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK16_DARWIN} FOR DARWIN
@@ -25,7 +25,7 @@ ELSEIF(JDK_VERSION == "16")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK16)
     ENDIF()
-ELSEIF(JDK_VERSION == "15")
+ELSEIF(JDK_REAL_VERSION == "15")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK15_DARWIN} FOR DARWIN
@@ -36,7 +36,7 @@ ELSEIF(JDK_VERSION == "15")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK15)
     ENDIF()
-ELSEIF(JDK_VERSION == "14")
+ELSEIF(JDK_REAL_VERSION == "14")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK14_DARWIN} FOR DARWIN
@@ -46,7 +46,7 @@ ELSEIF(JDK_VERSION == "14")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK14)
     ENDIF()
-ELSEIF(JDK_VERSION == "13")
+ELSEIF(JDK_REAL_VERSION == "13")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK13_DARWIN} FOR DARWIN
@@ -56,7 +56,7 @@ ELSEIF(JDK_VERSION == "13")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK13)
     ENDIF()
-ELSEIF(JDK_VERSION == "12")
+ELSEIF(JDK_REAL_VERSION == "12")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK12_DARWIN} FOR DARWIN
@@ -66,7 +66,7 @@ ELSEIF(JDK_VERSION == "12")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK12)
     ENDIF()
-ELSEIF(JDK_VERSION == "11")
+ELSEIF(JDK_REAL_VERSION == "11")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK11_DARWIN} FOR DARWIN
@@ -77,14 +77,14 @@ ELSEIF(JDK_VERSION == "11")
     IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
         MESSAGE(FATAL_ERROR Unsupported platform for JDK11)
     ENDIF()
-ELSEIF(JDK_VERSION == "10")
+ELSEIF(JDK_REAL_VERSION == "10")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK10_DARWIN} FOR DARWIN
         ${JDK10_LINUX} FOR LINUX
         ${JDK10_WINDOWS} FOR WIN32
     )
-ELSEIF(JDK_VERSION == "8")
+ELSEIF(JDK_REAL_VERSION == "8")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK_DEFAULT
         ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
@@ -96,12 +96,12 @@ ELSEIF(JDK_VERSION == "8")
         MESSAGE(FATAL_ERROR Unsupported platform for JDK8)
     ENDIF()
 ELSE()
-    MESSAGE(FATAL_ERROR Unsupported JDK version)
+    MESSAGE(FATAL_ERROR Unsupported JDK version ${JDK_REAL_VERSION})
 ENDIF()
 
 IF(USE_SYSTEM_JDK)
     MESSAGE(WARNING System JDK $USE_SYSTEM_JDK will be used)
-ELSEIF(JDK_VERSION == "17")
+ELSEIF(JDK_REAL_VERSION == "17")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK17_DARWIN} FOR DARWIN
@@ -122,7 +122,7 @@ ELSEIF(JDK_VERSION == "17")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK17_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "16")
+ELSEIF(JDK_REAL_VERSION == "16")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK16_DARWIN} FOR DARWIN
@@ -143,7 +143,7 @@ ELSEIF(JDK_VERSION == "16")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "15")
+ELSEIF(JDK_REAL_VERSION == "15")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK15_DARWIN} FOR DARWIN
@@ -164,7 +164,7 @@ ELSEIF(JDK_VERSION == "15")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "14")
+ELSEIF(JDK_REAL_VERSION == "14")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK14_DARWIN} FOR DARWIN
@@ -182,7 +182,7 @@ ELSEIF(JDK_VERSION == "14")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "13")
+ELSEIF(JDK_REAL_VERSION == "13")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK13_DARWIN} FOR DARWIN
@@ -207,7 +207,7 @@ ELSEIF(JDK_VERSION == "13")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "12")
+ELSEIF(JDK_REAL_VERSION == "12")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK12_DARWIN} FOR DARWIN
@@ -225,7 +225,7 @@ ELSEIF(JDK_VERSION == "12")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "11")
+ELSEIF(JDK_REAL_VERSION == "11")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK11_DARWIN} FOR DARWIN
@@ -253,7 +253,7 @@ ELSEIF(JDK_VERSION == "11")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "10")
+ELSEIF(JDK_REAL_VERSION == "10")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK10_DARWIN} FOR DARWIN
@@ -271,7 +271,7 @@ ELSEIF(JDK_VERSION == "10")
     ELSEIF(OS_WINDOWS)
         DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS})
     ENDIF()
-ELSEIF(JDK_VERSION == "8")
+ELSEIF(JDK_REAL_VERSION == "8")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         JDK
         ${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
diff --git a/build/platform/java/uberjar/ya.make b/build/platform/java/uberjar/ya.make
index 29c934d5b1..a4214abccf 100644
--- a/build/platform/java/uberjar/ya.make
+++ b/build/platform/java/uberjar/ya.make
@@ -3,23 +3,23 @@ OWNER(heretic)
 
 IF(USE_SYSTEM_UBERJAR)
     MESSAGE(WARNING System uberjar $USE_SYSTEM_UBERJAR will be used)
-ELSEIF(JDK_VERSION == "17")
+ELSEIF(JDK_REAL_VERSION == "17")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343)
-ELSEIF(JDK_VERSION == "16")
+ELSEIF(JDK_REAL_VERSION == "16")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2199772343)
-ELSEIF(JDK_VERSION == "15")
+ELSEIF(JDK_REAL_VERSION == "15")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:2074702997)
-ELSEIF(JDK_VERSION == "14")
+ELSEIF(JDK_REAL_VERSION == "14")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1407329657)
-ELSEIF(JDK_VERSION == "13")
+ELSEIF(JDK_REAL_VERSION == "13")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:1165818979)
-ELSEIF(JDK_VERSION == "12")
+ELSEIF(JDK_REAL_VERSION == "12")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940)
-ELSEIF(JDK_VERSION == "11")
+ELSEIF(JDK_REAL_VERSION == "11")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962498940)
-ELSEIF(JDK_VERSION == "10" OR JDK10) # !JDK10 flag is deprecated, this check should be removed later
+ELSEIF(JDK_REAL_VERSION == "10" OR JDK10) # !JDK10 flag is deprecated, this check should be removed later
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:720309903)
-ELSEIF(JDK_VERSION == "8")
+ELSEIF(JDK_REAL_VERSION == "8")
     DECLARE_EXTERNAL_RESOURCE(UBERJAR sbr:962511340)
 ELSE()
     MESSAGE(FATAL_ERROR Uberjar is not supported for selected JDK version)