From 7d2330c943b5796fad80a84393b788373f61758d Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Fri, 16 Feb 2024 12:57:14 -0500
Subject: [PATCH] Update beam pipeline base Java version to Java 17 (#2328)

---
 .java-version                  | 1 +
 build.gradle                   | 5 +++--
 release/stage_beam_pipeline.sh | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 .java-version

diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..98d9bcb75
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/build.gradle b/build.gradle
index ea2ec5408..7983a8b88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -383,8 +383,9 @@ subprojects {
   apply from: "${rootDir.path}/java_common.gradle"
 
   // When changing Java version here, be sure to update BEAM Java runtime:
-  // in core/build.gradle, search for `flex-template-base-image` and update
-  // the parameter value.
+  // search for `flex-template-base-image` and update the parameter value.
+  // There are at least two instances, one in core/build.gradle, one in
+  // release/stage_beam_pipeline.sh
   sourceCompatibility = JavaVersion.VERSION_17
   targetCompatibility = JavaVersion.VERSION_17
 
diff --git a/release/stage_beam_pipeline.sh b/release/stage_beam_pipeline.sh
index f291beea6..8247e6dce 100755
--- a/release/stage_beam_pipeline.sh
+++ b/release/stage_beam_pipeline.sh
@@ -71,7 +71,7 @@ while (( "$#" > 0 )); do
     "gs://${dev_project}-deploy/${release_tag}/beam/${metadata_basename}" \
     --image-gcr-path "${image_name}:${release_tag}" \
     --sdk-language "JAVA" \
-    --flex-template-base-image JAVA11 \
+    --flex-template-base-image JAVA17 \
     --metadata-file "./core/src/main/resources/${metadata_pathname}" \
     --jar "./core/build/libs/${uberjar_name}.jar" \
     --env FLEX_TEMPLATE_JAVA_MAIN_CLASS="${main_class}" \