Bumped gradlew to 6.9; fixed issue in JavaExec tasks

rjrudin · rjrudin · commit 0ef32b55e2b7 · 2021-06-25T10:46:22.000-04:00
The 3 JavaExec tasks were all throwing stackoverflow errors due to "return super.configure" being called. Turns out the better way to set the main class is in the constructor via mainClass.set .
diff --git a/examples/alert-project/gradle/wrapper/gradle-wrapper.properties b/examples/alert-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/corb2-project/gradle/wrapper/gradle-wrapper.properties b/examples/corb2-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/cpf-project/gradle/wrapper/gradle-wrapper.properties b/examples/cpf-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/cpf-project/gradlew b/examples/cpf-project/gradlew
diff --git a/examples/custom-forests-and-replicas-project/gradle/wrapper/gradle-wrapper.properties b/examples/custom-forests-and-replicas-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/custom-rest-rewriter-project/gradle/wrapper/gradle-wrapper.properties b/examples/custom-rest-rewriter-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/data-services/gradle/wrapper/gradle-wrapper.properties b/examples/data-services/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/disconnected-project-using-plugins-and-gradlew/gradle/wrapper/gradle-wrapper.properties b/examples/disconnected-project-using-plugins-and-gradlew/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=PROJECT
 distributionPath=build/offline/gradle/wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=PROJECT
-zipStorePath=build/offline/gradle/wrapper
+zipStorePath=build/offline/gradle/wrapper
diff --git a/examples/docker-projects/single-node-with-nifi/gradle/wrapper/gradle-wrapper.properties b/examples/docker-projects/single-node-with-nifi/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/docker-projects/single-node/gradle/wrapper/gradle-wrapper.properties b/examples/docker-projects/single-node/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle/wrapper/gradle-wrapper.properties b/examples/docker-projects/three-node-cluster-with-ha-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/entity-services-project/gradle/wrapper/gradle-wrapper.properties b/examples/entity-services-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/external-security/gradle/wrapper/gradle-wrapper.properties b/examples/external-security/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/failover-project/gradle/wrapper/gradle-wrapper.properties b/examples/failover-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/flexrep-project/gradle/wrapper/gradle-wrapper.properties b/examples/flexrep-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/flexrep-with-path-project/gradle/wrapper/gradle-wrapper.properties b/examples/flexrep-with-path-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/httpbuilder-project/gradle/wrapper/gradle-wrapper.properties b/examples/httpbuilder-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/ignore-resources-project/gradle/wrapper/gradle-wrapper.properties b/examples/ignore-resources-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/mimetypes-project/gradle/wrapper/gradle-wrapper.properties b/examples/mimetypes-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/minimal-project/gradle/wrapper/gradle-wrapper.properties b/examples/minimal-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/mlcp-project/gradle/wrapper/gradle-wrapper.properties b/examples/mlcp-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/no-appservers-project/gradle/wrapper/gradle-wrapper.properties b/examples/no-appservers-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/properties-project/gradle/wrapper/gradle-wrapper.properties b/examples/properties-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/role-project/gradle/wrapper/gradle-wrapper.properties b/examples/role-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/roxy-project/gradle/wrapper/gradle-wrapper.properties b/examples/roxy-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle
@@ -6,9 +6,10 @@ buildscript {
 	repositories {
 		mavenLocal()
 		jcenter()
+		mavenCentral()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:4.1.1"
+		classpath "com.marklogic:ml-gradle:4.2.0"
 	}
 }
 
