From b39db41939b11fd6f2f90a4bfcadb5a4b8533d01 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Mon, 22 Jun 2026 13:38:38 +0000 Subject: [PATCH 1/5] try to fix forward with 17 only --- .../workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml | 4 +--- .../workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml | 4 +--- .github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml | 4 +--- .../workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml | 4 +--- .github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml | 4 +--- .github/workflows/beam_PostCommit_TransformService_Direct.yml | 4 +--- .github/workflows/beam_PostCommit_XVR_Direct.yml | 4 +--- .github/workflows/beam_PostCommit_XVR_Flink.yml | 1 + .../workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml | 1 + .../beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml | 1 + .../beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml | 1 + .../beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml | 1 + .github/workflows/beam_PostCommit_XVR_Spark3.yml | 1 + .github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml | 4 +--- .../workflows/beam_PreCommit_Xlang_Generated_Transforms.yml | 4 +--- .github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml | 4 +--- 16 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml b/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml index 564f1be187d7..c38e151fe639 100644 --- a/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml +++ b/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml @@ -73,9 +73,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: default - name: Set k8s access uses: ./.github/actions/setup-k8s-access diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml index 2c442af725e6..dad44150255c 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml @@ -74,9 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml index 5dc1ed0dbaf2..07908af3db3e 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml @@ -74,9 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml index 7bfe29e4b509..b9daea92fff6 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml @@ -73,9 +73,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml index ebb891dae457..7e7e65e8982d 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml @@ -73,9 +73,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_TransformService_Direct.yml b/.github/workflows/beam_PostCommit_TransformService_Direct.yml index 2111afa48015..38a53a1e5046 100644 --- a/.github/workflows/beam_PostCommit_TransformService_Direct.yml +++ b/.github/workflows/beam_PostCommit_TransformService_Direct.yml @@ -74,9 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: | 3.10 ${{ matrix.python_version }} diff --git a/.github/workflows/beam_PostCommit_XVR_Direct.yml b/.github/workflows/beam_PostCommit_XVR_Direct.yml index d95fe3bec3d0..d725c72894f0 100644 --- a/.github/workflows/beam_PostCommit_XVR_Direct.yml +++ b/.github/workflows/beam_PostCommit_XVR_Direct.yml @@ -74,9 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Direct script env: diff --git a/.github/workflows/beam_PostCommit_XVR_Flink.yml b/.github/workflows/beam_PostCommit_XVR_Flink.yml index e93fe82f48ad..f47e93c35285 100644 --- a/.github/workflows/beam_PostCommit_XVR_Flink.yml +++ b/.github/workflows/beam_PostCommit_XVR_Flink.yml @@ -75,6 +75,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Flink script env: diff --git a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml index 90d1eb786522..d50bbb83be8f 100644 --- a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml @@ -76,6 +76,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: default - name: Set up Docker Buildx uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 diff --git a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml index c282f6c47069..c11bbf20fbda 100644 --- a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml @@ -74,6 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: | 3.10 ${{ matrix.python_version }} diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml index 95496621f9ce..d452c8b4c3cb 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml @@ -73,6 +73,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: 3.14 - name: run PostCommit XVR PythonUsingJavaSQL Dataflow script uses: ./.github/actions/gradle-command-self-hosted-action diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml index 0cd9790e6793..d9d8b5f742f9 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml @@ -74,6 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: | 3.10 ${{ matrix.python_version }} diff --git a/.github/workflows/beam_PostCommit_XVR_Spark3.yml b/.github/workflows/beam_PostCommit_XVR_Spark3.yml index 2c7104df6115..030b36ebd4e4 100644 --- a/.github/workflows/beam_PostCommit_XVR_Spark3.yml +++ b/.github/workflows/beam_PostCommit_XVR_Spark3.yml @@ -74,6 +74,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: '17' python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Spark3 script env: diff --git a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml index e1887ce7864e..6fb1b0574562 100644 --- a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml +++ b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml @@ -74,9 +74,7 @@ jobs: uses: ./.github/actions/setup-environment-action with: python-version: default - java-version: | - 17 - 11 + java-version: '17' - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: run PostCommit Yaml Xlang Direct script diff --git a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml index 2f9741c01a01..bf6e579a7791 100644 --- a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml +++ b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml @@ -102,9 +102,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean diff --git a/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml b/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml index 10693af1bf4e..72eff4361f23 100644 --- a/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml +++ b/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml @@ -87,9 +87,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 17 - 11 + java-version: '17' python-version: default - name: run PreCommit Yaml Xlang Direct script uses: ./.github/actions/gradle-command-self-hosted-action From a3fea204c366129c8aa4b90a27acd850fb6b68bb Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Mon, 22 Jun 2026 15:15:46 +0000 Subject: [PATCH 2/5] address just two workflows --- ..._PerformanceTests_xlang_KafkaIO_Python.yml | 4 +++- ...m_PostCommit_Python_Xlang_Gcp_Dataflow.yml | 4 +++- ...eam_PostCommit_Python_Xlang_Gcp_Direct.yml | 4 +++- ...am_PostCommit_Python_Xlang_IO_Dataflow.yml | 4 +++- ...beam_PostCommit_Python_Xlang_IO_Direct.yml | 4 +++- .../workflows/beam_PostCommit_XVR_Direct.yml | 4 +++- .../workflows/beam_PostCommit_XVR_Flink.yml | 1 - ...am_PostCommit_XVR_GoUsingJava_Dataflow.yml | 1 - ...ostCommit_XVR_JavaUsingPython_Dataflow.yml | 1 - ...Commit_XVR_PythonUsingJavaSQL_Dataflow.yml | 1 - ...ostCommit_XVR_PythonUsingJava_Dataflow.yml | 1 - .../beam_PostCommit_Yaml_Xlang_Direct.yml | 4 +++- ...m_PreCommit_Xlang_Generated_Transforms.yml | 4 +++- .../beam_PreCommit_Yaml_Xlang_Direct.yml | 4 +++- .../beam/gradle/BeamModulePlugin.groovy | 24 ++++++++++++------- .../controller-container/Dockerfile | 2 +- 16 files changed, 43 insertions(+), 24 deletions(-) diff --git a/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml b/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml index c38e151fe639..564f1be187d7 100644 --- a/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml +++ b/.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml @@ -73,7 +73,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: default - name: Set k8s access uses: ./.github/actions/setup-k8s-access diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml index dad44150255c..2c442af725e6 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml @@ -74,7 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml index 07908af3db3e..5dc1ed0dbaf2 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml @@ -74,7 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml index b9daea92fff6..7bfe29e4b509 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml @@ -73,7 +73,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml index 7e7e65e8982d..ebb891dae457 100644 --- a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml +++ b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Direct.yml @@ -73,7 +73,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: | 3.10 3.14 diff --git a/.github/workflows/beam_PostCommit_XVR_Direct.yml b/.github/workflows/beam_PostCommit_XVR_Direct.yml index d725c72894f0..d95fe3bec3d0 100644 --- a/.github/workflows/beam_PostCommit_XVR_Direct.yml +++ b/.github/workflows/beam_PostCommit_XVR_Direct.yml @@ -74,7 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Direct script env: diff --git a/.github/workflows/beam_PostCommit_XVR_Flink.yml b/.github/workflows/beam_PostCommit_XVR_Flink.yml index f47e93c35285..e93fe82f48ad 100644 --- a/.github/workflows/beam_PostCommit_XVR_Flink.yml +++ b/.github/workflows/beam_PostCommit_XVR_Flink.yml @@ -75,7 +75,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Flink script env: diff --git a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml index d50bbb83be8f..90d1eb786522 100644 --- a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml @@ -76,7 +76,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: default - name: Set up Docker Buildx uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 diff --git a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml index c11bbf20fbda..c282f6c47069 100644 --- a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml @@ -74,7 +74,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: | 3.10 ${{ matrix.python_version }} diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml index d452c8b4c3cb..95496621f9ce 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml @@ -73,7 +73,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: 3.14 - name: run PostCommit XVR PythonUsingJavaSQL Dataflow script uses: ./.github/actions/gradle-command-self-hosted-action diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml index d9d8b5f742f9..0cd9790e6793 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml @@ -74,7 +74,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: | 3.10 ${{ matrix.python_version }} diff --git a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml index 6fb1b0574562..e1887ce7864e 100644 --- a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml +++ b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml @@ -74,7 +74,9 @@ jobs: uses: ./.github/actions/setup-environment-action with: python-version: default - java-version: '17' + java-version: | + 17 + 11 - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: run PostCommit Yaml Xlang Direct script diff --git a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml index bf6e579a7791..2f9741c01a01 100644 --- a/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml +++ b/.github/workflows/beam_PreCommit_Xlang_Generated_Transforms.yml @@ -102,7 +102,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean diff --git a/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml b/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml index 72eff4361f23..10693af1bf4e 100644 --- a/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml +++ b/.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml @@ -87,7 +87,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: default - name: run PreCommit Yaml Xlang Direct script uses: ./.github/actions/gradle-command-self-hosted-action 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 344cf66e01fc..b5aef5d23ad4 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -978,6 +978,9 @@ class BeamModulePlugin implements Plugin { // set compiler options for java version overrides to compile with a different java version project.ext.setJavaVerOptions = { CompileOptions options, String ver -> + if (!project.findProperty("java${ver}Home")) { + return + } if (ver == '8') { def java8Home = project.findProperty("java8Home") options.fork = true @@ -1161,16 +1164,16 @@ class BeamModulePlugin implements Plugin { // If compiled on older SDK, compile with JDK configured with compatible javaXXHome // The order is intended here if (requireJavaVersion.compareTo(JavaVersion.VERSION_11) <= 0 && - project.hasProperty('java11Home')) { + project.findProperty('java11Home')) { forkJavaVersion = '11' } else if (requireJavaVersion.compareTo(JavaVersion.VERSION_17) <= 0 && - project.hasProperty('java17Home')) { + project.findProperty('java17Home')) { forkJavaVersion = '17' } else if (requireJavaVersion.compareTo(JavaVersion.VERSION_21) <= 0 && - project.hasProperty('java21Home')) { + project.findProperty('java21Home')) { forkJavaVersion = '21' } else if (requireJavaVersion.compareTo(JavaVersion.VERSION_25) <= 0 && - project.hasProperty('java25Home')) { + project.findProperty('java25Home')) { forkJavaVersion = '25' } else { logger.config("Module ${project.name} disabled. To enable, either " + @@ -1628,7 +1631,7 @@ class BeamModulePlugin implements Plugin { } // if specified test java version, modify the compile and runtime versions accordingly if (['11', '17', '21', '25'].contains(testJavaVersion)) { - def testJavaHome = project.getProperty("java${testJavaVersion}Home") + def testJavaHome = project.findProperty("java${testJavaVersion}Home") // redirect java compiler to specified version for compileTestJava only project.tasks.compileTestJava { @@ -2710,7 +2713,8 @@ class BeamModulePlugin implements Plugin { def pythonDir = project.project(":sdks:python").projectDir def usesDataflowRunner = config.pythonPipelineOptions.contains("--runner=TestDataflowRunner") || config.pythonPipelineOptions.contains("--runner=DataflowRunner") - def javaContainerSuffix = getSupportedJavaVersion() + String ver = project.findProperty('testJavaVersion') + def javaContainerSuffix = ver ? getSupportedJavaVersion(ver) : getSupportedJavaVersion() // Sets up, collects, and runs Python pipeline tests project.tasks.register(config.name+"PythonUsingJava") { @@ -2790,7 +2794,8 @@ class BeamModulePlugin implements Plugin { ] def serviceArgs = project.project(':sdks:python').mapToArgString(expansionServiceOpts) def pythonContainerSuffix = project.project(':sdks:python').pythonVersion.replace('.', '') - def javaContainerSuffix = getSupportedJavaVersion() + String ver = project.findProperty('testJavaVersion') + def javaContainerSuffix = ver ? getSupportedJavaVersion(ver) : getSupportedJavaVersion() def setupTask = project.tasks.register(config.name+"Setup", Exec) { dependsOn ':sdks:java:container:'+javaContainerSuffix+':docker' dependsOn ':sdks:python:container:py'+pythonContainerSuffix+':docker' @@ -2979,10 +2984,11 @@ class BeamModulePlugin implements Plugin { ] def serviceArgs = project.project(':sdks:python').mapToArgString(transformServiceOpts) def pythonContainerSuffix = project.project(':sdks:python').pythonVersion.replace('.', '') - def javaContainerSuffix = getSupportedJavaVersion() + String ver = project.findProperty('testJavaVersion') + def javaContainerSuffix = ver ? getSupportedJavaVersion(ver) : getSupportedJavaVersion() // Transform service delivers transforms that refer to SDK harness containers with following sufixes. - def transformServiceJavaContainerSuffix = 'java11' + def transformServiceJavaContainerSuffix = 'java17' def transformServicePythonContainerSuffix = pythonContainerSuffix def setupTask = project.tasks.register(config.name+"Setup", Exec) { diff --git a/sdks/java/transform-service/controller-container/Dockerfile b/sdks/java/transform-service/controller-container/Dockerfile index 8aca2d7fb7c8..4efa7bdc42c3 100644 --- a/sdks/java/transform-service/controller-container/Dockerfile +++ b/sdks/java/transform-service/controller-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 83f3984402cf8309449373eddafe337a91583bd4 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Mon, 22 Jun 2026 16:20:35 +0000 Subject: [PATCH 3/5] Revert XVR Spark3 workflow java-version override --- .github/workflows/beam_PostCommit_XVR_Spark3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/beam_PostCommit_XVR_Spark3.yml b/.github/workflows/beam_PostCommit_XVR_Spark3.yml index 030b36ebd4e4..2c7104df6115 100644 --- a/.github/workflows/beam_PostCommit_XVR_Spark3.yml +++ b/.github/workflows/beam_PostCommit_XVR_Spark3.yml @@ -74,7 +74,6 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Spark3 script env: From c5f170df60975dd45b70a46da34e0b5e9f411ada Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Mon, 22 Jun 2026 16:30:31 +0000 Subject: [PATCH 4/5] Add Java 17 and 11 setup and -Pjava17Home across all XVR workflows --- .github/workflows/beam_PostCommit_XVR_Flink.yml | 4 ++++ .../workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml | 4 ++++ .../beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml | 4 ++++ .../beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml | 4 ++++ .../beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml | 4 ++++ .github/workflows/beam_PostCommit_XVR_Spark3.yml | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/.github/workflows/beam_PostCommit_XVR_Flink.yml b/.github/workflows/beam_PostCommit_XVR_Flink.yml index e93fe82f48ad..ac52e88f529c 100644 --- a/.github/workflows/beam_PostCommit_XVR_Flink.yml +++ b/.github/workflows/beam_PostCommit_XVR_Flink.yml @@ -75,6 +75,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Flink script env: @@ -83,6 +86,7 @@ jobs: with: gradle-command: :runners:flink:${{ env.FlinkVersion }}:job-server:validatesCrossLanguageRunner arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PpythonVersion=${{ matrix.python_version }} \ -PskipNonPythonTask=${{ (matrix.python_version == '3.10' && true) || false }} \ - name: Archive JUnit Test Results diff --git a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml index 90d1eb786522..78e5c8afc3f0 100644 --- a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml @@ -76,6 +76,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: default - name: Set up Docker Buildx uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 @@ -86,6 +89,7 @@ jobs: with: gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerGoUsingJava arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PuseDockerBuildx - name: Archive JUnit Test Results uses: actions/upload-artifact@v7 diff --git a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml index c282f6c47069..32dbbee7842a 100644 --- a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml @@ -74,6 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: | 3.10 ${{ matrix.python_version }} @@ -82,6 +85,7 @@ jobs: with: gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerJavaUsingPython arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PpythonVersion=${{ matrix.python_version }} \ - name: Archive JUnit Test Results uses: actions/upload-artifact@v7 diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml index 95496621f9ce..8ec8a941ed48 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml @@ -73,12 +73,16 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: 3.14 - name: run PostCommit XVR PythonUsingJavaSQL Dataflow script uses: ./.github/actions/gradle-command-self-hosted-action with: gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerPythonUsingSql arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PpythonVersion=3.14 \ - name: Archive Python Test Results uses: actions/upload-artifact@v7 diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml index 0cd9790e6793..acf4c47ad2c1 100644 --- a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml @@ -74,6 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: | 3.10 ${{ matrix.python_version }} @@ -82,6 +85,7 @@ jobs: with: gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerPythonUsingJava arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PpythonVersion=${{ matrix.python_version }} \ - name: Archive Python Test Results uses: actions/upload-artifact@v7 diff --git a/.github/workflows/beam_PostCommit_XVR_Spark3.yml b/.github/workflows/beam_PostCommit_XVR_Spark3.yml index 2c7104df6115..2db33583a317 100644 --- a/.github/workflows/beam_PostCommit_XVR_Spark3.yml +++ b/.github/workflows/beam_PostCommit_XVR_Spark3.yml @@ -74,6 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: + java-version: | + 17 + 11 python-version: ${{ matrix.python_version }} - name: run PostCommit XVR Spark3 script env: @@ -82,6 +85,7 @@ jobs: with: gradle-command: :runners:spark:3:job-server:validatesCrossLanguageRunner arguments: | + -Pjava17Home=$JAVA_HOME_17_X64 \ -PpythonVersion=${{ matrix.python_version }} \ -PskipNonPythonTask=${{ (matrix.python_version == '3.10' && true) || false }} \ - name: Archive JUnit Test Results From 4ae65b160d5f155309e30bc740212beeb40101bd Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Mon, 22 Jun 2026 16:32:55 +0000 Subject: [PATCH 5/5] Revert redundant java-version override in TransformService Direct workflow --- .github/workflows/beam_PostCommit_TransformService_Direct.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/beam_PostCommit_TransformService_Direct.yml b/.github/workflows/beam_PostCommit_TransformService_Direct.yml index 38a53a1e5046..2111afa48015 100644 --- a/.github/workflows/beam_PostCommit_TransformService_Direct.yml +++ b/.github/workflows/beam_PostCommit_TransformService_Direct.yml @@ -74,7 +74,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: '17' + java-version: | + 17 + 11 python-version: | 3.10 ${{ matrix.python_version }}