Remove JDK 10 support from Arcadia Tier 0, remove build configuration for JDK

4 files changed, 1 insertions, 49 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 4e9dcffddb..b8a9fc5bd2 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1082,9 +1082,6 @@ elsewhen ($JDK_VERSION == "15") {
 elsewhen ($JDK_VERSION == "11") {
     JDK_REAL_VERSION=11
 }
-elsewhen ($JDK_VERSION == "10") {
-    JDK_REAL_VERSION=10
-}
 elsewhen ($JDK_VERSION == "8") {
     JDK_REAL_VERSION=8
 }
@@ -1123,9 +1120,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "11") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
     }
-    when ($JDK_REAL_VERSION == "10") {
-        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk10 build/platform/java/jdk/jdk17
-    }
     when ($JDK_REAL_VERSION == "8") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk17
     }
@@ -1153,9 +1147,6 @@ when ($JDK_REAL_VERSION == "15") {
 when ($JDK_REAL_VERSION == "11") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
 }
-when ($JDK_REAL_VERSION == "10") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar10
-}
 when ($JDK_REAL_VERSION == "8") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar8
 }
@@ -1187,9 +1178,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "11") {
         JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "10") {
-        JDK_RESOURCE=$JDK10_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "8") {
         JDK_RESOURCE=$JDK8_RESOURCE_GLOBAL
     }
@@ -1198,7 +1186,7 @@ otherwise {
 # tag:java-specific
 when (!$USE_SYSTEM_ERROR_PRONE) {
     # Still not done: DTCC-667
-    when ($JDK_REAL_VERSION == "8" || $JDK_REAL_VERSION == "10") {
+    when ($JDK_REAL_VERSION == "8") {
         ERROR_PRONE_VERSION=2.3.1
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.3.1
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_3_1_RESOURCE_GLOBAL
@@ -1266,9 +1254,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "11") {
         UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "10") {
-        UBERJAR_RESOURCE=$UBERJAR10_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "8") {
         UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL
     }
@@ -1296,9 +1281,6 @@ when ($JDK_REAL_VERSION == "15") {
 when ($JDK_REAL_VERSION == "11") {
     WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
 }
-when ($JDK_REAL_VERSION == "10") {
-    WITH_JDK_RESOURCE=$WITH_JDK10_RESOURCE_GLOBAL
-}
 when ($JDK_REAL_VERSION == "8") {
     WITH_JDK_RESOURCE=$WITH_JDK8_RESOURCE_GLOBAL
 }
@@ -1855,9 +1837,6 @@ module JSRC_LIBRARY: _BARE_UNIT {
 }
 
 # tag:java-specific
-when ($JDK_REAL_VERSION == "10") {
-    JDK10=yes # remove this later
-}
 JAVA_PROGRAM_CP_USE_COMMAND_FILE=yes
 when ($JDK_REAL_VERSION == "8") {
     JAVA_PROGRAM_CP_USE_COMMAND_FILE=no
diff --git a/build/platform/java/jdk/jdk10/jdk.json b/build/platform/java/jdk/jdk10/jdk.json
deleted file mode 100644
index 23029e3aa5..0000000000
--- a/build/platform/java/jdk/jdk10/jdk.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "by_platform": {
-        "darwin-x86_64": {
-            "uri": "sbr:545649998"
-        },
-        "linux-x86_64": {
-            "uri": "sbr:545649806"
-        },
-        "win32-x86_64": {
-            "uri": "sbr:545648079"
-        }
-    }
-}
-
diff --git a/build/platform/java/jdk/jdk10/ya.make b/build/platform/java/jdk/jdk10/ya.make
deleted file mode 100644
index 0b6947a4eb..0000000000
--- a/build/platform/java/jdk/jdk10/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-RESOURCES_LIBRARY()
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK10 jdk.json)
-
-IF (NOT YANDEXIO_BUILD_TARGET AND NOT OS_ANDROID)
-    DECLARE_EXTERNAL_RESOURCE_BY_JSON(WITH_JDK10 jdk.json)
-ENDIF()
-
-END()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 49bb61708b..86fca1ffa0 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -23,9 +23,6 @@ ELSEIF(JDK_REAL_VERSION == "15")
 ELSEIF(JDK_REAL_VERSION == "11")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk11/jdk.json)
     SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk11/jdk.json)
-ELSEIF(JDK_REAL_VERSION == "10")
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk10/jdk.json)
-    SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk10/jdk.json)
 ELSEIF(JDK_REAL_VERSION == "8")
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk8/jdk.json)
     SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk8/jdk.json)
@@ -41,7 +38,6 @@ END()
 
 RECURSE(
     jdk8
-    jdk10
     jdk11
     jdk15
     jdk16