Enable deployment of artifacts on release branches

diff --git a/build.gradle b/build.gradle
index 1e4502d2448c2292409e6cddcec845fd86901235..88bdc56d3cac911a142c0ec0549a0e4c7b585a18 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -300,6 +300,7 @@ artifactory {
       publishIvy = false
     }
   }
+  clientConfig.info.setBuildName('sonar-enterprise')
   clientConfig.info.setBuildNumber(System.getenv('BUILD_NUMBER'))
   // Define the artifacts to be deployed to https://sonarsource.bintray.com on releases
   clientConfig.info.addEnvironmentProperty('ARTIFACTS_TO_PUBLISH', "${project.group}:sonar-application:zip,com.sonarsource.governance:sonar-governance-plugin:jar,com.sonarsource.developer:sonar-developer-plugin:jar,com.sonarsource.ha:sonar-ha-plugin:jar,com.sonarsource.branch:sonar-branch-plugin:jar")

diff --git a/settings.gradle b/settings.gradle
index 49f30309a16befb2575c961208ebc713ec9e2e64..4aafd11b6753188dff29310ccc31ec912edf5d4d 100644 (file)
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'sonar-enterprise'
+rootProject.name = 'sonarqube'
 
 include 'plugins:sonar-xoo-plugin'
 

diff --git a/travis.sh b/travis.sh
index 6674f5f7b28d6c473f9cebf73edbd68054bc470c..baa705d9eea60c261b8bb01254caeec7e97d13cd 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -78,10 +78,10 @@ BUILD)
 
   if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build and analyze master'
-    # FIXME analysis and deployment disabled for now
+    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build -PjacocoEnabled=true -Prelease=true \
+        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.projectVersion=$INITIAL_VERSION \
@@ -92,10 +92,10 @@ BUILD)
 
   elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build release branch'
-    # FIXME analysis and deployment disabled for now
+    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build -PjacocoEnabled=true -Prelease=true \
+        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.branch.name=$TRAVIS_BRANCH \