Commit Graph

1495 Commits (c4a96db2cd870c01d13e9b035bc9c5f703532b0b)
 

Author SHA1 Message Date
Brett Wooldridge c4a96db2cd Merge branch 'dev' of github.com-brettwooldridge:brettwooldridge/HikariCP into dev 10 years ago
Brett Wooldridge 003b5260ed Update slf4j dependency 10 years ago
Brett Wooldridge f56fb8d7da Update README.md 10 years ago
Brett Wooldridge 13fecd4b82 Update README.md 10 years ago
Brett Wooldridge 482c585e13 Merge branch '2.3.x' into dev
* 2.3.x:
  Fix #289 fixed issue where a connection that was checked-out, never used for longer than the DB connection timeout, and then returned to the pool could bypass the aliveness check and be given to another caller of getConnection().
  Update issue stats badge
10 years ago
Brett Wooldridge 92762e0288 Merge branch '2.3.x' of github.com-brettwooldridge:brettwooldridge/HikariCP into 2.3.x 10 years ago
Brett Wooldridge cd457367f7 Fix #289 fixed issue where a connection that was checked-out, never used for longer than the DB connection timeout, and then returned to the pool could bypass the aliveness check and be given to another caller of getConnection(). 10 years ago
Brett Wooldridge bd0ca3c1e5 Update issue stats badge 10 years ago
Brett Wooldridge c063ea3105 Merge pull request #295 from dharrigan/dev
Ignore IntelliJ 'out' directory.
10 years ago
David Harrigan c557e1c530 Ignore IntelliJ 'out' directory. 10 years ago
Brett Wooldridge b6b8ab93a6 Cleanup suggested by Nitin 10 years ago
Brett Wooldridge 0b1a47e5b7 Merge branch '2.3.x' into dev
* 2.3.x:
  Update README.md
10 years ago
Brett Wooldridge 1cb7de0be7 Update README.md 10 years ago
Brett Wooldridge e682bd79eb Cleanup suggested by Nitin. 10 years ago
Brett Wooldridge 1faf28174e Merge branch '2.3.x' into dev
* 2.3.x:
  Updates changes log.
10 years ago
Brett Wooldridge 2ccf375ed8 Updates changes log. 10 years ago
Brett Wooldridge 6d8bfdb5ea Updates changes log. 10 years ago
Brett Wooldridge 62d3dd4074 Comment #289 Hasten garbage collection of Connections after close 10 years ago
Brett Wooldridge dd371f3572 Merge branch '2.3.x' into dev
* 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
10 years ago
Brett Wooldridge c94a20e187 Comment #289 Hasten garbage collection of Connections after close 10 years ago
Brett Wooldridge bd394606cf Comment #289 Hasten garbage collection of Connections after close 10 years ago
Brett Wooldridge e3f13a888c commit removes 10 years ago
Brett Wooldridge c20794cbb1 Update README.md 10 years ago
Brett Wooldridge 68ccdb62f7 Update dependencies 10 years ago
Brett Wooldridge 37d5cc722e Merge branch 'master' into dev
* 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
10 years ago
Brett Wooldridge b08b0d7656 Fix test breakage, plus some minor cleanup. 10 years ago
Brett Wooldridge eeb56f36f8 Remove multi-pool (DataSource.getConnection(username, password) support. 10 years ago
Brett Wooldridge b05e34275f Exclude PoolInitializationException from coverage 10 years ago
Brett Wooldridge 789e2a0774 Update README.md 10 years ago
Brett Wooldridge 33fde76e46 Added jacoco to pom 10 years ago
Brett Wooldridge 2f74182048 Merge branch 'master' of github.com:brettwooldridge/HikariCP 10 years ago
Brett Wooldridge f442759348 Added profile for coveralls 10 years ago
Brett Wooldridge 4e7a103c27 Update .travis.yml 10 years ago
Brett Wooldridge b9b11d914c Change travis-ci configuration for master 10 years ago
Brett Wooldridge ff9d5ff865 More improved logging. 10 years ago
Brett Wooldridge 50e1ec24ff If the pool is maxed out, return 'true' from addConnection() so we stop trying to add the connection. 10 years ago
Brett Wooldridge 1ed525d351 Fix #258 Improve logging of closed connection reason 10 years ago
Brett Wooldridge ded61125fe Recombine into a single Java 7 compatible build. 10 years ago
Brett Wooldridge 32d6668a6a Merge branch '2.3.x' of https://github.com/brettwooldridge/HikariCP 10 years ago
Brett Wooldridge c457ca060b Update README.md 10 years ago
Brett Wooldridge 76f80fd51f Fix #288 allow explicit definition of driverClassName to override DriverManager.getDriver(url) located driver. 10 years ago
Brett Wooldridge 4faae6b8df Mark scope as 'test' 10 years ago
Brett Wooldridge 7ed3d9c419 Update README.md 10 years ago
Brett Wooldridge 3355525e9a Update CHANGES 10 years ago
Brett Wooldridge e6936bf0d2 [maven-release-plugin] prepare for next development iteration 10 years ago
Brett Wooldridge 0cbe6de51b [maven-release-plugin] prepare release HikariCP-2.3.5 10 years ago
Brett Wooldridge 2cabded7f4 Fix #286 fix regression in Dropwizard runtime dependency 10 years ago
Brett Wooldridge b6a3f3d346 Update README.md 10 years ago
Brett Wooldridge d3cfa6cc31 [maven-release-plugin] prepare for next development iteration 10 years ago
Brett Wooldridge 7f574415f2 [maven-release-plugin] prepare release HikariCP-2.3.4 10 years ago