Skip to content

Commit 4be805e

Browse files
author
Isaac Brodsky
authored
Merge pull request #48 from isaacbrodsky/travis-ci-xenial
Switch Travis CI test to Xenial
2 parents 8063b31 + 9f265b1 commit 4be805e

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2018 Uber Technologies, Inc.
1+
# Copyright 2018-2019 Uber Technologies, Inc.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -13,24 +13,29 @@
1313
# limitations under the License.
1414

1515
language: java
16+
dist: xenial
1617

1718
sudo: required
1819

20+
cache:
21+
directories:
22+
- $HOME/.m2
23+
1924
services:
2025
- docker
2126

2227
matrix:
2328
include:
2429
- os: linux
2530
env: NAME="Coverage report"
26-
jdk: oraclejdk8
31+
jdk: openjdk8
2732
script:
2833
- mvn clean test jacoco:report coveralls:report -Dh3.test.system=true -Dh3.additional.argLine="-Djava.library.path=./src/main/resources/linux-x64/"
2934
- os: linux
30-
jdk: openjdk8
35+
jdk: openjdk11
3136
- os: linux
3237
env: NAME="Linux without Docker"
33-
jdk: oraclejdk9
38+
jdk: oraclejdk11
3439
install:
3540
- mvn install -DskipTests=true -B -V -Dh3.use.docker=false
3641
script:

pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<properties>
6767
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6868
<org.openjdk.jmh.version>1.19</org.openjdk.jmh.version>
69+
<maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
6970

7071
<h3.git.remote>https://github.com/uber/h3.git</h3.git.remote>
7172
<h3.use.docker>true</h3.use.docker>
@@ -272,7 +273,7 @@
272273
<plugin>
273274
<groupId>org.apache.maven.plugins</groupId>
274275
<artifactId>maven-javadoc-plugin</artifactId>
275-
<version>3.0.0</version>
276+
<version>${maven.javadoc.plugin.version}</version>
276277
<executions>
277278
<execution>
278279
<id>attach-javadocs</id>
@@ -281,6 +282,9 @@
281282
</goals>
282283
</execution>
283284
</executions>
285+
<configuration>
286+
<source>8</source>
287+
</configuration>
284288
</plugin>
285289
<plugin>
286290
<groupId>org.apache.maven.plugins</groupId>
@@ -329,7 +333,10 @@
329333
<plugin>
330334
<groupId>org.apache.maven.plugins</groupId>
331335
<artifactId>maven-javadoc-plugin</artifactId>
332-
<version>3.0.0</version>
336+
<version>${maven.javadoc.plugin.version}</version>
337+
<configuration>
338+
<source>8</source>
339+
</configuration>
333340
</plugin>
334341
<plugin>
335342
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)