aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiroslav2 <miroslav2@yandex-team.com>2024-04-15 08:41:57 +0300
committermiroslav2 <miroslav2@yandex-team.com>2024-04-15 08:52:39 +0300
commit969a7065950f3f4c76d45c7bb813a3e27df8a466 (patch)
tree82212b7b35b605a9529a6e12972db2808a6d4520
parentbc1a3f28621db97f32a585ce4e3f86d06877cfeb (diff)
downloadydb-969a7065950f3f4c76d45c7bb813a3e27df8a466.tar.gz
Remove JDK 8 from autocheck
98f6b93b520d3c28dfbd36b449bc23c9dcaae862
-rw-r--r--build/conf/java.conf25
-rw-r--r--build/platform/java/jdk/jdk8/jdk.json17
-rw-r--r--build/platform/java/jdk/jdk8/ya.make10
-rw-r--r--build/platform/java/jdk/ya.make4
4 files changed, 1 insertions, 55 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index fed842aebe..f2cd6861b0 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -1216,9 +1216,6 @@ elsewhen ($JDK_VERSION == "15") {
elsewhen ($JDK_VERSION == "11") {
JDK_REAL_VERSION=11
}
-elsewhen ($JDK_VERSION == "8") {
- JDK_REAL_VERSION=8
-}
elsewhen ($MAPSMOBI_BUILD_TARGET && $OS_ANDROID) {
JDK_REAL_VERSION=11
}
@@ -1254,9 +1251,6 @@ otherwise {
when ($JDK_REAL_VERSION == "11") {
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
}
- when ($JDK_REAL_VERSION == "8") {
- JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk17
- }
}
# tag:java-specific
@@ -1281,9 +1275,6 @@ when ($JDK_REAL_VERSION == "15") {
when ($JDK_REAL_VERSION == "11") {
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
}
-when ($JDK_REAL_VERSION == "8") {
- UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar8
-}
# tag:java-specific
JAVAC_OPTS=
@@ -1312,20 +1303,12 @@ otherwise {
when ($JDK_REAL_VERSION == "11") {
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
}
- when ($JDK_REAL_VERSION == "8") {
- JDK_RESOURCE=$JDK8_RESOURCE_GLOBAL
- }
}
# tag:java-specific
when (!$USE_SYSTEM_ERROR_PRONE) {
# Still not done: DTCC-667
- 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
- }
- elsewhen ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
+ when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
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
@@ -1393,9 +1376,6 @@ otherwise {
when ($JDK_REAL_VERSION == "11") {
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
}
- when ($JDK_REAL_VERSION == "8") {
- UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL
- }
}
# tag:java-specific
@@ -1420,9 +1400,6 @@ when ($JDK_REAL_VERSION == "15") {
when ($JDK_REAL_VERSION == "11") {
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
}
-when ($JDK_REAL_VERSION == "8") {
- WITH_JDK_RESOURCE=$WITH_JDK8_RESOURCE_GLOBAL
-}
# tag:java-specific
EXTERNAL_JAVA_JDK_RESOURCE=
diff --git a/build/platform/java/jdk/jdk8/jdk.json b/build/platform/java/jdk/jdk8/jdk.json
deleted file mode 100644
index fc642004df..0000000000
--- a/build/platform/java/jdk/jdk8/jdk.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "by_platform": {
- "darwin-arm64": {
- "uri": "sbr:1901326056"
- },
- "darwin-x86_64": {
- "uri": "sbr:1901326056"
- },
- "linux-x86_64": {
- "uri": "sbr:1901306329"
- },
- "win32-x86_64": {
- "uri": "sbr:1901510679"
- }
- }
-}
-
diff --git a/build/platform/java/jdk/jdk8/ya.make b/build/platform/java/jdk/jdk8/ya.make
deleted file mode 100644
index dd8cdeffc9..0000000000
--- a/build/platform/java/jdk/jdk8/ya.make
+++ /dev/null
@@ -1,10 +0,0 @@
-RESOURCES_LIBRARY()
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK8 jdk.json)
-SET_RESOURCE_URI_FROM_JSON(WITH_JDK8_URI jdk.json)
-
-IF (WITH_JDK8_URI)
- DECLARE_EXTERNAL_RESOURCE(WITH_JDK8 ${WITH_JDK8_URI})
-ENDIF()
-
-END()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 17c55396a2..34094807c9 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -24,9 +24,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 == "8")
- DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk8/jdk.json)
- SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk8/jdk.json)
ELSE()
MESSAGE(FATAL_ERROR Unsupported JDK version ${JDK_REAL_VERSION})
ENDIF()
@@ -38,7 +35,6 @@ ENDIF()
END()
RECURSE(
- jdk8
jdk11
jdk15
jdk17