Fix verifyJavaVersion in a few places (#32183)

* Fix verifyJavaVersion wrong filter * Add jvm verification to Java Examples Dataflow v1/v2 * Fix java container validateJavaHome run on Java11+ without -Pjava11Home
apache · Aug 14, 2024 · 1eb416e · 1eb416e
1 parent f1f5f77
commit 1eb416e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
@@ -657,6 +657,9 @@ task examplesJavaRunnerV2PreCommit(type: Test) {
 task examplesJavaRunnerV2IntegrationTest(type: Test) {
   group = "Verification"
   dependsOn buildAndPushDockerJavaContainer
+  if (project.hasProperty("testJavaVersion")) {
+    dependsOn ":sdks:java:testing:test-utils:verifyJavaVersion${project.property("testJavaVersion")}"
+  }
 
   systemProperty "beamTestPipelineOptions", JsonOutput.toJson(runnerV2PipelineOptions)
 

diff --git a/runners/google-cloud-dataflow-java/examples/build.gradle b/runners/google-cloud-dataflow-java/examples/build.gradle
@@ -183,6 +183,9 @@ task java21PostCommit() {
 task preCommit() {
   dependsOn preCommitLegacyWorker
   dependsOn preCommitLegacyWorkerImpersonate
+  if (project.hasProperty("testJavaVersion")) {
+    dependsOn ":sdks:java:testing:test-utils:verifyJavaVersion${project.property("testJavaVersion")}"
+  }
 }
 
 task verifyPortabilityApi() {

diff --git a/sdks/java/container/common.gradle b/sdks/java/container/common.gradle
@@ -103,6 +103,9 @@ task validateJavaHome {
     def requiredForVer = ["11", "17", "21"]
     if (requiredForVer.contains(imageJavaVersion)) {
         doFirst {
+            if (JavaVersion.VERSION_1_8.compareTo(JavaVersion.current()) < 0) {
+                return
+            }
             boolean propertyFound = false
             // enable to build agent with compatible java versions (11-requiredForVer)
             for (def checkVer : requiredForVer) {
@@ -115,7 +118,7 @@ task validateJavaHome {
                 }
             }
             if (!propertyFound) {
-                throw new GradleException("java${imageJavaVersion}Home or compatible properties required for imageJavaVersion=${imageJavaVersion}. Re-run with -Pjava${imageJavaVersion}Home")
+                throw new GradleException("System Java needs to have version 11+ or java${imageJavaVersion}Home required for imageJavaVersion=${imageJavaVersion}. Re-run with -Pjava${imageJavaVersion}Home")
             }
         }
     }

diff --git a/sdks/java/testing/test-utils/build.gradle b/sdks/java/testing/test-utils/build.gradle
@@ -40,15 +40,15 @@ dependencies {
   provided library.java.jmh_core
 
   testImplementation library.java.junit
-  testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadowTest")
+  testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
 }
 
-['8', '11', '17', '21'].each {
-  tasks.create(name: "verifyJavaVersion${it}", type: Test) {
+['8', '11', '17', '21'].each { String ver ->
+  tasks.create(name: "verifyJavaVersion${ver}", 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}"
+      includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyTestCodeIsCompiledWithJava${ver}"
+      includeTestsMatching "org.apache.beam.sdk.testutils.jvmverification.JvmVerification.verifyRunningJVMVersionIs${ver}"
     }
     doLast {
       println 'Java verified'