Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
tastybento 2019-11-03 18:15:55 -08:00
commit 10a7b451ba
2 changed files with 4 additions and 3 deletions

View File

@ -5,6 +5,7 @@ addons:
organization: "bentobox-world"
token:
secure: $SONAR_TOKEN
jdk:
- openjdk8
- openjdk11
@ -14,8 +15,9 @@ matrix:
- jdk: openjdk11
script:
- mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=BentoBoxWorld_Level
- echo "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
# the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_addon-invSwitcher
cache:
directories:
- '$HOME/.m2/repository'

View File

@ -119,7 +119,6 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<!-- was <version>3.4.1.1168</version> -->
<version>3.6.0.1398</version>
<executions>
<execution>