aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiroslav2 <miroslav2@yandex-team.com>2024-09-02 16:50:56 +0300
committermiroslav2 <miroslav2@yandex-team.com>2024-09-02 17:05:53 +0300
commitb516b7aa59fa1515c7575e8a26bb3eb70546123b (patch)
tree9997dd64b073078bb5761ac3733ff850f46f49f7
parent9ffc849fb8589a5e07af05495a9c603ee0a58c40 (diff)
downloadydb-b516b7aa59fa1515c7575e8a26bb3eb70546123b.tar.gz
Remove Java 15 and tools from `build/conf/java.conf`, `build/plugins/java.py`, `build/platforms/java` and `build/ya.conf.json`
1e4f1616bb7e1dd81dd80cd22295b0b4f0e819ef
-rw-r--r--build/conf/java.conf20
-rw-r--r--build/platform/java/jdk/jdk15/jdk.json17
-rw-r--r--build/platform/java/jdk/jdk15/ya.make10
-rw-r--r--build/platform/java/jdk/ya.make4
-rw-r--r--build/plugins/java.py2
5 files changed, 1 insertions, 52 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index 738eb563b2..8c39aed61d 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
elsewhen ($JDK_VERSION == "17") {
JDK_REAL_VERSION=17
}
-elsewhen ($JDK_VERSION == "15") {
- JDK_REAL_VERSION=15
-}
elsewhen ($JDK_VERSION == "11") {
JDK_REAL_VERSION=11
}
@@ -1261,9 +1258,6 @@ otherwise {
# need jdk11 for spare parts in "host" platform
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
}
- when ($JDK_REAL_VERSION == "15") {
- JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
- }
when ($JDK_REAL_VERSION == "11") {
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
}
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
when ($JDK_REAL_VERSION == "17") {
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
}
-when ($JDK_REAL_VERSION == "15") {
- UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
-}
when ($JDK_REAL_VERSION == "11") {
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
}
@@ -1307,9 +1298,6 @@ otherwise {
when ($JDK_REAL_VERSION == "17") {
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
}
- when ($JDK_REAL_VERSION == "15") {
- JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
- }
when ($JDK_REAL_VERSION == "11") {
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
}
@@ -1318,7 +1306,7 @@ otherwise {
# tag:java-specific
when (!$USE_SYSTEM_ERROR_PRONE) {
# Still not done: DTCC-667
- when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
+ when ($JDK_REAL_VERSION == "11") {
ERROR_PRONE_VERSION=2.7.1
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1372,9 +1360,6 @@ otherwise {
when ($JDK_REAL_VERSION == "17") {
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
}
- when ($JDK_REAL_VERSION == "15") {
- UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
- }
when ($JDK_REAL_VERSION == "11") {
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
}
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
when ($JDK_REAL_VERSION == "17") {
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
}
-when ($JDK_REAL_VERSION == "15") {
- WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
-}
when ($JDK_REAL_VERSION == "11") {
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
}
diff --git a/build/platform/java/jdk/jdk15/jdk.json b/build/platform/java/jdk/jdk15/jdk.json
deleted file mode 100644
index 5d2bc7ae0a..0000000000
--- a/build/platform/java/jdk/jdk15/jdk.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "by_platform": {
- "darwin-arm64": {
- "uri": "sbr:2107376046"
- },
- "darwin-x86_64": {
- "uri": "sbr:1901471162"
- },
- "linux-x86_64": {
- "uri": "sbr:1901452000"
- },
- "win32-x86_64": {
- "uri": "sbr:1901563630"
- }
- }
-}
-
diff --git a/build/platform/java/jdk/jdk15/ya.make b/build/platform/java/jdk/jdk15/ya.make
deleted file mode 100644
index cad2f09f35..0000000000
--- a/build/platform/java/jdk/jdk15/ya.make
+++ /dev/null
@@ -1,10 +0,0 @@
-RESOURCES_LIBRARY()
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK15 jdk.json)
-SET_RESOURCE_URI_FROM_JSON(WITH_JDK15_URI jdk.json)
-
-IF (WITH_JDK15_URI)
- DECLARE_EXTERNAL_RESOURCE(WITH_JDK15 ${WITH_JDK15_URI})
-ENDIF()
-
-END()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index b696766faf..983dfbba15 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -15,9 +15,6 @@ ELSEIF(JDK_REAL_VERSION == "20")
ELSEIF(JDK_REAL_VERSION == "17")
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk17/jdk.json)
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk17/jdk.json)
-ELSEIF(JDK_REAL_VERSION == "15")
- DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk15/jdk.json)
- SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk15/jdk.json)
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)
@@ -33,7 +30,6 @@ END()
RECURSE(
jdk11
- jdk15
jdk17
jdk20
jdk21
diff --git a/build/plugins/java.py b/build/plugins/java.py
index 8c41329c73..c0771722ec 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -100,7 +100,6 @@ def onjava_module(unit, *args):
'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
}
if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in (
- '15',
'17',
'20',
'21',
@@ -372,7 +371,6 @@ def on_jdk_version_macro_check(unit, *args):
jdk_version = args[0]
available_versions = (
'11',
- '15',
'17',
'20',
'21',