From e6a87e4fe0f4d8e5b79902cc7a1635cc41457772 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Thu, 11 Jun 2026 18:12:52 +0000 Subject: [PATCH 1/6] upgrade expansion sevice to Java 17 --- sdks/java/io/expansion-service/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index 60ef89ed223b..60303c12c9ca 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+ - requireJavaVersion: JavaVersion.VERSION_11 + // iceberg requires Java11+ (or 17+ if other features require it) + requireJavaVersion: JavaVersion.VERSION_17 ) // We don't want to use the latest version for the entire beam sdk since beam Java users can override it themselves. From b08fdf730ea240a4153db84b1e257b6d3db27f5f Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Thu, 11 Jun 2026 18:14:14 +0000 Subject: [PATCH 2/6] update comment --- sdks/java/io/expansion-service/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index 60303c12c9ca..97c945e2e6f9 100644 --- a/sdks/java/io/expansion-service/build.gradle +++ b/sdks/java/io/expansion-service/build.gradle @@ -25,7 +25,7 @@ applyJavaNature( exportJavadoc: false, validateShadowJar: false, shadowClosure: {}, - // iceberg requires Java11+ (or 17+ if other features require it) + // iceberg requires Java11+ and delta lake requires Java17+ requireJavaVersion: JavaVersion.VERSION_17 ) From a35337c98ae03080424c070bd7b8f797bd78bf88 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Thu, 11 Jun 2026 21:14:05 +0000 Subject: [PATCH 3/6] add container and workflow change --- .github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml | 2 +- sdks/java/expansion-service/container/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml index 959f36234d70..1dfab40f552d 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: default + java-version: '17' 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 968f5cd2ac25..513dd6b75b88 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:11 +FROM eclipse-temurin:17 LABEL Author "Apache Beam " ARG TARGETOS ARG TARGETARCH From df2bfdd26131e5ad409d119cc34e614235707527 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Fri, 12 Jun 2026 04:01:22 +0000 Subject: [PATCH 4/6] try something --- .github/actions/setup-environment-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml index 06633c6c7279..1e070b520221 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' && '11' || inputs.java-version }} + java-version: ${{ inputs.java-version == 'default' && (contains(github.job, 'Xlang_Generated_Transforms') && '17' || '11') || inputs.java-version }} - name: Setup Gradle uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0 with: From 6bcab531824f3bc82b769b7a1ddf478552c19b0c Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Fri, 12 Jun 2026 13:39:38 +0000 Subject: [PATCH 5/6] Add PreCommit_Java to run on Java 17 in setup-environment-action --- .github/actions/setup-environment-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml index 1e070b520221..43f93d4cebe2 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_Generated_Transforms') && '17' || '11') || inputs.java-version }} + java-version: ${{ inputs.java-version == 'default' && ((contains(github.job, 'Xlang_Generated_Transforms') || contains(github.job, 'PreCommit_Java')) && '17' || '11') || inputs.java-version }} - name: Setup Gradle uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0 with: From 48dc72735d4817373ac675780707c7cca911ef8f Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Fri, 12 Jun 2026 17:24:13 +0000 Subject: [PATCH 6/6] add more coverage --- .github/actions/setup-environment-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml index 43f93d4cebe2..daa3daa1cd52 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_Generated_Transforms') || contains(github.job, 'PreCommit_Java')) && '17' || '11') || inputs.java-version }} + java-version: ${{ inputs.java-version == 'default' && ((contains(github.job, 'Xlang') || contains(github.job, 'XVR') || contains(github.job, 'PreCommit_Java')) && '17' || '11') || inputs.java-version }} - name: Setup Gradle uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0 with: