Skip to content

Commit 7976cec

Browse files
committed
update build jdks (include jdk 15)
1 parent 968bf21 commit 7976cec

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.travis.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@ sudo: false
66

77
jdk:
88
- oraclejdk11
9-
- oraclejdk12
10-
- oraclejdk13
11-
- oraclejdk14
9+
- oraclejdk15
1210
- openjdk8
1311
- openjdk11
14-
- openjdk12
15-
- openjdk13
16-
- openjdk14
12+
- openjdk15
1713

1814
# enable cache to stop downloading all maven plugins every time
1915
cache:

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<jdk.source.version>1.8</jdk.source.version>
197197
<jdk.target.version>1.8</jdk.target.version>
198198
<tools.maven.plugin.version>1.4</tools.maven.plugin.version>
199-
<jacoco.maven.plugin.version>0.8.5</jacoco.maven.plugin.version>
199+
<jacoco.maven.plugin.version>0.8.6</jacoco.maven.plugin.version>
200200
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
201201
<maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
202202
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>

src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public void loadModelIllegalArgument() throws Exception {
9090
catch (DataReaderException e) {
9191
assertNotNull("cause", e.getCause());
9292
Class expectedClass;
93-
if (System.getProperty("java.version").startsWith("14")) {
93+
String javaVersion = System.getProperty("java.version");
94+
if (javaVersion.startsWith("14") || javaVersion.startsWith("15")) {
9495
expectedClass = IOException.class;
9596
} else {
9697
expectedClass = IllegalArgumentException.class;

0 commit comments

Comments
 (0)