Skip to content

Commit

Permalink
#198 Only try to set mlTestRestPort if mlRestPort has been set
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Rudin committed May 22, 2017
1 parent 1a3bd4a commit 00bf194
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ pluginBundle {
displayName = 'ml-gradle for MarkLogic'
description = 'Gradle plugin for configuring and deploying applications to MarkLogic'
tags = ['marklogic']
version = "2.7.2"
version = "2.7.3"
}
}

mavenCoordinates {
version = "2.7.2"
version = "2.7.3"
}
}
2 changes: 1 addition & 1 deletion examples/minimal-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
*/

plugins {
id "com.marklogic.ml-gradle" version "2.7.2"
id "com.marklogic.ml-gradle" version "2.7.3"
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=com.marklogic
version=2.7.2
version=2.7.3
mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.7.0
mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class NewProjectTask extends MarkLogicTask {
if (ant.mlPropertiesPlugin == "y") {
def text = 'plugins {' +
'\n id "net.saliman.properties" version "1.4.6"' +
'\n id "com.marklogic.ml-gradle" version "2.7.2"' +
'\n id "com.marklogic.ml-gradle" version "2.7.3"' +
'\n}'
println "Updating build.gradle so that the Gradle properties plugin can be applied"
writeFile("build.gradle", text)
Expand Down Expand Up @@ -70,9 +70,9 @@ class NewProjectTask extends MarkLogicTask {
appConfig.setRestAdminPassword(ant.mlPassword)
if (ant.mlRestPort) {
appConfig.setRestPort(Integer.parseInt(ant.mlRestPort))
}
if (ant.mlTestRestPort) {
appConfig.setTestRestPort(Integer.parseInt(ant.mlTestRestPort))
if (ant.mlTestRestPort) {
appConfig.setTestRestPort(Integer.parseInt(ant.mlTestRestPort))
}
}
new ScaffoldGenerator().generateScaffold(".", appConfig)
}
Expand Down

0 comments on commit 00bf194

Please sign in to comment.