Skip to content

Commit f66e4bf

Browse files
committed
fix(CI): update Travis url, and use the new version of travis-utils
1 parent ea6c23e commit f66e4bf

File tree

4 files changed

+16
-35
lines changed

4 files changed

+16
-35
lines changed

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,10 @@ language: java
22
sudo: false
33

44
jdk:
5-
- oraclejdk7
5+
- oraclejdk8
66

77
install: true
88
script: ./travis.sh
9-
env:
10-
matrix:
11-
- TEST=ci
12-
- TEST=plugin SQ_VERSION=DEV
13-
- TEST=plugin SQ_VERSION=LATEST_RELEASE
14-
- TEST=plugin SQ_VERSION=LTS
15-
16-
matrix:
17-
fast_finish: true
189

1910
cache:
2011
directories:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Sonar Clover
22
===========
3-
[![Build Status](https://api.travis-ci.org/SonarQubeCommunity/sonar-clover.svg)](https://travis-ci.org/SonarQubeCommunity/sonar-clover)
3+
[![Build Status](https://api.travis-ci.org/Tony-Proum/sonar-clover.svg)](https://travis-ci.org/Tony-Proum/sonar-clover)
44

55
## Description / Features
66
It provides the ability to feed SonarQube with code coverage data coming from Atlassian Clover.

check-license-compliance.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# See https://xtranet.sonarsource.com/display/DEV/Open+Source+Licenses
5+
6+
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party

travis.sh

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,17 @@
33
set -euo pipefail
44

55
function installTravisTools {
6-
mkdir ~/.local
7-
curl -sSL https://github.com/SonarSource/travis-utils/tarball/v21 | tar zx --strip-components 1 -C ~/.local
6+
mkdir -p ~/.local
7+
curl -sSL https://github.com/SonarSource/travis-utils/tarball/v50 | tar zx --strip-components 1 -C ~/.local
88
source ~/.local/bin/install
99
}
1010

11-
case "$TEST" in
11+
installTravisTools
12+
source ~/.local/bin/installMaven35
13+
source ~/.local/bin/installJDK8
1214

13-
ci)
14-
mvn verify -B -e -V
15-
;;
15+
export DEPLOY_PULL_REQUEST=true
1616

17-
plugin)
18-
installTravisTools
17+
regular_mvn_build_deploy_analyze
1918

20-
mvn package -T2 -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
21-
22-
if [ "$SQ_VERSION" = "DEV" ] ; then
23-
build_snapshot "SonarSource/sonarqube"
24-
fi
25-
26-
cd its/$TEST
27-
mvn package -Dsonar.runtimeVersion="$SQ_VERSION" -DjavaVersion="LATEST_RELEASE" -Dmaven.test.redirectTestOutputToFile=false
28-
;;
29-
30-
*)
31-
echo "Unexpected TEST mode: $TEST"
32-
exit 1
33-
;;
34-
35-
esac
19+
./check-license-compliance.sh

0 commit comments

Comments
 (0)