Skip to content

Commit b3a62ee

Browse files
authored
Upgrade expansion jar to java17 (#38931)
* upgrade expansion sevice to Java 17 * update comment * add container and workflow change * try something * Add PreCommit_Java to run on Java 17 in setup-environment-action * add more coverage
1 parent 001093e commit b3a62ee

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/actions/setup-environment-action/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ runs:
7474
uses: actions/setup-java@v3
7575
with:
7676
distribution: 'temurin'
77-
java-version: ${{ inputs.java-version == 'default' && '11' || inputs.java-version }}
77+
java-version: ${{ inputs.java-version == 'default' && ((contains(github.job, 'Xlang') || contains(github.job, 'XVR') || contains(github.job, 'PreCommit_Java')) && '17' || '11') || inputs.java-version }}
7878
- name: Setup Gradle
7979
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
8080
with:

.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- name: Setup environment
103103
uses: ./.github/actions/setup-environment-action
104104
with:
105-
java-version: default
105+
java-version: '17'
106106
python-version: ${{ matrix.python_version }}
107107
- name: Set PY_VER_CLEAN
108108
id: set_py_ver_clean

sdks/java/expansion-service/container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# limitations under the License.
1717
###############################################################################
1818

19-
FROM eclipse-temurin:11
19+
FROM eclipse-temurin:17
2020
LABEL Author "Apache Beam <dev@beam.apache.org>"
2121
ARG TARGETOS
2222
ARG TARGETARCH

sdks/java/io/expansion-service/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ applyJavaNature(
2525
exportJavadoc: false,
2626
validateShadowJar: false,
2727
shadowClosure: {},
28-
// iceberg requires Java11+
29-
requireJavaVersion: JavaVersion.VERSION_11
28+
// iceberg requires Java11+ and delta lake requires Java17+
29+
requireJavaVersion: JavaVersion.VERSION_17
3030
)
3131

3232
// We don't want to use the latest version for the entire beam sdk since beam Java users can override it themselves.

0 commit comments

Comments
 (0)