From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 14 Jan 2016 16:57:40 +0000 (+0100)
Subject: Analyze pull requests with Java 7
X-Git-Tag: 5.4-M6~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b27328c9b3a1d94088a5ca2d52dee9edefc9788c;p=sonarqube.git

Analyze pull requests with Java 7
---

diff --git a/travis.sh b/travis.sh
index 487424f9dde..88715b8ae10 100755
--- a/travis.sh
+++ b/travis.sh
@@ -24,20 +24,16 @@ CI)
 
     strongEcho 'Build and analyze pull request'
     # this pull request must be built and analyzed (without upload of report)
-    mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify -Panalysis -Dclirr=true -B -e -V
-
-    # Switch to java 8 as the Dory HTTPS certificate is not supported by Java 7
-    export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-    export PATH=$JAVA_HOME/bin:$PATH
-
-    mvn sonar:sonar -B -e -V \
-        -Dsonar.analysis.mode=issues \
-        -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST \
-        -Dsonar.github.repository=$TRAVIS_REPO_SLUG \
-        -Dsonar.github.oauth=$GITHUB_TOKEN \
-        -Dsonar.host.url=$SONAR_HOST_URL \
-        -Dsonar.login=$SONAR_TOKEN
-
+    mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar \
+      -Panalysis \
+      -Dclirr=true \
+      -Dsonar.analysis.mode=issues \
+      -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST \
+      -Dsonar.github.repository=$TRAVIS_REPO_SLUG \
+      -Dsonar.github.oauth=$GITHUB_TOKEN \
+      -Dsonar.host.url=$SONAR_HOST_URL \
+      -Dsonar.login=$SONAR_TOKEN \
+      -B -e -V -U
 
   else
     strongEcho 'Build, no analysis'