summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Milanesio <luca.milanesio@gmail.com>2024-04-29 10:55:20 +0100
committerLuca Milanesio <luca.milanesio@gmail.com>2024-04-29 10:54:48 +0000
commite16162af9840f7e316ab2bf8c1ffc6261e7966a8 (patch)
tree8ac49c34fe97c8279172fd4bdb73d524dff61316
parentb8a2304ded962891b41b83d0aeefb629973745e0 (diff)
Drop support for Java 11
Java 11 is EOL since September 2023 (see [1]) and Gerrit has been supporting Java 17 for many releases. Drop the support for building Gerrit using Java 11 and make Java 17 the default minimal supported version. Also set the IntelliJ language level to 17. [1] https://www.oracle.com/uk/java/technologies/java-se-support-roadmap.html Release-Notes: Drop support for Java 11 Change-Id: Id8bf939477d1bca74ee160b485d587d32a3f0eb8
-rw-r--r--.bazelproject2
-rw-r--r--.bazelrc19
-rw-r--r--tools/BUILD11
-rw-r--r--tools/defs.bzl2
-rwxr-xr-xtools/eclipse/project.py2
5 files changed, 2 insertions, 34 deletions
diff --git a/.bazelproject b/.bazelproject
index ad7b022328..0f2ff90381 100644
--- a/.bazelproject
+++ b/.bazelproject
@@ -16,7 +16,7 @@ directories:
targets:
//...:all
-java_language_level: 11
+java_language_level: 17
workspace_type: java
diff --git a/.bazelrc b/.bazelrc
index 96620783d1..480bea79c6 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -32,25 +32,6 @@ build:remote_gcp --config=remote
build:remote_bb --config=config_bb
build:remote_bb --config=build_shared
-# Define configuration using remotejdk_11, executes using remotejdk_11 or local_jdk
-build:build_java11_shared --java_language_version=11
-build:build_java11_shared --java_runtime_version=remotejdk_11
-build:build_java11_shared --tool_java_language_version=11
-build:build_java11_shared --tool_java_runtime_version=remotejdk_11
-
-build:java11 --config=build_java11_shared
-
-# Builds and executes on Google GCP RBE using remotejdk_11
-build:remote11 --config=config_gcp
-build:remote11 --config=build_java11_shared
-
-# Define remote11 configuration alias
-build:remote11_gcp --config=remote11
-
-# Builds and executes on BuildBuddy RBE using remotejdk_11
-build:remote11_bb --config=config_bb
-build:remote11_bb --config=build_java11_shared
-
# Builds using remotejdk_21, executes using remotejdk_21 or local_jdk
build:build_java21_shared --java_language_version=21
build:build_java21_shared --java_runtime_version=remotejdk_21
diff --git a/tools/BUILD b/tools/BUILD
index 71ad096e55..ed55a4f8e4 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -7,17 +7,6 @@ load("@rules_java//java:defs.bzl", "java_package_configuration")
exports_files(["nongoogle.bzl"])
-default_java_toolchain(
- name = "error_prone_warnings_toolchain_java11",
- configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
- package_configuration = [
- ":error_prone",
- ],
- source_version = "11",
- target_version = "11",
- visibility = ["//visibility:public"],
-)
-
[default_java_toolchain(
name = "error_prone_warnings_toolchain_java" + VERSION,
configuration = dict(),
diff --git a/tools/defs.bzl b/tools/defs.bzl
index ff207b38a7..672c6f9431 100644
--- a/tools/defs.bzl
+++ b/tools/defs.bzl
@@ -6,8 +6,6 @@ def gerrit_init():
"""
protobuf_deps()
- native.register_toolchains("//tools:error_prone_warnings_toolchain_java11_definition")
-
native.register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition")
native.register_toolchains("//tools:error_prone_warnings_toolchain_java21_definition")
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index a3f4d8fad3..9a28d9de1f 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -49,7 +49,7 @@ opts.add_argument('--name', help='name of the generated project',
opts.add_argument('-b', '--batch', action='store_true',
dest='batch', help='Bazel batch option')
opts.add_argument('-j', '--java', action='store',
- dest='java', help='Post Java 11')
+ dest='java', help='Post Java 17')
opts.add_argument('--bazel',
help=('name of the bazel executable. Defaults to using'
' bazelisk if found, or bazel if bazelisk is not'