Repository: logging-log4j2 Updated Branches: refs/heads/master a03cf45d0 -> 348f875e8
Update travis config Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/348f875e Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/348f875e Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/348f875e Branch: refs/heads/master Commit: 348f875e80b1bc0cefbb436c1bcd44cf6d2485ed Parents: 0b7d5f0 Author: Matt Sicker <[email protected]> Authored: Sun Apr 8 12:19:47 2018 -0500 Committer: Matt Sicker <[email protected]> Committed: Sun Apr 8 12:20:51 2018 -0500 ---------------------------------------------------------------------- .travis-toolchains.xml | 11 ----------- .travis.yml | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/348f875e/.travis-toolchains.xml ---------------------------------------------------------------------- diff --git a/.travis-toolchains.xml b/.travis-toolchains.xml index f170223..53ff360 100644 --- a/.travis-toolchains.xml +++ b/.travis-toolchains.xml @@ -20,17 +20,6 @@ <toolchain> <type>jdk</type> <provides> - <id>java7</id> - <version>1.7</version> - <vendor>oracle</vendor> - </provides> - <configuration> - <jdkHome>/usr/lib/jvm/java-7-oracle</jdkHome> - </configuration> - </toolchain> - <toolchain> - <type>jdk</type> - <provides> <id>java8</id> <version>1.8</version> <vendor>oracle</vendor> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/348f875e/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index d3441ea..3fecb49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,30 @@ # limitations under the License. language: java -# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/ci-environment/ +# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/reference/overview/ sudo: true # trusty required for oraclejdk9 dist: trusty jdk: - - oraclejdk7 + - oraclejdk8 + +addons: + apt: + packages: + - oracle-java8-installer + - oracle-java9-installer + - maven env: global: JAVA_OPTS=-Xmx4g install: - - ./mvnw --toolchains=./.travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + - mvn -t .travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V script: - - ./mvnw --toolchains=./.travis-toolchains.xml test -B + - mvn -t .travis-toolchains.xml test -B -V after_success: - - ./mvnw --show-version -pl !log4j-bom jacoco:prepare-agent test jacoco:report coveralls:report \ No newline at end of file + - mvn -t .travis-toolchains.xml -pl !log4j-bom jacoco:prepare-agent test jacoco:report coveralls:report -B -V
