This is an automated email from the ASF dual-hosted git repository.
yhu 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 02b84b8487a Follow up Java21 examples (#29117)
02b84b8487a is described below
commit 02b84b8487a42900caef8099e23cd31c63b88238
Author: Yi Hu <ya...@google.com>
AuthorDate: Tue Oct 24 14:57:31 2023 -0400
Follow up Java21 examples (#29117)
* Skip unsupported ver for -PtestJavaVersion option
this fixes Java Examples ARM GHA on Java8
* Fix missing readme
---
.github/workflows/README.md | 2 +-
.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml | 2 +-
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 18333212487..c7db263120e 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -271,7 +271,7 @@ Please note that jobs with matrix need to have matrix
element in the comment. Ex
| [ PostCommit Java Dataflow V2
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_DataflowV2.yml)
| N/A |`Run PostCommit_Java_DataflowV2`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_DataflowV2.yml?query=event%3Aschedule)
|
| [ PostCommit Java Examples Dataflow ARM
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml)
| ['8','11','17'] |`Run Java_Examples_Dataflow_ARM PostCommit
(matrix_element)`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples
[...]
| [ PostCommit Java Examples
Dataflow](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow.yml)
| N/A |`Run Java examples on Dataflow`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow.yml?query=event%3Aschedule)
|
-| [ PostCommit Java Examples Dataflow Java
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_Java.yml)
| ['11','17'] |`Run Java examples on Dataflow Java (matrix_element)`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Datafl
[...]
+| [ PostCommit Java Examples Dataflow Java
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_Java.yml)
| ['11','17','21'] |`Run Java examples on Dataflow Java (matrix_element)`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_D
[...]
| [ PostCommit Java Examples Dataflow V2
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml)
| N/A |`Run Java Examples on Dataflow Runner V2`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml?query=event%3Aschedule)
|
| [ PostCommit Java Examples Dataflow V2 Java
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Dataflow_V2_Java.yml)
| ['11','17'] |`Run Java (matrix_element) Examples on Dataflow Runner V2`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Jav
[...]
| [ PostCommit Java Examples Direct
](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Direct.yml)
| N/A |`Run Java Examples_Direct`|
[](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Examples_Direct.yml?query=event%3Aschedule)
|
diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml
b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml
index fb93a1c7295..608d70b20cd 100644
--- a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml
+++ b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml
@@ -38,7 +38,7 @@ permissions:
# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
- group: '${{ github.workflow }} @ ${{ github.event.issue.number ||
github.event.pull_request.head.label || github.sha || github.head_ref ||
github.ref }}-${{ github.event.schedule || github.event.comment.id ||
github.event.sender.login}}'
+ group: '${{ github.workflow }} @ ${{ github.event.issue.number ||
github.event.pull_request.head.label || github.sha || github.head_ref ||
github.ref }}-${{ github.event.schedule || github.event.comment.id ||
github.event.sender.login }}'
cancel-in-progress: true
env:
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 0b72499abad..5943c0c77d8 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1543,7 +1543,7 @@ class BeamModulePlugin implements Plugin<Project> {
}
// if specified test java version, modify the compile and runtime
versions accordingly
- if (project.hasProperty('testJavaVersion')) {
+ if (['11', '17',
'21'].contains(project.findProperty('testJavaVersion'))) {
String ver = project.getProperty('testJavaVersion')
def testJavaHome = project.getProperty("java${ver}Home")
