Skip to content

Commit 971934f

Browse files
committed
#287 Fixing mlRoxyMigrateProperties
1 parent 1f9617b commit 971934f

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=com.marklogic
2-
version=3.2.1
2+
version=3.2.2
33
mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.2.0
44
mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0
55

src/main/groovy/com/marklogic/gradle/task/roxy/RoxyMigratePropertiesTask.groovy

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.gradle.api.tasks.TaskAction
44

55
class RoxyMigratePropertiesTask extends RoxyTask {
66

7-
Set<String> allRoxyProperties = new LinkedHashSet<>()
87
def roxyPropertyFiles = ["default.properties", "build.properties"]
98
def roxyGradleMapping = [
109
"app-name" : "mlAppName",
@@ -91,19 +90,8 @@ class RoxyMigratePropertiesTask extends RoxyTask {
9190
if (file.exists()) {
9291
new File("backup-" + filename).write(file.text)
9392
}
94-
file.withWriter { writer ->
95-
roxyGradleMapping.each { k, v ->
96-
def val = roxyProperties.get(k)
97-
if (val) writer.append(v).append("=").append(val).append("\n")
98-
}
99-
allRoxyProperties.removeAll(roxyGradleMapping.keySet())
100-
allRoxyProperties.each{ prop ->
101-
writer.append(prop).append("=").append("unmapped").append("\n")
102-
}
103-
}
93+
println "Writing: " + filename
94+
file.write(text)
10495
}
10596

106-
String getRoxyHome(){
107-
project.hasProperty("mlRoxyHome") ? project.property("mlRoxyHome") : ""
108-
}
10997
}

0 commit comments

Comments
 (0)