Skip to content

Commit fe844c9

Browse files
committed
#604 Fixing MlcpTask so it runs on Gradle 6.4 again
1 parent ec9a866 commit fe844c9

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@ import com.marklogic.appdeployer.AppConfig
44
import com.marklogic.client.DatabaseClient
55
import com.marklogic.client.io.FileHandle
66
import com.marklogic.contentpump.bean.MlcpBean
7-
import org.gradle.api.Task
87
import org.gradle.api.logging.Logger
98
import org.gradle.api.logging.Logging
10-
import org.gradle.api.tasks.Input
11-
import org.gradle.api.tasks.Internal
12-
import org.gradle.api.tasks.JavaExec
13-
import org.gradle.api.tasks.Optional
14-
import org.gradle.api.tasks.TaskAction
9+
import org.gradle.api.tasks.*
1510

1611
/**
1712
* As of version 4.3.1, this no longer uses "@Delegate" and an instance of MlcpBean, which no longer works in Gradle 7.
@@ -132,11 +127,8 @@ class MlcpTask extends JavaExec {
132127
return Logging.getLogger(MlcpTask.class)
133128
}
134129

135-
// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
136-
@Override
137-
Task configure(Closure closure) {
138-
setMain("com.marklogic.contentpump.ContentPump")
139-
return super.configure(closure)
130+
MlcpTask() {
131+
super.getMainClass().set("com.marklogic.contentpump.ContentPump")
140132
}
141133

142134
@TaskAction

0 commit comments

Comments
 (0)