From 7a373799cfcdce5117d438c907942782708a7ebc Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 24 Jun 2017 06:24:31 -0400 Subject: [PATCH] added jdk8 matrix for sonarcloud --- .travis.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c4056809..bc8006c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: java -jdk: oraclejdk7 env: global: @@ -10,7 +9,7 @@ env: - secure: "Bh5LAk8XQnJ885jc/Lli2fhPKDx0TNZRxcJMnNo96EgwOnD+Zhw+v3u/DMCgyyrRToM8Bkca/HktrlZaRTk2htsdKZZ3RHFMCXO0fXCgpcf+wkaSYDF/lnErpSJG3Lrz8ILxJPODsrGhjaIg2++79lwhsBYtpujc6UdxFhgpffc=" addons: - sonarqube: + sonarcloud: organization: "odc" token: secure: "YVDnYmonPug885Hmr2pLWBko+rQ+oKyTUA95ry0PGGyfgs0z6kPCjmWBDVm7K4GM7NOluldWb5gLMf0QXoHGstdp9L6fQCQElt8hZMOwJf+IR3bWjiG3VfVyyB3gJWBWlcJFM9NVyfICidwBH5ZiJ0+LXhKUgnNqarTh/YmNj9w=" @@ -23,8 +22,18 @@ cache: before_install: - wget -O ~/codacy-coverage-reporter-assembly.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/1.0.13/codacy-coverage-reporter-1.0.13-assembly.jar -script: - - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install site site:stage sonar:sonar -DreleaseTesting; else travis_wait 15 mvn install sonar:sonar -DreleaseTesting; fi + matrix: + include: + - jdk: oraclejdk7 + env: + - JDK="JDK7" + script: + - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install site site:stage -DreleaseTesting; else travis_wait 15 mvn install -DreleaseTesting; fi + - jdk: oraclejdk8 + env: + - JDK="JDK8" + script: + - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install sonar:sonar -DreleaseTesting; else travis_wait 15 mvn install sonar:sonar -DreleaseTesting; fi after_success: - java -cp ~/codacy-coverage-reporter-assembly.jar com.codacy.CodacyCoverageReporter -l Java -r build-reporting/target/coverage-reports/jacoco.xml @@ -36,6 +45,7 @@ deploy: skip_cleanup: true on: branch: master + jdk: oraclejdk7 - provider: pages skip_cleanup: true local_dir: target/staging @@ -43,4 +53,5 @@ deploy: on: tags: true branch: master + jdk: oraclejdk7 \ No newline at end of file