@@ -56,13 +57,13 @@ configurations {
 dependencies {
 	// Needed to compile and run the JUnit tests
 	// Note that ml-junit has been deprecated and replaced by marklogic-unit-test + marklogic-junit
-	testCompile "com.marklogic:ml-junit:3.2.0"
-	testCompile "com.jayway.restassured:rest-assured:2.4.1"
+	testImplementation "com.marklogic:ml-junit:3.2.0"
+	testImplementation "com.jayway.restassured:rest-assured:2.4.1"
 
 	// Required for Java 11
-	testRuntime "javax.xml.bind:jaxb-api:2.3.1"
-	testRuntime "com.sun.xml.bind:jaxb-core:2.3.0.1"
-	testRuntime "com.sun.xml.bind:jaxb-impl:2.3.2"
+	testImplementation "javax.xml.bind:jaxb-api:2.3.1"
+	testImplementation "com.sun.xml.bind:jaxb-core:2.3.0.1"
+	testImplementation "com.sun.xml.bind:jaxb-impl:2.3.2"
 
 	// corb jar available from jcenter
 	corb "com.marklogic:marklogic-corb:2.4.5"
diff --git a/examples/schemas-project/gradle/wrapper/gradle-wrapper.properties b/examples/schemas-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/shell-project/build.gradle b/examples/shell-project/build.gradle
@@ -1,19 +1,20 @@
 plugins {
-  id "java"
-  id "com.marklogic.ml-gradle" version "3.6.0"
+	id "com.marklogic.ml-gradle" version "4.2.0"
 }
 
 repositories {
   jcenter()
+	mavenCentral()
+	mavenLocal()
 }
 
 dependencies {
 	// Brings in a tiny Main program that ShellTask uses
-	runtime "com.marklogic:ml-groovysh:0.1.4"
+	implementation "com.marklogic:ml-groovysh:0.1.4"
 
 	// Provides the "guts" needed by ShellTask; can pick any version you want, as ml-groovysh does not
 	// specify a dependency on ml-app-deployer
-	runtime "com.marklogic:ml-app-deployer:2.6.0"
+	implementation "com.marklogic:ml-app-deployer:4.2.0"
 }
 
 mlShell.classpath = sourceSets.main.runtimeClasspath
diff --git a/examples/shell-project/gradle/wrapper/gradle-wrapper.properties b/examples/shell-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle
@@ -18,7 +18,7 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
-import javax.net.ssl.sslContext;
+import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 import java.security.cert.CertificateException;
diff --git a/examples/ssl-2way-project/gradle/wrapper/gradle-wrapper.properties b/examples/ssl-2way-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/ssl-project/gradle/wrapper/gradle-wrapper.properties b/examples/ssl-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/temporal-lsqt-project/gradle/wrapper/gradle-wrapper.properties b/examples/temporal-lsqt-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/temporal-project/gradle/wrapper/gradle-wrapper.properties b/examples/temporal-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/triggers-project/gradle/wrapper/gradle-wrapper.properties b/examples/triggers-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/uni-temporal-project/gradle/wrapper/gradle-wrapper.properties b/examples/uni-temporal-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/examples/use-modulesdb-project/gradle/wrapper/gradle-wrapper.properties b/examples/use-modulesdb-project/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Fri Jul 17 11:35:34 EDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/com/marklogic/gradle/task/CorbTask.groovy b/src/main/groovy/com/marklogic/gradle/task/CorbTask.groovy
@@ -41,7 +41,9 @@ XML-FILE,XML-METADATA,XML-NODE,XML-SCHEMA,XML-TEMP-DIR,ZIP-FILE\
 XQUERY-MODULE".tokenize(',')
 
   CorbTask() {
-    String[] optionNames = DEFAULT_CORB_OPTIONS
+	  mainClass.set("com.marklogic.developer.corb.Manager")
+
+	  String[] optionNames = DEFAULT_CORB_OPTIONS
     // obtain the options from CoRB Options class, to ensure that the latest available are applied to this task
     try {
         optionNames = Class.forName("com.marklogic.developer.corb.Options", true, Thread.currentThread().contextClassLoader)
@@ -92,13 +94,6 @@ XQUERY-MODULE".tokenize(',')
   // corb defaults to 1, but 8 seems like a more common default
   def threadCount = 8 // THREAD-COUNT
 
-	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
-	@Override
-	Task configure(Closure closure) {
-		setMain("com.marklogic.developer.corb.Manager")
-		return super.configure(closure)
-	}
-
 	@TaskAction
   @Override
   public void exec() {
diff --git a/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy b/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy
@@ -36,11 +36,8 @@ class MlcpTask extends JavaExec {
 		return Logging.getLogger(MlcpTask.class)
 	}
 
-	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
-	@Override
-	Task configure(Closure closure) {
-		setMain("com.marklogic.contentpump.ContentPump")
-		return super.configure(closure)
+	MlcpTask() {
+		mainClass.set("com.marklogic.contentpump.ContentPump")
 	}
 
 	@TaskAction
diff --git a/src/main/groovy/com/marklogic/gradle/task/shell/ShellTask.groovy b/src/main/groovy/com/marklogic/gradle/task/shell/ShellTask.groovy
@@ -19,11 +19,8 @@ import org.gradle.api.tasks.TaskAction
  */
 class ShellTask extends JavaExec {
 
-	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
-	@Override
-	Task configure(Closure closure) {
-		setMain("com.marklogic.groovysh.Main")
-		return super.configure(closure)
+	ShellTask() {
+		mainClass.set("com.marklogic.groovysh.Main")
 	}
 
 	@TaskAction
