Merge pull request apache#1748: [BEAM-14375] Fix Java Wordcount Dataf…

…low postcommit for Gradle 7.4
AnandInguva · May 2, 2022 · e0166e2 · e0166e2
2 parents c52a5b8 + d419e8a
commit e0166e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Run :sdks:java:core:test
         uses: ./.github/actions/gradle-command-action
         with:
-          arguments: :sdks:java:core:test
+          arguments: -p sdks/java/core/ test
       - name: Upload test logs for :sdks:java:core:test
         uses: actions/upload-artifact@v2
         if: always()
@@ -85,7 +85,7 @@ jobs:
       - name: Run :sdks:java:harness:test
         uses: ./.github/actions/gradle-command-action
         with:
-          arguments: :sdks:java:harness:test
+          arguments: -p sdks/java/harness/ test
         if: always()
       - name: Upload test logs for :sdks:java:harness:test
         uses: actions/upload-artifact@v2
@@ -97,7 +97,7 @@ jobs:
       - name: Run :runners:core-java:test
         uses: ./.github/actions/gradle-command-action
         with:
-          arguments: :runners:core-java:test
+          arguments: -p runners/core-java/ test
         if: always()
       - name: Upload test logs for :runners:core-java:test
         uses: actions/upload-artifact@v2

diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1787,8 +1787,6 @@ class BeamModulePlugin implements Plugin<Project> {
         if (pipelineOptionsString && configuration.runner?.equalsIgnoreCase('dataflow')) {
           if (pipelineOptionsString.contains('use_runner_v2')) {
             dependsOn ':runners:google-cloud-dataflow-java:buildAndPushDockerContainer'
-          } else {
-            project.evaluationDependsOn(":runners:google-cloud-dataflow-java:worker:legacy-worker")
           }
         }
 
@@ -1803,6 +1801,7 @@ class BeamModulePlugin implements Plugin<Project> {
                 "--region=${dataflowRegion}"
               ])
             } else {
+              project.evaluationDependsOn(":runners:google-cloud-dataflow-java:worker:legacy-worker")
               def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?:
                   project.project(":runners:google-cloud-dataflow-java:worker:legacy-worker").shadowJar.archivePath
               allOptionsList.addAll([