From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 19 Mar 2018 12:40:54 +0000 (+0100)
Subject: Re-enable analysis
X-Git-Tag: 7.5~1516
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8011b50e01e40ce8e654e76f06fcbdb4b82dc3e6;p=sonarqube.git

Re-enable analysis
---

diff --git a/travis.sh b/travis.sh
index 5328e02dc61..90e25585b6e 100755
--- a/travis.sh
+++ b/travis.sh
@@ -81,10 +81,9 @@ BUILD)
 
   elif [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build and analyze master'
-    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.projectVersion=$INITIAL_VERSION \
@@ -95,10 +94,9 @@ BUILD)
 
   elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
     echo 'Build release branch'
-    # FIXME analysis disabled for now
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.branch.name=$TRAVIS_BRANCH \
@@ -112,7 +110,7 @@ BUILD)
     echo 'Build and analyze internal pull request'
     ./gradlew --no-daemon --console plain \
         -DbuildNumber=$BUILD_NUMBER \
-        build artifactoryPublish -PjacocoEnabled=true -Prelease=true \
+        build sonarqube artifactoryPublish -PjacocoEnabled=true -Prelease=true \
         -Dsonar.host.url=$SONAR_HOST_URL \
         -Dsonar.login=$SONAR_TOKEN \
         -Dsonar.analysis.buildNumber=$BUILD_NUMBER \