[testng] 11/160: Fix travis build with environment variables.

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.

commit 29fe72fdd875a57dab0cccb099b0165917853749
Author: Cedric Beust <cedric at beust.com>
Date:   Mon May 25 22:01:11 2015 -0700

    Fix travis build with environment variables.
---
 build.gradle             |  8 ++++++--
 gradle/publishing.gradle | 17 +++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5713d5..e2d2784 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,8 @@
 buildscript {
+
+    def a_user = hasProperty('artifactory_user') ? artifactory_user : System.getenv('artifactory_user')
+    def a_password = hasProperty('artifactory_password') ? artifactory_password : System.getenv('artifactory_password')
+
     repositories {
         mavenCentral()
         jcenter()
@@ -8,8 +12,8 @@ buildscript {
         maven {
             url 'http://oss.jfrog.org/artifactory/plugins-release'
             credentials {
-                username = "${artifactory_user}"
-                password = "${artifactory_password}"
+                username = "${a_user}"
+                password = "${a_password}"
             }
         }
     }
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index ee74bb2..e76f873 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -123,25 +123,30 @@ allprojects {
 }
 
 artifactory {
-    contextUrl = "${artifactory_contextUrl}"   //The base Artifactory URL if not overridden by the publisher/resolver
+    def a_user = hasProperty('artifactory_user') ? artifactory_user : System.getenv('artifactory_user')
+    def a_password = hasProperty('artifactory_password') ? artifactory_password : System.getenv('artifactory_password')
+    def a_contextUrl = hasProperty('artifactory_contextUrl') ? artifactory_password : System.getenv('artifactory_contextUrl')
+
+    contextUrl = "${a_contextUrl}"
+    //The base Artifactory URL if not overridden by the publisher/resolver
     publish {
         repository {
             repoKey = 'oss-snapshot-local'
-            username = "${artifactory_user}"
-            password = "${artifactory_password}"
+            username = "${a_user}"
+            password = "${a_password}"
             maven = true
 
         }
         defaults {
-            publications ('mavenJava')
+            publications('mavenJava')
         }
 
     }
     resolve {
         repository {
             repoKey = 'libs-snapshot'
-            username = "${artifactory_user}"
-            password = "${artifactory_password}"
+            username = "${a_user}"
+            password = "${a_password}"
             maven = true
 
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git