Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
* master:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release HikariCP-1.3.7
  Remove redundant assignment.
  Eliminate double-execution of shutdown code.
  Updated change log
  Updated change log
  Fix typo bug in JNDI factory class ... reflect properties from HikariConfig instead of HikariPool.
  Add a test for PropertyBeanSetter.getPropertyNames().
  Add a JNDI factory to create datasources for Tomcat users.
  This fixes #65 as well as correcting OSGi manifest generation warnings by reorganizing the code and packages somewhat to ensure that the publicly exported com.zaxxer.hikari package does not expose any internal classes.
  Fix isConnectionAlive() check when using Connection.isValid().  Clarify logging.
  Fix issue #63 improper setting of null state during connection failure.
  [maven-release-plugin] prepare for next development iteration
  Update TODO.md
  Update maven version.
  Update README.md

Conflicts:
	README.md
	pom.xml
  • Loading branch information
brettwooldridge committed Apr 28, 2014
2 parents dbe76be + 483cfc0 commit ace19c7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ There is nothing faster. There is nothing more correct. HikariCP is a "zero-ov
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>1.3.7</version>
<version>1.3.6</version>
<scope>compile</scope>
</dependency>
```
Expand Down Expand Up @@ -88,12 +88,12 @@ having HikariCP construct it via reflection. When this property is specified, t

:abc:``dataSourceClassName``<br/>
This is the name of the ``DataSource`` class provided by the JDBC driver. Consult the
documentation for your specific JDBC driver to get this class name. Note XA data sources
are not supported. XA requires a real transaction manager like [bitronix](https://github.com/bitronix/btm).
Note that you do not need this property if you are using ``driverClassName`` to wrap an
old-school DriverManager-based JDBC driver. The HikariCP team considers ``dataSourceClassName``
to be a superior method of creating connections compared to ``driverClassName``.
*Default: none*
documentation for your specific JDBC driver to get this class name, or see the [table](https://github.com/brettwooldridge/HikariCP#popular-datasource-class-names) below.
Note XA data sources are not supported. XA requires a real transaction manager like
[bitronix](https://github.com/bitronix/btm). Note that you do not need this property if you are using
``driverClassName`` to wrap an old-school DriverManager-based JDBC driver. The HikariCP team
considers ``dataSourceClassName`` to be a superior method of creating connections compared to
``driverClassName``. *Default: none*

:abc:``driverClassName``<br/>
This property allows HikariCP to wrap an old-school JDBC driver as a ``javax.sql.DataSource``.
Expand Down
1 change: 1 addition & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
### TODO ###

* More unit tests
* Add metrics support
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>1.3.7-SNAPSHOT</version>
<version>1.3.8-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>HikariCP</name>
Expand Down

0 comments on commit ace19c7

Please sign in to comment.