[BEAM-13430] Swap to use "mainClass" instead of "main" since it was d…

…eprecated. (apache#16400) See https://docs.gradle.org/7.3.2/dsl/org.gradle.api.tasks.JavaExec.html?_ga=2.124534154.1653102406.1640909413-346869268.1640099071#org.gradle.api.tasks.JavaExec:main for details
twosom · Jan 4, 2022 · 43a17a3 · 43a17a3
1 parent 1636a3a
commit 43a17a3
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 29 deletions.
diff --git a/.test-infra/validate-runner/build.gradle b/.test-infra/validate-runner/build.gradle
@@ -62,6 +62,6 @@ if (project.hasProperty("args")) {
 
 task runner(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
-    main = "org.apache.beam.validate.runner.Main"
+    mainClass = "org.apache.beam.validate.runner.Main"
     args cmdargs.split()
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -415,7 +415,7 @@ if (project.hasProperty("javaLinkageArtifactIds")) {
   project.task<JavaExec>("checkJavaLinkage") {
     dependsOn(project.getTasksByName("publishMavenJavaPublicationToMavenLocal", true /* recursively */))
     classpath = linkageCheckerJava
-    main = "com.google.cloud.tools.opensource.classpath.LinkageCheckerMain"
+    mainClass.value("com.google.cloud.tools.opensource.classpath.LinkageCheckerMain")
     val javaLinkageArtifactIds: String = project.property("javaLinkageArtifactIds") as String? ?: ""
     var arguments = arrayOf("-a", javaLinkageArtifactIds.split(",").joinToString(",") {
       if (it.contains(":")) {

diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1320,7 +1320,7 @@ class BeamModulePlugin implements Plugin<Project> {
         }
 
         project.task("jmh", type: JavaExec, dependsOn: project.jmhClasses, {
-          main = "org.openjdk.jmh.Main"
+          mainClass = "org.openjdk.jmh.Main"
           classpath = project.sourceSets.jmh.compileClasspath + project.sourceSets.jmh.runtimeClasspath
           // For a list of arguments, see
           // https://github.com/guozheng/jmh-tutorial/blob/master/README.md
@@ -2095,7 +2095,7 @@ class BeamModulePlugin implements Plugin<Project> {
       project.task(taskName, dependsOn: ':release:classes', type: JavaExec) {
         group = "Verification"
         description = "Run the Beam ${config.type} with the ${config.runner} runner"
-        main = "${config.type}-java-${config.runner}".toLowerCase()
+        mainClass = "${config.type}-java-${config.runner}".toLowerCase()
         classpath = project.project(':release').sourceSets.main.runtimeClasspath
         args argsNeeded
       }

diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -156,7 +156,7 @@ task preCommit() {
 }
 
 task execute (type:JavaExec) {
-  main = System.getProperty("mainClass")
+  mainClass = System.getProperty("mainClass")
   classpath = sourceSets.main.runtimeClasspath
   systemProperties System.getProperties()
   args System.getProperty("exec.args", "").split()
@@ -165,7 +165,7 @@ task execute (type:JavaExec) {
 // Run this task to validate the Java environment setup for contributors
 task wordCount(type:JavaExec) {
   description "Run the Java word count example"
-  main = "org.apache.beam.examples.WordCount"
+  mainClass = "org.apache.beam.examples.WordCount"
   classpath = sourceSets.main.runtimeClasspath
   systemProperties = System.getProperties()
   args = ["--output=/tmp/ouput.txt"]

diff --git a/...va/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java b/...va/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java
@@ -91,7 +91,7 @@
  * to execute the pipeline:
  *   {@code
  *   task execute (type:JavaExec) {
- *      main = System.getProperty("mainClass")
+ *      mainClass = System.getProperty("mainClass")
  *      classpath = sourceSets.main.runtimeClasspath
  *      systemProperties System.getProperties()
  *      args System.getProperty("exec.args", "").split()

diff --git a/...java/src/main/java/org/apache/beam/examples/complete/datatokenization/README.md b/...java/src/main/java/org/apache/beam/examples/complete/datatokenization/README.md
@@ -71,7 +71,7 @@ To run this example your `build.gradle` file should contain the following task t
 
 ```
 task execute (type:JavaExec) {
-    main = System.getProperty("mainClass")
+    mainClass = System.getProperty("mainClass")
     classpath = sourceSets.main.runtimeClasspath
     systemProperties System.getProperties()
     args System.getProperty("exec.args", "").split()

diff --git a/...les/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/KafkaToPubsub.java b/...les/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/KafkaToPubsub.java
@@ -68,7 +68,7 @@
  * to execute the pipeline:
  * {@code
  * task execute (type:JavaExec) {
- *     main = System.getProperty("mainClass")
+ *     mainClass = System.getProperty("mainClass")
  *     classpath = sourceSets.main.runtimeClasspath
  *     systemProperties System.getProperties()
  *     args System.getProperty("exec.args", "").split()

diff --git a/...es/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/README.md b/...es/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/README.md
@@ -73,7 +73,7 @@ To run this example your `build.gradle` file should contain the following task t
 
 ```
 task execute (type:JavaExec) {
-    main = System.getProperty("mainClass")
+    mainClass = System.getProperty("mainClass")
     classpath = sourceSets.main.runtimeClasspath
     systemProperties System.getProperties()
     args System.getProperty("exec.args", "").split()

diff --git a/examples/java/twitter/build.gradle b/examples/java/twitter/build.gradle
@@ -98,5 +98,5 @@ task preCommit() {
 }
 
 task execute (type:JavaExec) {
-    main = "org.apache.beam.examples.twitterstreamgenerator.TwitterStream"
+    mainClass = "org.apache.beam.examples.twitterstreamgenerator.TwitterStream"
 }
diff --git a/runners/flink/flink_runner.gradle b/runners/flink/flink_runner.gradle
@@ -282,7 +282,7 @@ def createPipelineOptionsTableTask(String target) {
     group = 'Website'
     description = "Generates a table with pipeline options for the Flink Runner documentation page"
     classpath = sourceSets.test.runtimeClasspath
-    main = 'org.apache.beam.runners.flink.website.PipelineOptionsTableGenerator'
+    mainClass = 'org.apache.beam.runners.flink.website.PipelineOptionsTableGenerator'
     args = [target]
     standardOutput = new ByteArrayOutputStream()
     doLast {

diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
@@ -711,7 +711,7 @@ createJavaExamplesArchetypeValidationTask(type: 'MobileGaming',
 
 // Standalone task for testing GCS upload, use with -PfilesToStage and -PdataflowTempRoot.
 task GCSUpload(type: JavaExec) {
-  main = 'org.apache.beam.runners.dataflow.util.GCSUploadMain'
+  mainClass = 'org.apache.beam.runners.dataflow.util.GCSUploadMain'
   classpath = sourceSets.test.runtimeClasspath
   args "--stagingLocation=${dataflowUploadTemp}/staging",
        "--filesToStage=${testFilesToStage}"

diff --git a/sdks/java/expansion-service/app/build.gradle b/sdks/java/expansion-service/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 }
 
 task runExpansionService (type: JavaExec) {
-  main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+  mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
   classpath = sourceSets.main.runtimeClasspath
   args = [project.findProperty("constructionService.port") ?: "8097"]
 }
diff --git a/sdks/java/expansion-service/build.gradle b/sdks/java/expansion-service/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 }
 
 task runExpansionService (type: JavaExec) {
-  main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+  mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
   classpath = sourceSets.main.runtimeClasspath
   args = [project.findProperty("constructionService.port") ?: "8097"]
 }
diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 }
 
 task runExpansionService (type: JavaExec) {
-    main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+    mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
     classpath = sourceSets.test.runtimeClasspath
     args = [project.findProperty("constructionService.port") ?: "8097"]
 }
diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
@@ -205,15 +205,15 @@ idea {
 // Run basic SQL example
 task runBasicExample(type: JavaExec) {
   description = "Run basic SQL example"
-  main = "org.apache.beam.sdk.extensions.sql.example.BeamSqlExample"
+  mainClass = "org.apache.beam.sdk.extensions.sql.example.BeamSqlExample"
   classpath = sourceSets.main.runtimeClasspath
   args = ["--runner=DirectRunner"]
 }
 
 // Run SQL example on POJO inputs
 task runPojoExample(type: JavaExec) {
   description = "Run SQL example for PCollections of POJOs"
-  main = "org.apache.beam.sdk.extensions.sql.example.BeamSqlPojoExample"
+  mainClass = "org.apache.beam.sdk.extensions.sql.example.BeamSqlPojoExample"
   classpath = sourceSets.main.runtimeClasspath
   args = ["--runner=DirectRunner"]
 }

diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 
 task runDataCatalogExample(type: JavaExec) {
   description = "Run SQL example of how to use Data Catalog table provider"
-  main = "org.apache.beam.sdk.extensions.sql.example.BeamSqlDataCatalogExample"
+  mainClass = "org.apache.beam.sdk.extensions.sql.example.BeamSqlDataCatalogExample"
   classpath = sourceSets.main.runtimeClasspath
 
   def runner = project.findProperty('runner') ?: 'DirectRunner'

diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 }
 
 task runExpansionService (type: JavaExec) {
-  main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+  mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
   classpath = sourceSets.main.runtimeClasspath
   args = [project.findProperty("constructionService.port") ?: "8097"]
 }
diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 }
 
 task runExpansionService (type: JavaExec) {
-  main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+  mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
   classpath = sourceSets.test.runtimeClasspath
   args = [project.findProperty("constructionService.port") ?: "8097"]
 }
diff --git a/sdks/java/testing/expansion-service/build.gradle b/sdks/java/testing/expansion-service/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 }
 
 task runTestExpansionService (type: JavaExec) {
-  main = "org.apache.beam.sdk.expansion.service.ExpansionService"
+  mainClass = "org.apache.beam.sdk.expansion.service.ExpansionService"
   classpath = sourceSets.test.runtimeClasspath
   args = [project.findProperty("constructionService.port") ?: "8097"]
 }

diff --git a/sdks/java/testing/kafka-service/build.gradle b/sdks/java/testing/kafka-service/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 }
 
 task runTestKafkaService (type: JavaExec) {
-  main = "org.apache.beam.sdk.testing.kafka.LocalKafka"
+  mainClass = "org.apache.beam.sdk.testing.kafka.LocalKafka"
   classpath = sourceSets.test.runtimeClasspath
   args = [
     project.findProperty("kafka.port") ?: "9092",

diff --git a/sdks/java/testing/load-tests/build.gradle b/sdks/java/testing/load-tests/build.gradle
@@ -27,7 +27,6 @@ description = "Apache Beam :: SDKs :: Java :: Load Tests"
 
 
 def mainClassProperty = "loadTest.mainClass"
-def mainClass = project.findProperty(mainClassProperty)
 
 // When running via Gradle, this property can be used to pass commandline arguments
 // to the load-tests launch
@@ -135,7 +134,7 @@ task run(type: JavaExec) {
       dependsOn ":runners:google-cloud-dataflow-java:worker:legacy-worker:shadowJar"
     }
   }
-  main = mainClass
+  mainClass = project.findProperty(mainClassProperty)
   classpath = configurations.gradleRun
   args loadTestArgsList.toArray()
 }
diff --git a/sdks/java/testing/nexmark/build.gradle b/sdks/java/testing/nexmark/build.gradle
@@ -177,7 +177,7 @@ task run(type: JavaExec) {
       dependsOn ":runners:google-cloud-dataflow-java:worker:legacy-worker:shadowJar"
     }
   }
-  main = "org.apache.beam.sdk.nexmark.Main"
+  mainClass = "org.apache.beam.sdk.nexmark.Main"
   classpath = configurations.gradleRun
   args nexmarkArgsList.toArray()
 }
diff --git a/sdks/java/testing/tpcds/build.gradle b/sdks/java/testing/tpcds/build.gradle
@@ -126,7 +126,7 @@ task run(type: JavaExec) {
         tpcdsArgsList.add('--workerHarnessContainerImage=')
     }
 
-    main = "org.apache.beam.sdk.tpcds.BeamTpcds"
+    mainClass = "org.apache.beam.sdk.tpcds.BeamTpcds"
     classpath = configurations.gradleRun
     args tpcdsArgsList.toArray()
 }
diff --git a/sdks/java/testing/watermarks/build.gradle b/sdks/java/testing/watermarks/build.gradle
@@ -109,7 +109,7 @@ task run(type: JavaExec) {
             " --workerHarnessContainerImage="
   }
 
-  main = mainClass
+  mainClass = mainClass
   classpath = configurations.gradleRun
   args loadTestArgs.split()
 }

diff --git a/website/www/site/content/en/get-started/quickstart-java.md b/website/www/site/content/en/get-started/quickstart-java.md
@@ -129,7 +129,7 @@ repositories {
 1. Add the following task in `build.gradle` to allow you to execute pipelines with Gradle:
 {{< highlight >}}
 task execute (type:JavaExec) {
-    main = System.getProperty("mainClass")
+    mainClass = System.getProperty("mainClass")
     classpath = sourceSets.main.runtimeClasspath
     systemProperties System.getProperties()
     args System.getProperty("exec.args", "").split()