aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-01-14 17:57:40 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-01-14 17:57:50 +0100
commitb27328c9b3a1d94088a5ca2d52dee9edefc9788c (patch)
tree787aa3288e7e360ce94f40c829a8406c0144b7eb
parent046c6519475f26ef6bf9b6f177c644a491311424 (diff)
downloadsonarqube-b27328c9b3a1d94088a5ca2d52dee9edefc9788c.tar.gz
sonarqube-b27328c9b3a1d94088a5ca2d52dee9edefc9788c.zip
Analyze pull requests with Java 7
-rwxr-xr-xtravis.sh24
1 files changed, 10 insertions, 14 deletions
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'