diff --git a/gradle.properties b/gradle.properties index 8c5d0072a..62d595cf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.marklogic -version=3.2.1 +version=3.2.2 mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.2.0 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0 diff --git a/src/main/groovy/com/marklogic/gradle/task/roxy/RoxyMigratePropertiesTask.groovy b/src/main/groovy/com/marklogic/gradle/task/roxy/RoxyMigratePropertiesTask.groovy index d6110b2bf..df1678e7f 100644 --- a/src/main/groovy/com/marklogic/gradle/task/roxy/RoxyMigratePropertiesTask.groovy +++ b/src/main/groovy/com/marklogic/gradle/task/roxy/RoxyMigratePropertiesTask.groovy @@ -4,7 +4,6 @@ import org.gradle.api.tasks.TaskAction class RoxyMigratePropertiesTask extends RoxyTask { - Set allRoxyProperties = new LinkedHashSet<>() def roxyPropertyFiles = ["default.properties", "build.properties"] def roxyGradleMapping = [ "app-name" : "mlAppName", @@ -91,19 +90,8 @@ class RoxyMigratePropertiesTask extends RoxyTask { if (file.exists()) { new File("backup-" + filename).write(file.text) } - file.withWriter { writer -> - roxyGradleMapping.each { k, v -> - def val = roxyProperties.get(k) - if (val) writer.append(v).append("=").append(val).append("\n") - } - allRoxyProperties.removeAll(roxyGradleMapping.keySet()) - allRoxyProperties.each{ prop -> - writer.append(prop).append("=").append("unmapped").append("\n") - } - } + println "Writing: " + filename + file.write(text) } - String getRoxyHome(){ - project.hasProperty("mlRoxyHome") ? project.property("mlRoxyHome") : "" - } }