[NO-JIRA] Read artifactory url from gradle local configuration

diff --git a/build.gradle b/build.gradle
index 2351491aebfa169359e3cebf058dbfe901f7848f..00ce8916b86e92f042af614c62e245cda0b826ba 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -82,7 +82,11 @@ allprojects {
     // On local box, please add artifactoryUsername and artifactoryPassword to ~/.gradle/gradle.properties
     def artifactoryUsername = System.env.'ARTIFACTORY_PRIVATE_USERNAME' ?: (project.hasProperty('artifactoryUsername') ? project.getProperty('artifactoryUsername') : '')
     def artifactoryPassword = System.env.'ARTIFACTORY_PRIVATE_PASSWORD' ?: (project.hasProperty('artifactoryPassword') ? project.getProperty('artifactoryPassword') : '')
-    def artifactoryUrl = System.getenv('ARTIFACTORY_URL')
+    def artifactoryUrl = System.getenv('ARTIFACTORY_URL') ?: (project.hasProperty('artifactoryUrl') ? project.getProperty('artifactoryUrl') : '')
+
+    if (artifactoryUrl == '') {
+      throw new GradleException('Invalid artifactoryUrl')
+    }
 
     maven {
         if (artifactoryUsername && artifactoryPassword) {