From: Eric Hartmann <hartmann.eric@gmail.com>
Date: Thu, 15 Mar 2018 07:03:56 +0000 (+0100)
Subject: Allow to define Artifactory credentials in gradle.properties
X-Git-Tag: 7.5~1533
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7324f17d4b8928e1ec855a7b66bfe302514a90fc;p=sonarqube.git

Allow to define Artifactory credentials in gradle.properties
---

diff --git a/build.gradle b/build.gradle
index c870a12d062..2dfc439d7fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,8 @@ allprojects {
     def repository = project.hasProperty('cix') ? 'sonarsource-qa' : 'sonarsource'
     maven {
       url "https://repox.sonarsource.com/${repository}"
-      def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME'
-      def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD'
+      def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: ARTIFACTORY_PRIVATE_USERNAME
+      def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: ARTIFACTORY_PRIVATE_PASSWORD
       if (artifactoryUsername && artifactoryPassword) {
         credentials {
           username artifactoryUsername