Fix the upgrade of the Gradle Artifactory plugin to 4.15.1

The configuration of private subprojects must be fixed
in order to correct set the properties like "build.name"
on private artifacts.

1 files changed, 15 insertions, 3 deletions

diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index cea99b44015..776922445f5 100644
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -112,11 +112,23 @@ publishing {
 
 artifactory {
   publish {
-    contextUrl = System.getenv('ARTIFACTORY_URL')
     repository {
       repoKey = System.getenv('ARTIFACTORY_DEPLOY_REPO_PRIVATE')
-      username = System.getenv('ARTIFACTORY_DEPLOY_USERNAME_PRIVATE')
-      password = System.getenv('ARTIFACTORY_DEPLOY_PASSWORD_PRIVATE')
+      username = System.getenv('ARTIFACTORY_DEPLOY_USERNAME_PRIVATE') ?: project.properties.artifactoryUsername
+      password = System.getenv('ARTIFACTORY_DEPLOY_PASSWORD_PRIVATE') ?: project.properties.artifactoryPaswword
+    }
+    defaults {
+      properties = [
+          'build.name'      : 'sonar-enterprise',
+          'build.number'    : System.getenv('BUILD_NUMBER'),
+          'pr.branch.target': System.getenv('GITHUB_BASE_BRANCH'),
+          'pr.number'       : System.getenv('PULL_REQUEST'),
+          'vcs.branch'      : System.getenv('GITHUB_BRANCH'),
+          'vcs.revision'    : System.getenv('GIT_SHA1'),
+          'version'         : version
+      ]
+      publishPom = true
+      publishIvy = false
     }
   }
 }