Set java version to JDK21

Change-Id: I2ae6f6b1d59f7dd3974699d8fd4441c198c425ff

Author: hsudhof

.bazelrc

@@ -10,10 +10,10 @@ build --jvmopt='-Dfile.encoding=UTF-8'
 build --test_env='LANG=en_US.UTF-8'
 test --test_env=PATH
 
-build --java_language_version=11
-test --java_language_version=11
-build --tool_java_language_version=11
-test --tool_java_language_version=11
+build --java_language_version=21
+test --java_language_version=21
+build --tool_java_language_version=21
+test --tool_java_language_version=21
 
 
 ################################################################################

Dockerfile

@@ -23,7 +23,7 @@ FROM gcr.io/bazel-public/bazel${BAZEL_VERSION} AS build
 
 USER root
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y openjdk-17-jdk-headless && \
+    apt-get install --no-install-recommends -y openjdk-21-jdk-headless && \
     rm -rf /var/lib/apt/lists/*
 
 # Bazel does not allow running as root
@@ -32,7 +32,7 @@ USER ubuntu
 WORKDIR /home/ubuntu/
 COPY . . 
 
-RUN bazel build //java/com/google/copybara:copybara_deploy.jar --java_language_version=11 --tool_java_language_version=11 --java_runtime_version=remotejdk_11
+RUN bazel build //java/com/google/copybara:copybara_deploy.jar --java_language_version=21 --tool_java_language_version=21 --java_runtime_version=remotejdk_21
 
 # Use jammy to drop Python 2
 FROM docker.io/eclipse-temurin:17-jre-jammy

cloudbuild.yaml

@@ -20,7 +20,7 @@ steps:
 - name: 'ubuntu'
   args: ["rm", "-rf", "/workspace/.git"]
 - name: 'ci'
-  args: ["test", "--enable_bzlmod=false", "--java_language_version=11", "--tool_java_language_version=11", "--java_runtime_version=remotejdk_11", "--test_output=errors", "--subcommands",  "--sandbox_tmpfs_path=/tmp", "--jobs=1000", "--", "..."]
+  args: ["test", "--enable_bzlmod=false", "--java_language_version=21", "--tool_java_language_version=21", "--java_runtime_version=remotejdk_21", "--tool_java_runtime_version=remotejdk_21","--test_output=errors", "--subcommands",  "--sandbox_tmpfs_path=/tmp", "--jobs=1000", "--", "..."]
 options:
   machine_type: N1_HIGHCPU_32
 substitutions:

cloudbuild_setup.sh

@@ -17,7 +17,7 @@ apt-get install -y locales
 apt-get install -y mercurial
 apt-get install -y lsb-release
 apt-get install -y software-properties-common
-apt install -y openjdk-17-jdk openjdk-17-jre
+apt install -y openjdk-21-jdk openjdk-21-jre
 add-apt-repository ppa:git-core/ppa -y
 apt install git -y
 

javatests/com/google/copybara/WorkflowTest.java

@@ -185,16 +185,16 @@ public void setup() throws Exception {
     originFiles = "glob(['**'], exclude = ['copy.bara.sky', 'excluded/**'])";
     destinationFiles = "glob(['**'])";
     destination = new RecordsProcessCallDestination();
-    transformations = ImmutableList.of(""
-        + "        core.replace(\n"
-        + "             before = '${linestart}${number}',\n"
-        + "             after = '${linestart}" + PREFIX + "${number}',\n"
-        + "             regex_groups = {\n"
-        + "                 'number'    : '[0-9]+',\n"
-        + "                 'linestart' : '^',\n"
-        + "             },\n"
-        + "             multiline = True,"
-        + "        )");
+    transformations = ImmutableList.of(String.format("""
+            core.replace(
+                before = '${linestart}${number}',
+                after = '${linestart}%s${number}',
+                regex_groups = {
+                  'number'    : '[0-9]+',
+                  'linestart' : '^',
+                },
+                multiline = True,
+            )""", PREFIX));
     TestingConsole console = new TestingConsole();
     options.setConsole(console);
     options.testingOptions.origin = origin;