From db602fd0be9d93cafdd1ad0897d2a6eca6ef3548 Mon Sep 17 00:00:00 2001
From: John Flavin <flavinj@gmail.com>
Date: Fri, 19 Feb 2016 09:17:01 -0600
Subject: [PATCH] FIX Cargo and tomcat properties no longer required
---
build.gradle | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/build.gradle b/build.gradle
index 43114071..f2ab0dd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -290,17 +290,19 @@ dependencies {
}
cargo {
+ def blankProperty = "xxx"
+ def blankPort = 0
containerId = 'tomcat7x'
- port = deployPort as int
+ port = hasProperty('deployPort') ? getProperty('deployPort') as int : blankPort
deployable {
- context = deployContext
+ context = hasProperty('deployContext') ? getProperty('deployContext') : blankProperty
}
remote {
- hostname = deployHost
- username = deployUser
- password = deployPassword
+ hostname = hasProperty('deployHost') ? getProperty('deployHost') : blankProperty
+ username = hasProperty('deployUser') ? getProperty('deployUser') : blankProperty
+ password = hasProperty('deployPassword') ? getProperty('deployPassword') : blankProperty
}
}
@@ -335,12 +337,13 @@ publishing {
}
}
repositories {
+ def blankProperty = "xxx"
maven {
credentials {
// These properties must be set in the ~/.gradle/gradle.properties file or passed on the Gradle command
// line in the form -DrepoUsername=foo -DrepoPassword=bar.
- username repoUsername
- password repoPassword
+ username hasProperty('repoUsername') ? getProperty('repoUsername') : blankProperty
+ password hasProperty('repoPassword') ? getProperty('repoPassword') : blankProperty
}
if (project.version.endsWith('-SNAPSHOT')) {
url "http://nrgxnat.artifactoryonline.com/nrgxnat/libs-snapshot-local"
@@ -352,8 +355,8 @@ publishing {
credentials {
// These properties must be set in the ~/.gradle/gradle.properties file or passed on the Gradle command
// line in the form -DrepoUsername=foo -DrepoPassword=bar.
- username repoUsername
- password repoPassword
+ username hasProperty('repoUsername') ? getProperty('repoUsername') : blankProperty
+ password hasProperty('repoPassword') ? getProperty('repoPassword') : blankProperty
}
if (project.version.endsWith('-SNAPSHOT')) {
url "http://nrgxnat.artifactoryonline.com/nrgxnat/libs-snapshot-local"
--
GitLab