* 2.3.x:
Comment #289 Hasten garbage collection of Connections after close
Comment #289 Hasten garbage collection of Connections after close
Conflicts:
hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
* master: (40 commits)
Fix test breakage, plus some minor cleanup.
Remove multi-pool (DataSource.getConnection(username, password) support.
Exclude PoolInitializationException from coverage
Update README.md
Added jacoco to pom
Added profile for coveralls
Update .travis.yml
Change travis-ci configuration for master
More improved logging.
If the pool is maxed out, return 'true' from addConnection() so we stop trying to add the connection.
Fix#258 Improve logging of closed connection reason
Recombine into a single Java 7 compatible build.
Update README.md
Fix#288 allow explicit definition of driverClassName to override DriverManager.getDriver(url) located driver.
Mark scope as 'test'
Update README.md
Update CHANGES
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release HikariCP-2.3.5
Fix#286 fix regression in Dropwizard runtime dependency
...
Conflicts:
.travis.yml
README.md
hikaricp-common/pom.xml
hikaricp-common/src/main/java/com/zaxxer/hikari/AbstractHikariConfig.java
hikaricp-common/src/main/java/com/zaxxer/hikari/HikariConfig.java
hikaricp-common/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
hikaricp-java6/src/test/java/com/zaxxer/hikari/TestMetrics.java
hikaricp-java7/pom.xml
hikaricp-java7/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
hikaricp-java7/src/main/java/com/zaxxer/hikari/util/Java7ConcurrentBag.java
hikaricp-java7/src/main/resources/META-INF/codex.properties
hikaricp-java7/src/test/java/com/zaxxer/hikari/TestMetrics.java
hikaricp-java7/src/test/java/com/zaxxer/hikari/osgi/OSGiBundleTest.java
hikaricp-java7/src/test/resources/hibernate.properties
hikaricp-java7/src/test/resources/propfile1.properties
hikaricp-java7/src/test/resources/propfile2.properties
hikaricp-java7/src/test/resources/propfile3.properties
hikaricp/pom.xml
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
hikaricp/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
hikaricp/src/main/java/com/zaxxer/hikari/util/Java8ConcurrentBag.java
pom.xml
src/main/java/com/zaxxer/hikari/HikariConfig.java
src/main/java/com/zaxxer/hikari/pool/HikariPool.java
src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
src/test/java/com/zaxxer/hikari/TestConcurrentBag.java
src/test/java/com/zaxxer/hikari/TestMetrics.java
Brett Wooldridge