This is an automated email from the ASF dual-hosted git repository.
derrickaw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 98e29d99fcd Revert "Upgrade expansion jar to java17 (#38931)" (#38965)
98e29d99fcd is described below
commit 98e29d99fcdade4879f0361e7ee1ffdc46abb54d
Author: Yi Hu <[email protected]>
AuthorDate: Mon Jun 15 13:52:58 2026 -0400
Revert "Upgrade expansion jar to java17 (#38931)" (#38965)
This reverts commit b3a62ee97c7ce436fc70dfc7d13f94dd97038b1b.
---
.github/actions/setup-environment-action/action.yml | 2 +-
.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml | 2 +-
sdks/java/expansion-service/container/Dockerfile | 2 +-
sdks/java/io/expansion-service/build.gradle | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/actions/setup-environment-action/action.yml
b/.github/actions/setup-environment-action/action.yml
index daa3daa1cd5..06633c6c727 100644
--- a/.github/actions/setup-environment-action/action.yml
+++ b/.github/actions/setup-environment-action/action.yml
@@ -74,7 +74,7 @@ runs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: ${{ inputs.java-version == 'default' &&
((contains(github.job, 'Xlang') || contains(github.job, 'XVR') ||
contains(github.job, 'PreCommit_Java')) && '17' || '11') || inputs.java-version
}}
+ java-version: ${{ inputs.java-version == 'default' && '11' ||
inputs.java-version }}
- name: Setup Gradle
uses:
gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
with:
diff --git a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml
b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml
index 1dfab40f552..959f36234d7 100644
--- a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml
+++ b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml
@@ -102,7 +102,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
- java-version: '17'
+ java-version: default
python-version: ${{ matrix.python_version }}
- name: Set PY_VER_CLEAN
id: set_py_ver_clean
diff --git a/sdks/java/expansion-service/container/Dockerfile
b/sdks/java/expansion-service/container/Dockerfile
index 513dd6b75b8..968f5cd2ac2 100644
--- a/sdks/java/expansion-service/container/Dockerfile
+++ b/sdks/java/expansion-service/container/Dockerfile
@@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
-FROM eclipse-temurin:17
+FROM eclipse-temurin:11
LABEL Author "Apache Beam <[email protected]>"
ARG TARGETOS
ARG TARGETARCH
diff --git a/sdks/java/io/expansion-service/build.gradle
b/sdks/java/io/expansion-service/build.gradle
index f7b241a7594..70a3fce538b 100644
--- a/sdks/java/io/expansion-service/build.gradle
+++ b/sdks/java/io/expansion-service/build.gradle
@@ -25,8 +25,8 @@ applyJavaNature(
exportJavadoc: false,
validateShadowJar: false,
shadowClosure: {},
- // iceberg requires Java11+ and delta lake requires Java17+
- requireJavaVersion: JavaVersion.VERSION_17
+ // iceberg requires Java11+
+ requireJavaVersion: JavaVersion.VERSION_11
)
// We don't want to use the latest version for the entire beam sdk since beam
Java users can override it themselves.
