Skip to content

Commit da7c957

Browse files
authored
Merge pull request #2063 from harawata/revert-workarounds-jacoco-jdk15
Revert workarounds for JaCoCo issue with JDK 15
2 parents bc90ee2 + d92fe0e commit da7c957

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.travis.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
language: java
22

3-
matrix:
4-
include:
5-
- jdk: openjdk15
6-
env: JACOCO_SKIP="-Djacoco.skip=true"
7-
- jdk: openjdk14
8-
- jdk: openjdk11
9-
- jdk: openjdk8
10-
11-
script:
12-
- ./mvnw test -B $JACOCO_SKIP
3+
jdk:
4+
- openjdk15
5+
- openjdk14
6+
- openjdk13
7+
- openjdk11
8+
- openjdk8
139

1410
services:
1511
- docker

pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@
139139
<osgi.import>*;resolution:=optional</osgi.import>
140140
<osgi.dynamicImport>*</osgi.dynamicImport>
141141
<spotbugs.onlyAnalyze>org.apache.ibatis.*</spotbugs.onlyAnalyze>
142-
143-
<!-- Remove after parent 32 (support for jdk 13on) -->
144-
<jacoco.version>0.8.5</jacoco.version>
145142
</properties>
146143

147144
<dependencies>

0 commit comments

Comments
 (0)