Skip to content

Commit 0e19bf6

Browse files
AbacnAbacn
committed
Bump CI Java version to Java21
1 parent a2a14f5 commit 0e19bf6

46 files changed

Lines changed: 251 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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@v4
7575
with:
7676
distribution: 'temurin'
77-
java-version: ${{ inputs.java-version == 'default' && '11' || inputs.java-version }}
77+
java-version: ${{ inputs.java-version == 'default' && '21' || inputs.java-version }}
7878
- name: Setup Gradle
7979
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
8080
with:

‎.github/gh-actions-self-hosted-runners/arc/images/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN docker buildx install && docker buildx version
2626
USER root
2727
# Native build toolchain for Python C extensions.
2828
RUN apt-get update && \
29-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential time rsync openssh-client && \
29+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential time rsync openssh-client wget && \
3030
rm -rf /var/lib/apt/lists/*
3131
#Install Node
3232
RUN curl -OL https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.xz && \
@@ -41,16 +41,16 @@ RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \
4141
rm go${go_version}.linux-amd64.tar.gz
4242
ENV PATH="${PATH}:/usr/local/go/bin"
4343
#Install Java
44-
RUN curl -OL https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
45-
tar -C /usr/local -xzf zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
46-
rm zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
47-
mv /usr/local/zulu11.74.15-ca-jdk11.0.24-linux_x64 /usr/local/java
44+
RUN curl -OL https://cdn.azul.com/zulu/bin/zulu21.50.19-ca-jdk21.0.11-linux_x64.tar.gz && \
45+
tar -C /usr/local -xzf zulu21.50.19-ca-jdk21.0.11-linux_x64.tar.gz && \
46+
rm zulu21.50.19-ca-jdk21.0.11-linux_x64.tar.gz && \
47+
mv /usr/local/zulu21.50.19-ca-jdk21.0.11-linux_x64 /usr/local/java
4848
ENV PATH="${PATH}:/usr/local/java/bin"
4949
#Install Gradle
50-
RUN curl -OL https://services.gradle.org/distributions/gradle-8.4-bin.zip && \
51-
unzip gradle-8.4-bin.zip && \
52-
rm gradle-8.4-bin.zip && \
53-
mv gradle-8.4 /usr/local/gradle
50+
RUN curl -OL https://services.gradle.org/distributions/gradle-8.14.3-bin.zip && \
51+
unzip gradle-8.14.3-bin.zip && \
52+
rm gradle-8.14.3-bin.zip && \
53+
mv gradle-8.14.3 /usr/local/gradle
5454
ENV PATH="${PATH}:/usr/local/gradle/bin"
5555
#Install GitHub CLI
5656
RUN curl -OL https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz && \

‎.github/workflows/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ PreCommit Jobs run in a schedule and also get triggered in a PR if relevant sour
241241
| [ PreCommit Java Debezium IO Direct ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Debezium_IO_Direct.yml) | N/A |`Run Java_Debezium_IO_Direct PreCommit`| [![.github/workflows/beam_PreCommit_Java_Debezium_IO_Direct.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Debezium_IO_Direct.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Debezium_IO_Direct.yml?query=event%3Aschedule) |
242242
| [ PreCommit Java ElasticSearch IO Direct ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_ElasticSearch_IO_Direct.yml) | N/A |`Run Java_ElasticSearch_IO_Direct PreCommit`| [![.github/workflows/beam_PreCommit_Java_ElasticSearch_IO_Direct.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_ElasticSearch_IO_Direct.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_ElasticSearch_IO_Direct.yml?query=event%3Aschedule) |
243243
| [ PreCommit Java Examples Dataflow ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow.yml) | N/A |`Run Java_Examples_Dataflow PreCommit`| [![.github/workflows/beam_PreCommit_Java_Examples_Dataflow.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow.yml?query=event%3Aschedule) |
244-
| [ PreCommit Java Examples Dataflow Java21 ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml) | N/A | `Run Java_Examples_Dataflow_Java21 PreCommit` | [![.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml?query=event%3Aschedule) |
244+
| [ PreCommit Java Examples Dataflow Java11 ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml) | N/A | `Run Java_Examples_Dataflow_Java11 PreCommit` | [![.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml?query=event%3Aschedule) |
245245
| [ PreCommit Java File-schema-transform IO Direct ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_File-schema-transform_IO_Direct.yml) | N/A |`Run Java_File-schema-transform_IO_Direct PreCommit`| [![.github/workflows/beam_PreCommit_Java_File-schema-transform_IO_Direct.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_File-schema-transform_IO_Direct.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_File-schema-transform_IO_Direct.yml?query=event%3Aschedule) |
246246
| [ PreCommit Java Flink Versions ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Flink_Versions.yml) | N/A |`Run Java_Flink_Versions PreCommit`| [![.github/workflows/beam_PreCommit_Java_Flink_Versions.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Flink_Versions.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_Flink_Versions.yml?query=event%3Aschedule) |
247247
| [ PreCommit Java GCP IO Direct ](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml) | N/A |`Run Java_GCP_IO_Direct PreCommit`| [![.github/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PreCommit_Java_GCP_IO_Direct.yml?query=event%3Aschedule) |

‎.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ jobs:
7373
- name: Setup environment
7474
uses: ./.github/actions/setup-environment-action
7575
with:
76-
java-version: |
77-
17
78-
11
76+
java-version: default
7977
python-version: default
8078
- name: Set k8s access
8179
uses: ./.github/actions/setup-k8s-access
@@ -182,8 +180,6 @@ jobs:
182180
uses: ./.github/actions/gradle-command-self-hosted-action
183181
with:
184182
gradle-command: :sdks:java:io:expansion-service:shadowJar
185-
arguments: |
186-
-Pjava17Home=$JAVA_HOME_17_X64
187183
# The env variable is created and populated in the test-arguments-action as "<github.job>_test_arguments_<argument_file_paths_index>"
188184
- name: run integrationTest
189185
uses: ./.github/actions/gradle-command-self-hosted-action

‎.github/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ jobs:
7272
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
7373
- name: Setup environment
7474
uses: ./.github/actions/setup-environment-action
75-
with:
76-
java-version: 11
7775
- name: run PostCommit Java Jpms Dataflow script
7876
uses: ./.github/actions/gradle-command-self-hosted-action
7977
with:

‎.github/workflows/beam_PostCommit_Java_Jpms_Direct.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ jobs:
7272
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
7373
- name: Setup environment
7474
uses: ./.github/actions/setup-environment-action
75-
with:
76-
java-version: 11
7775
- name: run PostCommit Java Jpms Direct script
7876
uses: ./.github/actions/gradle-command-self-hosted-action
7977
with:

‎.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ jobs:
7474
- name: Setup environment
7575
uses: ./.github/actions/setup-environment-action
7676
with:
77-
java-version: |
78-
17
79-
11
77+
java-version: default
8078
python-version: |
8179
3.10
8280
3.14
@@ -86,8 +84,7 @@ jobs:
8684
gradle-command: :sdks:python:test-suites:dataflow:gcpCrossLanguagePostCommit
8785
arguments: |
8886
-PpythonVersion=3.14 \
89-
-PuseWheelDistribution \
90-
-Pjava17Home=$JAVA_HOME_17_X64 \
87+
-PuseWheelDistribution
9188
- name: Archive Python Test Results
9289
uses: actions/upload-artifact@v7
9390
if: failure()

‎.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ jobs:
7474
- name: Setup environment
7575
uses: ./.github/actions/setup-environment-action
7676
with:
77-
java-version: |
78-
17
79-
11
77+
java-version: default
8078
python-version: |
8179
3.10
8280
3.14
@@ -88,8 +86,6 @@ jobs:
8886
uses: ./.github/actions/gradle-command-self-hosted-action
8987
with:
9088
gradle-command: :sdks:python:test-suites:direct:gcpCrossLanguagePostCommit
91-
arguments: |
92-
-Pjava17Home=$JAVA_HOME_17_X64
9389
- name: Archive Python Test Results
9490
uses: actions/upload-artifact@v7
9591
if: failure()

‎.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ jobs:
7373
- name: Setup environment
7474
uses: ./.github/actions/setup-environment-action
7575
with:
76-
java-version: |
77-
17
78-
11
76+
java-version: default
7977
python-version: |
8078
3.10
8179
3.14
@@ -86,8 +84,7 @@ jobs:
8684
arguments: |
8785
-PpythonVersion=3.14 \
8886
-PuseWheelDistribution \
89-
-PkafkaBootstrapServer=10.128.0.40:9094,10.128.0.28:9094,10.128.0.165:9094 \
90-
-Pjava17Home=$JAVA_HOME_17_X64 \
87+
-PkafkaBootstrapServer=10.128.0.40:9094,10.128.0.28:9094,10.128.0.165:9094
9188
- name: Archive Python Test Results
9289
uses: actions/upload-artifact@v7
9390
if: failure()

‎.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ jobs:
7373
- name: Setup environment
7474
uses: ./.github/actions/setup-environment-action
7575
with:
76-
java-version: |
77-
17
78-
11
76+
java-version: default
7977
python-version: |
8078
3.10
8179
3.14
@@ -84,8 +82,7 @@ jobs:
8482
with:
8583
gradle-command: :sdks:python:test-suites:direct:ioCrossLanguagePostCommit
8684
arguments: |
87-
-PuseWheelDistribution \
88-
-Pjava17Home=$JAVA_HOME_17_X64
85+
-PuseWheelDistribution
8986
- name: Archive Python Test Results
9087
uses: actions/upload-artifact@v7
9188
if: failure()

0 commit comments

Comments
 (0)