Commit Graph

160 Commits (9fd8b9f77f4bcbb9a46e4659279443e8112d2bdf)

Author SHA1 Message Date
Brett Wooldridge 4cb3602ad9 Merge branch 'master' into dev
* 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  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  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
Brett Wooldridge 20ffc50ab0 Update maven version.
Brett Wooldridge 1548ccf6d0 Update README.md
Brett Wooldridge 01bcaa3205 Update README.md
Brett Wooldridge 2b6d7621cd Update README.md
Brett Wooldridge 9c058e7b3a Typo
Brett Wooldridge 80601478cf Update README.md
Brett Wooldridge 501e5d28a7 Update README.md
Brett Wooldridge 9448e1a300 Update README.md
Brett Wooldridge 04fbcd27cb Updated examples
Brett Wooldridge 8e337e43c6 Updated properties for 1.3.4 release.
Brett Wooldridge 9b599f9bfd Update README.md
Brett Wooldridge 17157309cc Update examples
Brett Wooldridge 08f0a02d8a Thank you!
Brett Wooldridge e13d500894 Thank you!
Brett Wooldridge 39ffebfe0e Thank you!
Brett Wooldridge ccd364aacb Thank you!
Brett Wooldridge 8d717d40be Thank you!
Brett Wooldridge e56649c7d6 Icons
Brett Wooldridge 5e7dccf707 Icons
Brett Wooldridge 086ae7a1f9 Icons
Brett Wooldridge e0ab96d46a Icons
Brett Wooldridge c123371d43 Add definition of hikari
Brett Wooldridge f6b89c1b0c Update README.md
Brett Wooldridge 7832cc5aa0 Update README.md
Brett Wooldridge 2cf8dee506 Update release version
Brett Wooldridge 786dd5322b Update README.md
Brett Wooldridge 9bb5713830 Update README.md
Brett Wooldridge d8211e7175 Update README.md
Brett Wooldridge ce75519e07 Update README.md
Brett Wooldridge 0c2d5445f2 Update README.md
Brett Wooldridge 7d49a1c9c9 Added catalog property to documentation.
Brett Wooldridge 05dbfbc10a Wording change.
Brett Wooldridge 3cbb383777 Layout changes
Brett Wooldridge b9a4af92ee Update README.md
Brett Wooldridge 2fb28fbd2a Update README.md
Brett Wooldridge 1a73c77071 Update README.md
Brett Wooldridge 18f1703f59 Update README.md
Brett Wooldridge 93de7fb8d6 Update README.md
Brett Wooldridge 7e0e5b346a Update README.md
Brett Wooldridge a95fb960b4 Update requirements, Java 6 is now supported
Brett Wooldridge c070ae4ec7 Updated release version
Brett Wooldridge c6e7544a12 Update README.md
Brett Wooldridge bcb1d9d679 Update README.md
Brett Wooldridge f83ddc12d8 Update README.md
Brett Wooldridge 229188e4c8 Update README.md
Brett Wooldridge ab87a67cb4 Update README.md
Brett Wooldridge 5a670af8cb Update README.md
Brett Wooldridge 242618d0ab Update README.md
Brett Wooldridge 2dccd419c6 Update README.md