Skip to content

Commit de62851

Browse files
committed
#472 Preparing bundles now works on Java 11+
The bundle directory is now resolved against the project directory
1 parent 802d6c5 commit de62851

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/main/groovy/com/marklogic/gradle/task/client/PrepareBundlesTask.groovy

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ class PrepareBundlesTask extends MarkLogicTask {
3131
println "\nWARNING: mlRestApi is deprecated as of release 3.13.0, please use mlBundle instead, which is a drop-in replacement.\n"
3232
}
3333

34-
def buildDir = new File("build/" + configurationName)
34+
def buildDir = new File(getProject().getProjectDir(), "build")
35+
buildDir.mkdirs()
36+
def bundleDir = new File(buildDir, configurationName)
3537
try {
36-
FileUtils.cleanDirectory(buildDir)
38+
FileUtils.cleanDirectory(bundleDir)
3739
} catch (Exception e) {
38-
println "Unable to delete directory: " + buildDir
40+
println "Unable to delete directory: " + bundleDir
3941
}
40-
buildDir.mkdirs()
42+
bundleDir.mkdirs()
4143

4244
// Constructing a DefaultAntBuilder seems to avoid Xerces-related classpath issues
4345
// The DefaultAntBuilder constructor changed between Gradle 2.13 and 2.14, and we want
@@ -50,7 +52,7 @@ class PrepareBundlesTask extends MarkLogicTask {
5052
}
5153

5254
for (f in config.files) {
53-
ant.unzip(src: f, dest: buildDir, overwrite: "true")
55+
ant.unzip(src: f, dest: bundleDir, overwrite: "true")
5456
}
5557

5658
List<ConfigDir> configDirs = getAppConfig().getConfigDirs()
@@ -68,7 +70,7 @@ class PrepareBundlesTask extends MarkLogicTask {
6870
List<String> schemaPaths = getAppConfig().getSchemaPaths()
6971
List<String> newSchemaPaths = new ArrayList<>()
7072

71-
for (dir in buildDir.listFiles()) {
73+
for (dir in bundleDir.listFiles()) {
7274
if (dir.isDirectory()) {
7375
File configDir = new File(dir, "ml-config")
7476
if (configDir != null && configDir.exists()) {

0 commit comments

Comments
 (0)