You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2023/10/12 20:14:50 UTC
[beam] branch revert-28833-java21container created (now d71a949b78a)
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a change to branch revert-28833-java21container
in repository https://gitbox.apache.org/repos/asf/beam.git
at d71a949b78a Revert "Setup Java 21 container (#28833)"
This branch includes the following new commits:
new d71a949b78a Revert "Setup Java 21 container (#28833)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[beam] 01/01: Revert "Setup Java 21 container (#28833)"
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch revert-28833-java21container
in repository https://gitbox.apache.org/repos/asf/beam.git
commit d71a949b78a7b10d3051017863b756f4761e4076
Author: Danny McCormick <da...@google.com>
AuthorDate: Thu Oct 12 16:14:39 2023 -0400
Revert "Setup Java 21 container (#28833)"
This reverts commit e8e38145d96a7b0561a418c19519917b0567591e.
---
...s_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml | 8 ++---
...va_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml | 8 ++---
...LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml | 14 ++++----
...LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml | 14 ++++----
...Tests_Java_GBK_Dataflow_V2_Streaming_Java11.yml | 14 ++++----
...Tests_Java_GBK_Dataflow_V2_Streaming_Java17.yml | 14 ++++----
.../beam_PostCommit_Java_Examples_Dataflow_ARM.yml | 2 +-
...m_PostCommit_Java_Examples_Dataflow_V2_Java.yml | 2 +-
.../beam_PostCommit_Java_Jpms_Dataflow_Java17.yml | 2 +-
.../beam_PostCommit_Java_Jpms_Direct_Java17.yml | 2 +-
...am_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml | 2 +-
.../beam_PostCommit_TransformService_Direct.yml | 2 +-
...eam_PreCommit_Java_Examples_Dataflow_Java11.yml | 2 +-
...eam_PreCommit_Java_Examples_Dataflow_Java17.yml | 2 +-
.github/workflows/beam_PreCommit_SQL_Java11.yml | 2 +-
.github/workflows/beam_PreCommit_SQL_Java17.yml | 2 +-
.test-infra/jenkins/JavaTestProperties.groovy | 7 +---
.test-infra/jenkins/NexmarkBuilder.groovy | 4 +--
.../job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy | 2 +-
.../job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy | 2 +-
.../job_LoadTests_GBK_Dataflow_V2_Java11.groovy | 2 +-
.../job_LoadTests_GBK_Dataflow_V2_Java17.groovy | 2 +-
.../job_LoadTests_ParDo_Dataflow_V2_Java11.groovy | 2 +-
.../job_LoadTests_ParDo_Dataflow_V2_Java17.groovy | 2 +-
...tCommit_Java_Examples_Dataflow_V2_Java11.groovy | 2 +-
...tCommit_Java_Examples_Dataflow_V2_Java17.groovy | 2 +-
...job_PostCommit_Java_Jpms_Dataflow_Java17.groovy | 2 +-
.../job_PostCommit_Java_Jpms_Direct_Java17.groovy | 2 +-
.../job_PostCommit_TransformService_Direct.groovy | 2 +-
..._PreCommit_Java_Examples_Dataflow_Java11.groovy | 2 +-
.../jenkins/job_PreCommit_SQL_Java11.groovy | 2 +-
.../jenkins/job_PreCommit_SQL_Java17.groovy | 2 +-
..._Precommit_Java_Examples_Dataflow_Java17.groovy | 2 +-
build.gradle.kts | 14 ++++----
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 37 ++--------------------
.../runners/core/construction/Environments.java | 6 ++--
.../core/construction/EnvironmentsTest.java | 6 +---
.../google-cloud-dataflow-java/arm/build.gradle | 6 ++--
runners/google-cloud-dataflow-java/build.gradle | 6 ++--
.../beam/runners/dataflow/DataflowRunner.java | 7 ++--
runners/spark/spark_runner.gradle | 5 ++-
sdks/java/container/Dockerfile | 3 +-
sdks/java/container/common.gradle | 14 ++++----
sdks/java/container/java21/build.gradle | 30 ------------------
sdks/java/container/java21/option-jamm.json | 12 -------
sdks/java/testing/jpms-tests/build.gradle | 21 ++++++------
sdks/java/testing/test-utils/build.gradle | 29 +++++++++++------
.../testutils/jvmverification/JvmVerification.java | 16 +---------
settings.gradle.kts | 1 -
website/www/site/content/en/roadmap/java-sdk.md | 6 ++--
50 files changed, 132 insertions(+), 220 deletions(-)
diff --git a/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml b/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml
index ff172cc338b..35575aec0be 100644
--- a/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml
+++ b/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Batch_JavaVersions.yml
@@ -95,7 +95,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -105,7 +105,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -115,7 +115,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -125,7 +125,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
diff --git a/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml b/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml
index efa61373f2a..46dfaa98692 100644
--- a/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml
+++ b/.github/workflows/beam_LoadTests_Java_CoGBK_Dataflow_V2_Streaming_JavaVersions.yml
@@ -95,7 +95,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -105,7 +105,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -115,7 +115,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
@@ -125,7 +125,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:load-tests:run
arguments: |
- -PtestJavaVersion=${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.CoGroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml
index 5c333013e2a..318f157e57a 100644
--- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml
+++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11.yml
@@ -93,7 +93,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
@@ -104,7 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
@@ -115,7 +115,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
@@ -126,7 +126,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
@@ -137,7 +137,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
@@ -148,7 +148,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
@@ -159,6 +159,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java11_test_arguments_7 }}'
\ No newline at end of file
diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml
index 4fa5c364728..543cb86985d 100644
--- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml
+++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml
@@ -95,7 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
@@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
@@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
@@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
@@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
@@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
@@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17_test_arguments_7 }}'
\ No newline at end of file
diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11.yml
index 6432a315d8a..fcd55f761c0 100644
--- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11.yml
+++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11.yml
@@ -93,7 +93,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
@@ -104,7 +104,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
@@ -115,7 +115,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
@@ -126,7 +126,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
@@ -137,7 +137,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
@@ -148,7 +148,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
@@ -159,6 +159,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java11_test_arguments_7 }}'
\ No newline at end of file
diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml
index cd8c3427959..5df7d324919 100644
--- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml
+++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml
@@ -95,7 +95,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_1 }}' \
- name: run Load test 2GB of 100B records
@@ -106,7 +106,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_2 }}' \
- name: run Load test 2GB of 100kB records
@@ -117,7 +117,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_3 }}' \
- name: run Load test fanout 4 times with 2GB 10-byte records total
@@ -128,7 +128,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_4 }}' \
- name: run Load test fanout 8 times with 2GB 10-byte records total
@@ -139,7 +139,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_5 }}' \
- name: run Load test reiterate 4 times 10kB values
@@ -150,7 +150,7 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_6 }}' \
- name: run Load test reiterate 4 times 2MB values
@@ -161,6 +161,6 @@ jobs:
-PloadTest.mainClass=org.apache.beam.sdk.loadtests.GroupByKeyLoadTest \
-Prunner=:runners:google-cloud-dataflow-java \
-Prunner.version=V2 \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-Pjava17Home=$JAVA_HOME_17_X64 \
'-PloadTest.args=${{ env.beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17_test_arguments_7 }}'
\ No newline at end of file
diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
index 8add1a2445c..939d2646d35 100644
--- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
+++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
@@ -111,7 +111,7 @@ jobs:
gradle-command: :runners:google-cloud-dataflow-java:arm:examplesJavaRunnerV2IntegrationTestARM
max-workers: 12
arguments: |
- -PtestJavaVersion${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-Pcontainer-architecture-list=arm64,amd64 \
-Ppush-containers \
diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml
index ab862df1847..74e1787945e 100644
--- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml
+++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml
@@ -86,7 +86,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
- -PtestJavaVersion${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml b/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml
index 3f6352b0a94..0b9a366211e 100644
--- a/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml
+++ b/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml
@@ -80,7 +80,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest
arguments:
-PskipCheckerFramework
- -PtestJavaVersion=17
+ -PcompileAndRunTestsWithJava17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml
index 360b9c757a0..fcdbd63f7e9 100644
--- a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml
+++ b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml
@@ -80,7 +80,7 @@ jobs:
gradle-command: :sdks:java:testing:jpms-tests:directRunnerIntegrationTest
arguments:
-PskipCheckerFramework
- -PtestJavaVersion=17
+ -PcompileAndRunTestsWithJava17
-Pjava17Home=$JAVA_HOME_17_X64
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/beam_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml b/.github/workflows/beam_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml
index 5782928a8b4..d7879317289 100644
--- a/.github/workflows/beam_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml
+++ b/.github/workflows/beam_PostCommit_Java_Nexmark_Dataflow_V2_Java.yml
@@ -107,7 +107,7 @@ jobs:
with:
gradle-command: :sdks:java:testing:nexmark:run
arguments: |
- -PtestJavaVersion${{ matrix.java_version }} \
+ -PcompileAndRunTestsWithJava${{ matrix.java_version }} \
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64 \
-Pnexmark.runner.version=V2 \
-Pnexmark.runner=:runners:google-cloud-dataflow-java \
diff --git a/.github/workflows/beam_PostCommit_TransformService_Direct.yml b/.github/workflows/beam_PostCommit_TransformService_Direct.yml
index 2ba83506d39..491688e097a 100644
--- a/.github/workflows/beam_PostCommit_TransformService_Direct.yml
+++ b/.github/workflows/beam_PostCommit_TransformService_Direct.yml
@@ -84,7 +84,7 @@ jobs:
with:
gradle-command: :sdks:python:test-suites:direct:xlang:transformServicePythonUsingJava
arguments: |
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
-PuseWheelDistribution \
-PpythonVersion=${{ matrix.python_version }} \
diff --git a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml
index 186d75674c7..03f4d32861b 100644
--- a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml
+++ b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java11.yml
@@ -115,7 +115,7 @@ jobs:
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
-PskipCheckerFramework \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-Pjava11Home=$JAVA_HOME_11_X64 \
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java17.yml b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java17.yml
index cafc8cf5ab6..cf8cefe388f 100644
--- a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java17.yml
+++ b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java17.yml
@@ -115,7 +115,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-PskipCheckerFramework \
-Pjava17Home=$JAVA_HOME_17_X64 \
max-workers: 12
diff --git a/.github/workflows/beam_PreCommit_SQL_Java11.yml b/.github/workflows/beam_PreCommit_SQL_Java11.yml
index 3412365bf13..f1c733418b8 100644
--- a/.github/workflows/beam_PreCommit_SQL_Java11.yml
+++ b/.github/workflows/beam_PreCommit_SQL_Java11.yml
@@ -103,7 +103,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
- -PtestJavaVersion=11 \
+ -PcompileAndRunTestsWithJava11 \
-PskipCheckerFramework \
-Pjava11Home=$JAVA_HOME_11_X64 \
- name: Archive JUnit Test Results
diff --git a/.github/workflows/beam_PreCommit_SQL_Java17.yml b/.github/workflows/beam_PreCommit_SQL_Java17.yml
index 2215bab8dde..7547bd39681 100644
--- a/.github/workflows/beam_PreCommit_SQL_Java17.yml
+++ b/.github/workflows/beam_PreCommit_SQL_Java17.yml
@@ -101,7 +101,7 @@ jobs:
arguments: |
-PdisableSpotlessCheck=true \
-PdisableCheckStyle=true \
- -PtestJavaVersion=17 \
+ -PcompileAndRunTestsWithJava17 \
-PskipCheckerFramework \
-Pjava17Home=$JAVA_HOME_17_X64 \
- name: Archive JUnit Test Results
diff --git a/.test-infra/jenkins/JavaTestProperties.groovy b/.test-infra/jenkins/JavaTestProperties.groovy
index 5403cee5cf9..ce7446a6e71 100644
--- a/.test-infra/jenkins/JavaTestProperties.groovy
+++ b/.test-infra/jenkins/JavaTestProperties.groovy
@@ -17,10 +17,5 @@
*/
class JavaTestProperties {
- final static List<String> SUPPORTED_CONTAINER_TASKS = [
- 'java8',
- 'java11',
- 'java17',
- 'java21'
- ]
+ final static List<String> SUPPORTED_CONTAINER_TASKS = ['java8', 'java11', 'java17']
}
diff --git a/.test-infra/jenkins/NexmarkBuilder.groovy b/.test-infra/jenkins/NexmarkBuilder.groovy
index 69fa3dcc427..044b0cbb956 100644
--- a/.test-infra/jenkins/NexmarkBuilder.groovy
+++ b/.test-infra/jenkins/NexmarkBuilder.groovy
@@ -145,7 +145,7 @@ class NexmarkBuilder {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
commonJobProperties.setGradleSwitches(delegate)
- switches("-PtestJavaVersion=11")
+ switches("-PcompileAndRunTestsWithJava11")
switches("-Pjava11Home=${commonJobProperties.JAVA_11_HOME}")
switches("-Pnexmark.runner=${runner.getDependencyBySDK(sdk)}")
switches("-Pnexmark.args=\"${parseOptions(options)}\"")
@@ -168,7 +168,7 @@ class NexmarkBuilder {
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:java:testing:nexmark:run')
commonJobProperties.setGradleSwitches(delegate)
- switches("-PtestJavaVersion=17")
+ switches("-PcompileAndRunTestsWithJava17")
switches("-Pjava17Home=${commonJobProperties.JAVA_17_HOME}")
switches("-Pnexmark.runner=${runner.getDependencyBySDK(sdk)}")
switches("-Pnexmark.args=\"${parseOptions(options)}\"")
diff --git a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy
index 55501db4429..fc7f39d28a0 100644
--- a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy
+++ b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java11.groovy
@@ -188,7 +188,7 @@ def loadTestConfigurations = { mode, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=11',
+ '-PcompileAndRunTestsWithJava11',
"-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
]
diff --git a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy
index 8fb09fd0744..ca8c6689ad0 100644
--- a/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy
+++ b/.test-infra/jenkins/job_LoadTests_CoGBK_Dataflow_V2_Java17.groovy
@@ -188,7 +188,7 @@ def loadTestConfigurations = { mode, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=17',
+ '-PcompileAndRunTestsWithJava17',
"-Pjava17Home=${commonJobProperties.JAVA_17_HOME}"
]
diff --git a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy
index 2191e448fad..cc2d5d2e555 100644
--- a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy
+++ b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java11.groovy
@@ -253,7 +253,7 @@ def loadTestConfigurations = { mode, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=11',
+ '-PcompileAndRunTestsWithJava11',
"-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
]
diff --git a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy
index 2520f68f017..7405f9154b8 100644
--- a/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy
+++ b/.test-infra/jenkins/job_LoadTests_GBK_Dataflow_V2_Java17.groovy
@@ -253,7 +253,7 @@ def loadTestConfigurations = { mode, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=17',
+ '-PcompileAndRunTestsWithJava17',
"-Pjava17Home=${commonJobProperties.JAVA_17_HOME}"
]
diff --git a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy
index b7154e840e6..a4535d52e6c 100644
--- a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy
+++ b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java11.groovy
@@ -160,7 +160,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=11',
+ '-PcompileAndRunTestsWithJava11',
"-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
]
diff --git a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy
index df6c66e02ae..f0f2179ebb3 100644
--- a/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy
+++ b/.test-infra/jenkins/job_LoadTests_ParDo_Dataflow_V2_Java17.groovy
@@ -160,7 +160,7 @@ def commonLoadTestConfig = { jobType, isStreaming ->
def final JOB_SPECIFIC_SWITCHES = [
'-Prunner.version="V2"',
- '-PtestJavaVersion=17',
+ '-PcompileAndRunTestsWithJava17',
"-Pjava17Home=${commonJobProperties.JAVA_17_HOME}"
]
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java11.groovy b/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java11.groovy
index 6229f7c48a7..6687ae0e6f8 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java11.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java11.groovy
@@ -43,7 +43,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_Examples_Dataflow_V2_ja
commonJobProperties.setGradleSwitches(delegate, 3 * Runtime.runtime.availableProcessors())
switches '-PdisableSpotlessCheck=true'
switches '-PdisableCheckStyle=true'
- switches '-PtestJavaVersion=11'
+ switches '-PcompileAndRunTestsWithJava11'
switches '-PskipCheckerFramework'
switches "-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java17.groovy b/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java17.groovy
index 7e52a7e0978..b275fe9276d 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java17.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Examples_Dataflow_V2_Java17.groovy
@@ -43,7 +43,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_Examples_Dataflow_V2_ja
commonJobProperties.setGradleSwitches(delegate, 3 * Runtime.runtime.availableProcessors())
switches '-PdisableSpotlessCheck=true'
switches '-PdisableCheckStyle=true'
- switches '-PtestJavaVersion=17'
+ switches '-PcompileAndRunTestsWithJava17'
switches '-PskipCheckerFramework'
switches "-Pjava17Home=${commonJobProperties.JAVA_17_HOME}"
}
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Jpms_Dataflow_Java17.groovy b/.test-infra/jenkins/job_PostCommit_Java_Jpms_Dataflow_Java17.groovy
index f518985ca7a..4e26c164319 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Jpms_Dataflow_Java17.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Jpms_Dataflow_Java17.groovy
@@ -42,7 +42,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_Jpms_Dataflow_Java17',
tasks(':sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest')
commonJobProperties.setGradleSwitches(delegate)
switches("-PskipCheckerFramework")
- switches("-PtestJavaVersion=17")
+ switches("-PcompileAndRunTestsWithJava17")
switches("-Pjava17Home=${commonJobProperties.JAVA_17_HOME}")
// Specify maven home on Jenkins, needed by Maven archetype integration tests.
switches('-Pmaven_home=/home/jenkins/tools/maven/apache-maven-3.5.4')
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Jpms_Direct_Java17.groovy b/.test-infra/jenkins/job_PostCommit_Java_Jpms_Direct_Java17.groovy
index 04c31389ecb..f31373ecaad 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Jpms_Direct_Java17.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Jpms_Direct_Java17.groovy
@@ -42,7 +42,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Java_Jpms_Direct_Java17', 'R
tasks(':sdks:java:testing:jpms-tests:directRunnerIntegrationTest')
commonJobProperties.setGradleSwitches(delegate)
switches("-PskipCheckerFramework")
- switches("-PtestJavaVersion=17")
+ switches("-PcompileAndRunTestsWithJava17")
switches("-Pjava17Home=${commonJobProperties.JAVA_17_HOME}")
// Specify maven home on Jenkins, needed by Maven archetype integration tests.
switches('-Pmaven_home=/home/jenkins/tools/maven/apache-maven-3.5.4')
diff --git a/.test-infra/jenkins/job_PostCommit_TransformService_Direct.groovy b/.test-infra/jenkins/job_PostCommit_TransformService_Direct.groovy
index 03d29069a52..0d7f58e7170 100644
--- a/.test-infra/jenkins/job_PostCommit_TransformService_Direct.groovy
+++ b/.test-infra/jenkins/job_PostCommit_TransformService_Direct.groovy
@@ -43,7 +43,7 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_TransformService_Direct',
rootBuildScriptDir(commonJobProperties.checkoutDir)
tasks(':sdks:python:test-suites:direct:xlang:transformServicePythonUsingJava')
commonJobProperties.setGradleSwitches(delegate)
- switches '-PtestJavaVersion=11'
+ switches '-PcompileAndRunTestsWithJava11'
switches "-Pjava11Home=${commonJobProperties.JAVA_11_HOME}"
switches("-PuseWheelDistribution")
switches("-PpythonVersion=${pythonVersion}")
diff --git a/.test-infra/jenkins/job_PreCommit_Java_Examples_Dataflow_Java11.groovy b/.test-infra/jenkins/job_PreCommit_Java_Examples_Dataflow_Java11.groovy
index 9f733a42ccc..cabf5dbdd45 100644
--- a/.test-infra/jenkins/job_PreCommit_Java_Examples_Dataflow_Java11.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Java_Examples_Dataflow_Java11.groovy
@@ -50,7 +50,7 @@ builder.build {
switches '-PdisableSpotlessCheck=true'
switches '-PdisableCheckStyle=true'
switches '-PskipCheckerFramework' // Gradle itself is running under JDK8 so plugin configures wrong for JDK11
- switches '-PtestJavaVersion=11'
+ switches '-PcompileAndRunTestsWithJava11'
switches "-Pjava11Home=${properties.JAVA_11_HOME}"
properties.setGradleSwitches(delegate, 3 * Runtime.runtime.availableProcessors())
}
diff --git a/.test-infra/jenkins/job_PreCommit_SQL_Java11.groovy b/.test-infra/jenkins/job_PreCommit_SQL_Java11.groovy
index 34154b37209..9742ab756cf 100644
--- a/.test-infra/jenkins/job_PreCommit_SQL_Java11.groovy
+++ b/.test-infra/jenkins/job_PreCommit_SQL_Java11.groovy
@@ -26,7 +26,7 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder(
gradleSwitches: [
'-PdisableSpotlessCheck=true',
'-PdisableCheckStyle=true',
- '-PtestJavaVersion=11',
+ '-PcompileAndRunTestsWithJava11',
'-PskipCheckerFramework',
// Gradle itself is running under JDK8 so plugin configures wrong for JDK11
"-Pjava11Home=${properties.JAVA_11_HOME}"
diff --git a/.test-infra/jenkins/job_PreCommit_SQL_Java17.groovy b/.test-infra/jenkins/job_PreCommit_SQL_Java17.groovy
index 472521cb1b0..158fa683c1a 100644
--- a/.test-infra/jenkins/job_PreCommit_SQL_Java17.groovy
+++ b/.test-infra/jenkins/job_PreCommit_SQL_Java17.groovy
@@ -26,7 +26,7 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder(
gradleSwitches: [
'-PdisableSpotlessCheck=true',
'-PdisableCheckStyle=true',
- '-PtestJavaVersion=17',
+ '-PcompileAndRunTestsWithJava17',
'-PskipCheckerFramework',
// Gradle itself is running under JDK8 so plugin configures wrong for JDK17
"-Pjava17Home=${properties.JAVA_17_HOME}"
diff --git a/.test-infra/jenkins/job_Precommit_Java_Examples_Dataflow_Java17.groovy b/.test-infra/jenkins/job_Precommit_Java_Examples_Dataflow_Java17.groovy
index 387b707123e..3654a4c75ed 100644
--- a/.test-infra/jenkins/job_Precommit_Java_Examples_Dataflow_Java17.groovy
+++ b/.test-infra/jenkins/job_Precommit_Java_Examples_Dataflow_Java17.groovy
@@ -50,7 +50,7 @@ builder.build {
switches '-PdisableSpotlessCheck=true'
switches '-PdisableCheckStyle=true'
switches '-PskipCheckerFramework' // Gradle itself is running under JDK8 so plugin configures wrong for JDK17
- switches '-PtestJavaVersion=17'
+ switches '-PcompileAndRunTestsWithJava17'
switches "-Pjava17Home=${properties.JAVA_17_HOME}"
properties.setGradleSwitches(delegate, 3 * Runtime.runtime.availableProcessors())
}
diff --git a/build.gradle.kts b/build.gradle.kts
index 5bcfbb3ed06..ea1b4e6784e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -712,12 +712,14 @@ if (project.hasProperty("javaLinkageArtifactIds")) {
}
}
}
-if (project.hasProperty("testJavaVersion")) {
- var testVer = project.property("testJavaVersion")
-
- tasks.getByName("javaPreCommitPortabilityApi").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion$testVer")
- tasks.getByName("javaExamplesDataflowPrecommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion$testVer")
- tasks.getByName("sqlPreCommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion$testVer")
+if (project.hasProperty("compileAndRunTestsWithJava11")) {
+ tasks.getByName("javaPreCommitPortabilityApi").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion")
+ tasks.getByName("javaExamplesDataflowPrecommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion")
+ tasks.getByName("sqlPreCommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion")
+} else if (project.hasProperty("compileAndRunTestsWithJava17")) {
+ tasks.getByName("javaPreCommitPortabilityApi").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion17")
+ tasks.getByName("javaExamplesDataflowPrecommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion17")
+ tasks.getByName("sqlPreCommit").dependsOn(":sdks:java:testing:test-utils:verifyJavaVersion17")
} else {
allprojects {
tasks.withType(Test::class).configureEach {
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 6fa5ff0ee5f..efc08a6371d 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -946,29 +946,6 @@ class BeamModulePlugin implements Plugin<Project> {
]
}
- project.ext.setJava21Options = { CompileOptions options ->
- def java17Home = project.findProperty("java17Home")
- options.fork = true
- options.forkOptions.javaHome = java17Home as File
- options.compilerArgs += ['-Xlint:-path']
- // Error prone requires some packages to be exported/opened for Java 17
- // Disabling checks since this property is only used for Jenkins tests
- // https://github.com/tbroyer/gradle-errorprone-plugin#jdk-16-support
- options.errorprone.errorproneArgs.add("-XepDisableAllChecks")
- options.forkOptions.jvmArgs += [
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
- "-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"
- ]
- }
-
project.ext.repositories = {
maven {
name "testPublicationLocal"
@@ -1515,7 +1492,7 @@ class BeamModulePlugin implements Plugin<Project> {
options.errorprone.errorproneArgs.add("-Xep:Slf4jLoggerShouldBeNonStatic:OFF")
}
- if (project.findProperty('testJavaVersion') == "11") {
+ if (project.hasProperty("compileAndRunTestsWithJava11")) {
def java11Home = project.findProperty("java11Home")
project.tasks.compileTestJava {
options.fork = true
@@ -1527,7 +1504,7 @@ class BeamModulePlugin implements Plugin<Project> {
useJUnit()
executable = "${java11Home}/bin/java"
}
- } else if (project.findProperty('testJavaVersion') == "17") {
+ } else if (project.hasProperty("compileAndRunTestsWithJava17")) {
def java17Home = project.findProperty("java17Home")
project.tasks.compileTestJava {
setCompileAndRuntimeJavaVersion(options.compilerArgs, '17')
@@ -1537,16 +1514,6 @@ class BeamModulePlugin implements Plugin<Project> {
useJUnit()
executable = "${java17Home}/bin/java"
}
- } else if (project.findProperty('testJavaVersion') == "21") {
- def java21Home = project.findProperty("java21Home")
- project.tasks.compileTestJava {
- setCompileAndRuntimeJavaVersion(options.compilerArgs, '21')
- project.ext.setJava17Options(options)
- }
- project.tasks.withType(Test).configureEach {
- useJUnit()
- executable = "${java21Home}/bin/java"
- }
}
if (configuration.shadowClosure) {
diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
index f531b5be344..31a555989af 100644
--- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
+++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
@@ -94,8 +94,7 @@ public class Environments {
public enum JavaVersion {
java8("java", "1.8", 8),
java11("java11", "11", 11),
- java17("java17", "17", 17),
- java21("java21", "21", 21);
+ java17("java17", "17", 17);
// Legacy name, as used in container image
private final String legacyName;
@@ -120,7 +119,6 @@ public class Environments {
return this.specification;
}
- /** Return the LTS java version given the Java specification version. */
public static JavaVersion forSpecification(String specification) {
for (JavaVersion ver : JavaVersion.values()) {
if (ver.specification.equals(specification)) {
@@ -139,7 +137,7 @@ public class Environments {
}
}
LOG.warn(
- "Unsupported Java version: {}, falling back to: {}",
+ "unsupported Java version: {}, falling back to: {}",
specification,
fallback.specification);
return fallback;
diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
index b71a654f103..ae429fb1fe6 100644
--- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
+++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
@@ -291,8 +291,6 @@ public class EnvironmentsTest implements Serializable {
assertEquals("java11", JavaVersion.java11.legacyName());
assertEquals(JavaVersion.java17, JavaVersion.forSpecification("17"));
assertEquals("java17", JavaVersion.java17.legacyName());
- assertEquals(JavaVersion.java21, JavaVersion.forSpecification("21"));
- assertEquals("java21", JavaVersion.java21.legacyName());
}
@Test
@@ -305,9 +303,7 @@ public class EnvironmentsTest implements Serializable {
assertEquals(JavaVersion.java17, JavaVersion.forSpecification("15"));
assertEquals(JavaVersion.java17, JavaVersion.forSpecification("16"));
assertEquals(JavaVersion.java17, JavaVersion.forSpecification("18"));
- assertEquals(JavaVersion.java21, JavaVersion.forSpecification("19"));
- assertEquals(JavaVersion.java21, JavaVersion.forSpecification("20"));
- assertEquals(JavaVersion.java21, JavaVersion.forSpecification("21"));
+ assertEquals(JavaVersion.java17, JavaVersion.forSpecification("19"));
}
@Test(expected = UnsupportedOperationException.class)
diff --git a/runners/google-cloud-dataflow-java/arm/build.gradle b/runners/google-cloud-dataflow-java/arm/build.gradle
index 71cbc7c58e8..e79eeedcd82 100644
--- a/runners/google-cloud-dataflow-java/arm/build.gradle
+++ b/runners/google-cloud-dataflow-java/arm/build.gradle
@@ -76,8 +76,10 @@ dependencies {
}
def javaVer = "java8"
-if (project.hasProperty('testJavaVersion')) {
- javaVer = "java${project.getProperty('testJavaVersion')}"
+if(project.hasProperty('compileAndRunTestsWithJava17')) {
+ javaVer = "java17"
+} else if(project.hasProperty('compileAndRunTestsWithJava11')) {
+ javaVer = "java11"
}
def dataflowProject = project.findProperty('dataflowProject') ?: 'apache-beam-testing'
def dataflowRegion = project.findProperty('dataflowRegion') ?: 'us-central1'
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index e4f34687d31..adc1f2e09bc 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -279,8 +279,10 @@ def createRunnerV2ValidatesRunnerTest = { Map args ->
// task ordering such that the registry doesn't get cleaned up prior to task completion.
def buildAndPushDockerJavaContainer = tasks.register("buildAndPushDockerJavaContainer") {
def javaVer = "java8"
- if(project.hasProperty('testJavaVersion')) {
- javaVer = "java${project.getProperty('testJavaVersion')}"
+ if(project.hasProperty('compileAndRunTestsWithJava17')) {
+ javaVer = "java17"
+ } else if(project.hasProperty('compileAndRunTestsWithJava11')) {
+ javaVer = "java11"
}
dependsOn ":sdks:java:container:${javaVer}:docker"
def defaultDockerImageName = containerImageName(
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
index 891b4c0454c..26548038a1d 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java
@@ -398,9 +398,10 @@ public class DataflowRunner extends PipelineRunner<DataflowPipelineJob> {
// Adding the Java version to the SDK name for user's and support convenience.
String agentJavaVer = "(JRE 8 environment)";
- if (Environments.getJavaVersion() != Environments.JavaVersion.java8) {
- agentJavaVer =
- String.format("(JRE %s environment)", Environments.getJavaVersion().specification());
+ if (Environments.getJavaVersion() == Environments.JavaVersion.java17) {
+ agentJavaVer = "(JRE 17 environment)";
+ } else if (Environments.getJavaVersion() == Environments.JavaVersion.java11) {
+ agentJavaVer = "(JRE 11 environment)";
}
DataflowRunnerInfo dataflowRunnerInfo = DataflowRunnerInfo.getDataflowRunnerInfo();
diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle
index 74013de6107..d0dbe453ddf 100644
--- a/runners/spark/spark_runner.gradle
+++ b/runners/spark/spark_runner.gradle
@@ -63,9 +63,8 @@ def sparkTestProperties(overrides = [:]) {
def sparkTestJvmArgs() {
- // run tests with Java 17 using -PtestJavaVersion=17 -Pjava17Home=???
- if (project.hasProperty('testJavaVersion') &&
- project.getProperty('testJavaVersion') in ['17', '21']) {
+ // run tests with Java 17 using -PcompileAndRunTestsWithJava17 -Pjava17Home=???
+ if (project.hasProperty("compileAndRunTestsWithJava17")) {
return [
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
// add-opens below required for Kryo FieldSerializer / SparkRunnerKryoRegistratorTest
diff --git a/sdks/java/container/Dockerfile b/sdks/java/container/Dockerfile
index 9c266ea132b..e0fa8d4a0a6 100644
--- a/sdks/java/container/Dockerfile
+++ b/sdks/java/container/Dockerfile
@@ -15,9 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
-ARG base_image
ARG java_version
-FROM ${base_image}:${java_version}
+FROM eclipse-temurin:${java_version}
LABEL Author "Apache Beam <de...@beam.apache.org>"
ARG TARGETOS
ARG TARGETARCH
diff --git a/sdks/java/container/common.gradle b/sdks/java/container/common.gradle
index 9f6cbe64a29..cc427494ed6 100644
--- a/sdks/java/container/common.gradle
+++ b/sdks/java/container/common.gradle
@@ -29,7 +29,6 @@ applyDockerNature()
if (!project.hasProperty('imageJavaVersion')) {
throw new GradleException('imageJavaVersion project property must be set')
}
-def javaBaseImage = project.findProperty('javaBaseImage') ?: 'eclipse-temurin'
def imageJavaVersion = project.findProperty('imageJavaVersion')
description = "Apache Beam :: SDKs :: Java :: Container :: Java ${imageJavaVersion} Container"
@@ -72,19 +71,19 @@ task copySdkHarnessLauncher(type: Copy) {
}
task copyJavaThirdPartyLicenses(type: Copy) {
- from project(':sdks:java:container').layout.buildDirectory.dir('target/third_party_licenses')
+ from("${project(':sdks:java:container').buildDir}/target/third_party_licenses")
into "build/target/third_party_licenses"
dependsOn ':sdks:java:container:pullLicenses'
}
task copyGolangLicenses(type: Copy) {
- from project(':release:go-licenses:java').layout.buildDirectory.dir('output')
+ from "${project(':release:go-licenses:java').buildDir}/output"
into "build/target/go-licenses"
dependsOn ':release:go-licenses:java:createLicenses'
}
task copyJdkOptions(type: Copy) {
- if (["11", "17", "21"].contains(imageJavaVersion)) {
+ if (imageJavaVersion == "17" || imageJavaVersion == "11") {
from "option-jamm.json"
}
from "java${imageJavaVersion}-security.properties"
@@ -98,10 +97,10 @@ task skipPullLicenses(type: Exec) {
}
task validateJavaHome {
- if (["11", "17", "21"].contains(imageJavaVersion)) {
+ if (imageJavaVersion == "11" || imageJavaVersion == "17") {
doFirst {
- if (!project.hasProperty("java${imageJavaVersion}Home")) {
- throw new GradleException("java${imageJavaVersion}Home property required for imageJavaVersion=${imageJavaVersion}. Re-run with -Pjava${imageJavaVersion}Home")
+ if (!project.hasProperty('java17Home') && !project.hasProperty('java11Home')) {
+ throw new GradleException('java17Home or java11Home property required. Re-run with -Pjava17Home or -Pjava11Home')
}
}
}
@@ -125,7 +124,6 @@ docker {
buildArgs([
'pull_licenses': project.rootProject.hasProperty(["docker-pull-licenses"]) ||
project.rootProject.hasProperty(["isRelease"]),
- 'base_image': javaBaseImage,
'java_version': imageJavaVersion,
])
buildx useBuildx
diff --git a/sdks/java/container/java21/build.gradle b/sdks/java/container/java21/build.gradle
deleted file mode 100644
index 038064102dc..00000000000
--- a/sdks/java/container/java21/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-project.ext {
- // TODO(https://github.com/apache/beam/issues/28120) switch to temurin once available
- javaBaseImage = 'openjdk'
- imageJavaVersion = '21'
-}
-
-// Load the main build script which contains all build logic.
-apply from: "../common.gradle"
-
-dependencies {
- dockerDependency project(path: ":sdks:java:container:agent")
-}
\ No newline at end of file
diff --git a/sdks/java/container/java21/option-jamm.json b/sdks/java/container/java21/option-jamm.json
deleted file mode 100644
index 5647ff66be5..00000000000
--- a/sdks/java/container/java21/option-jamm.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "jamm",
- "enabled": true,
- "options": {
- "java_arguments": [
- "--add-modules=jamm",
- "--module-path=/opt/apache/beam/jars/jamm.jar",
- "--add-opens=java.base/java.lang=jamm",
- "--add-opens=java.base/java.util=jamm"
- ]
- }
-}
\ No newline at end of file
diff --git a/sdks/java/testing/jpms-tests/build.gradle b/sdks/java/testing/jpms-tests/build.gradle
index 2a25463931c..6321f874c90 100644
--- a/sdks/java/testing/jpms-tests/build.gradle
+++ b/sdks/java/testing/jpms-tests/build.gradle
@@ -23,8 +23,10 @@ plugins {
}
// overwrite javaVersion before applyJavaNature
-if (project.hasProperty("testJavaVersion")) {
- javaVersion = "1.${project.getProperty('testJavaVersion')}" as String
+if (project.hasProperty("compileAndRunTestsWithJava17")) {
+ javaVersion = '1.17'
+} else {
+ javaVersion = '1.11'
}
applyJavaNature(
@@ -40,14 +42,13 @@ ext.summary = "E2E test for Java 9 modules"
// direct compileJava to use specified java version.
project.tasks.compileJava {
- if (project.hasProperty('testJavaVersion')) {
+ if (project.hasProperty("compileAndRunTestsWithJava11")) {
options.fork = true
- options.forkOptions.javaHome = project.findProperty("java${project.getProperty('testJavaVersion')}Home") as File
- if (project.getProperty('testJavaVersion') == '17') {
- setJava17Options(options)
- } else if (project.getProperty('testJavaVersion') == '21') {
- setJava21Options(options)
- }
+ options.forkOptions.javaHome = project.findProperty("java11Home") as File
+ } else if (project.hasProperty("compileAndRunTestsWithJava17")) {
+ options.fork = true
+ options.forkOptions.javaHome = project.findProperty("java17Home") as File
+ setJava17Options(options)
}
}
@@ -119,7 +120,7 @@ plugins.withType(JavaPlugin).configureEach{
// JPMS requires JDK > 8
project.tasks.each {
it.onlyIf {
- project.hasProperty('testJavaVersion')
+ project.hasProperty("compileAndRunTestsWithJava17")
|| JavaVersion.VERSION_1_8.compareTo(JavaVersion.current()) < 0
}
}
diff --git a/sdks/java/testing/test-utils/build.gradle b/sdks/java/testing/test-utils/build.gradle
index 6e30693d889..50c815dd57f 100644
--- a/sdks/java/testing/test-utils/build.gradle
+++ b/sdks/java/testing/test-utils/build.gradle
@@ -43,15 +43,24 @@ dependencies {
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadowTest")
}
-['11', '17', '21'].each {
- tasks.create(name: "verifyJavaVersion${it}", type: Test) {
- filter {
- includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyCodeIsCompiledWithJava8"
- includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyTestCodeIsCompiledWithJava${it}"
- includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyRunningJVMVersionIs${it}"
- }
- doLast {
- println 'Java verified'
- }
+task verifyJavaVersion(type: Test) {
+ filter {
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyCodeIsCompiledWithJava8'
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyTestCodeIsCompiledWithJava11'
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyRunningJVMVersionIs11'
+ }
+ doLast {
+ println 'Java verified'
}
}
+
+task verifyJavaVersion17(type: Test) {
+ filter {
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyCodeIsCompiledWithJava8'
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyTestCodeIsCompiledWithJava17'
+ includeTestsMatching 'org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyRunningJVMVersionIs17'
+ }
+ doLast {
+ println 'Java verified'
+ }
+}
\ No newline at end of file
diff --git a/sdks/java/testing/test-utils/src/test/java/org/apache/beam/sdk/testutils/jvmverification/JvmVerification.java b/sdks/java/testing/test-utils/src/test/java/org/apache/beam/sdk/testutils/jvmverification/JvmVerification.java
index a6b5d6dca6c..ad29e8b6a1d 100644
--- a/sdks/java/testing/test-utils/src/test/java/org/apache/beam/sdk/testutils/jvmverification/JvmVerification.java
+++ b/sdks/java/testing/test-utils/src/test/java/org/apache/beam/sdk/testutils/jvmverification/JvmVerification.java
@@ -20,7 +20,6 @@ package org.apache.beam.sdk.testutils.jvmverification;
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v11;
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v17;
import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v1_8;
-import static org.apache.beam.sdk.testutils.jvmverification.JvmVerification.Java.v21;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -40,7 +39,6 @@ public class JvmVerification {
versionMapping.put("0034", v1_8);
versionMapping.put("0037", v11);
versionMapping.put("003d", v17);
- versionMapping.put("0041", v21);
}
// bytecode
@@ -64,11 +62,6 @@ public class JvmVerification {
assertEquals(v17, getByteCodeVersion(JvmVerification.class));
}
- @Test
- public void verifyTestCodeIsCompiledWithJava21() throws IOException {
- assertEquals(v21, getByteCodeVersion(JvmVerification.class));
- }
-
// jvm
@Test
public void verifyRunningJVMVersionIs11() {
@@ -82,12 +75,6 @@ public class JvmVerification {
assertEquals(v17.name, version);
}
- @Test
- public void verifyRunningJVMVersionIs21() {
- final String version = getJavaSpecification();
- assertEquals(v21.name, version);
- }
-
private static <T> Java getByteCodeVersion(final Class<T> clazz) throws IOException {
final InputStream stream =
clazz.getClassLoader().getResourceAsStream(clazz.getName().replace(".", "/") + ".class");
@@ -104,8 +91,7 @@ public class JvmVerification {
enum Java {
v1_8("1.8"),
v11("11"),
- v17("17"),
- v21("21");
+ v17("17");
final String name;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b71ce249c15..1c851da92e6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -175,7 +175,6 @@ include(":sdks:java:container:agent")
include(":sdks:java:container:java8")
include(":sdks:java:container:java11")
include(":sdks:java:container:java17")
-include(":sdks:java:container:java21")
include(":sdks:java:core")
include(":sdks:java:core:jmh")
include(":sdks:java:expansion-service")
diff --git a/website/www/site/content/en/roadmap/java-sdk.md b/website/www/site/content/en/roadmap/java-sdk.md
index a1c85e13919..b65424b57a3 100644
--- a/website/www/site/content/en/roadmap/java-sdk.md
+++ b/website/www/site/content/en/roadmap/java-sdk.md
@@ -17,9 +17,9 @@ limitations under the License.
# Java SDK Roadmap
-## Next Java LTS version support (Java 21)
+## Next Java LTS version support (Java 17)
Work to support the next LTS release of Java is in progress. For more details
-about the scope and info on the various tasks please see the GitHub Issue.
+about the scope and info on the various tasks please see the JIRA ticket.
-- GitHub: [#28120](https://github.com/apache/beam/issues/28120)
+- JIRA: [BEAM-12240](https://issues.apache.org/jira/browse/BEAM-12240)