Skip to content

Commit 257b372

Browse files
authoredJan 2, 2020
Merge pull request #165 from hazendaz/master
Build through jdk 15
2 parents 2612473 + 0d7b682 commit 257b372

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed
 

‎.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: java
22

33
jdk:
4+
- openjdk15
5+
- openjdk14
6+
- openjdk13
47
- openjdk11
58
- openjdk8
69

‎pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
2121

2222
<parent>
@@ -94,6 +94,9 @@
9494
<osgi.import>com.alibaba.druid.pool.*;resolution:=optional,com.jolbox.bonecp.*;resolution:=optional,com.mchange.v2.c3p0.*;resolution:=optional,org.apache.commons.dbcp2.*;resolution:=optional,javax.transaction.*;resolution:=optional</osgi.import>
9595
<findbugs.omitVisitors>UnreadFields</findbugs.omitVisitors>
9696
<module.name>org.mybatis.guice</module.name>
97+
98+
<!-- Override jacoco to latest until on mybatis-parent 32 -->
99+
<jacoco.version>0.8.5</jacoco.version>
97100
</properties>
98101

99102
<dependencies>

‎src/test/java/org/mybatis/guice/datasource/bonecp/BoneCPProviderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)
Please sign in to comment.