Merge pull request #179 from christianpoitras/master

Drops support for BoneCP. Fixes #139.

Author: christianpoitras

pom.xml

@@ -91,7 +91,7 @@
     <gcu.product>Guice</gcu.product>
     <guice.version>4.2.2</guice.version>
     <ejb-api.version>3.2.6</ejb-api.version>
-    <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>
+    <osgi.import>com.alibaba.druid.pool.*;resolution:=optional,com.zaxxer.hikari.*;resolution:=optional,com.mchange.v2.c3p0.*;resolution:=optional,org.apache.commons.dbcp2.*;resolution:=optional,javax.transaction.*;resolution:=optional</osgi.import>
     <spotbugs.omitVisitors>UnreadFields</spotbugs.omitVisitors>
     <module.name>org.mybatis.guice</module.name>
 
@@ -170,9 +170,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.jolbox</groupId>
-      <artifactId>bonecp</artifactId>
-      <version>0.8.0.RELEASE</version>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+      <version>3.4.2</version>
       <optional>true</optional>
     </dependency>
 

src/changes/changes.xml

@@ -76,6 +76,9 @@
         Fixes OSGI imports.
         <fixes issue="126"/>
       </action>
+      <action dev="christian.poitras" type="remove">
+        Removed support for BoneCP.
+      </action>
     </release>
     <release version="3.10" date="2017-09-09" description="maintenance release">
       <action dev="christian.poitras" type="add">

src/main/java/org/mybatis/guice/datasource/bonecp/BoneCPProvider.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2019 the original author or authors.
+       Copyright 2009-2020 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
         <item name="MyBatis built-in" href="datasources/builtin.html"/>
         <item name="Apache Commons DBCP" href="datasources/dbcp.html"/>
         <item name="C3P0" href="datasources/c3p0.html"/>
-        <item name="BoneCP" href="datasources/bonecp.html"/>
+        <item name="HikariCP" href="datasources/hikaricp.html"/>
         <item name="Druid" href="datasources/druid.html"/>
       </item>
       <item name="Injections" href="injections.html"/>

src/main/java/org/mybatis/guice/datasource/bonecp/package-info.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2016 the original author or authors.
+       Copyright 2009-2020 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -173,7 +173,7 @@ MyMapper mapper = injector.getInstance(MyMapper.class);]]></source>
                 The mybatis-guice framework comes with some providers that
                 support the MyBatis-native Data Sources and other well known
                 Data Sources, <i>C3P0</i>,
-                <i>Apache Commons DBCP</i> and <i>BoneCP</i> but users are free to
+                <i>Apache Commons DBCP</i> and <i>HikariCP</i> but users are free to
                 implement their own <i>javax.sql.DataSource</i>
                 Provider and reference it in the <i>org.mybatis.guice.MyBatisModule</i>.
             </p>

src/site/site.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2018 the original author or authors.
+       Copyright 2009-2020 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
           </li>
           <li><a href="datasources/c3p0.html">C3P0</a>;
           </li>
-          <li><a href="datasources/bonecp.html">BoneCP</a>.
+          <li><a href="datasources/hikaricp">HikariCP</a>.
           </li>
           <li><a href="datasources/druid.html">Druid</a>.
           </li>