github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,473 Commits
9 Branches
110 Tags
7.7 MiB
Commit Graph

1473 Commits (c20794cbb168a4f1d1f687c92f294b711ce78d5d)
 

Author SHA1 Message Date
Brett Wooldridge c20794cbb1 Update README.md
Brett Wooldridge 68ccdb62f7 Update dependencies
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  Improve logging of closed connection reason
  Recombine into a single Java 7 compatible build.
  Update README.md
  Fix  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  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 b08b0d7656 Fix test breakage, plus some minor cleanup.
Brett Wooldridge eeb56f36f8 Remove multi-pool (DataSource.getConnection(username, password) support.
Brett Wooldridge b05e34275f Exclude PoolInitializationException from coverage
Brett Wooldridge 789e2a0774 Update README.md
Brett Wooldridge 33fde76e46 Added jacoco to pom
Brett Wooldridge 2f74182048 Merge branch 'master' of github.com:brettwooldridge/HikariCP
Brett Wooldridge f442759348 Added profile for coveralls
Brett Wooldridge 4e7a103c27 Update .travis.yml
Brett Wooldridge b9b11d914c Change travis-ci configuration for master
Brett Wooldridge ff9d5ff865 More improved logging.
Brett Wooldridge 50e1ec24ff If the pool is maxed out, return 'true' from addConnection() so we stop trying to add the connection.
Brett Wooldridge 1ed525d351 Fix Improve logging of closed connection reason
Brett Wooldridge ded61125fe Recombine into a single Java 7 compatible build.
Brett Wooldridge 32d6668a6a Merge branch '2.3.x' of https://github.com/brettwooldridge/HikariCP
Brett Wooldridge c457ca060b Update README.md
Brett Wooldridge 76f80fd51f Fix allow explicit definition of driverClassName to override DriverManager.getDriver(url) located driver.
Brett Wooldridge 4faae6b8df Mark scope as 'test'
Brett Wooldridge 7ed3d9c419 Update README.md
Brett Wooldridge 3355525e9a Update CHANGES
Brett Wooldridge e6936bf0d2 [maven-release-plugin] prepare for next development iteration
Brett Wooldridge 0cbe6de51b [maven-release-plugin] prepare release HikariCP-2.3.5
Brett Wooldridge 2cabded7f4 Fix fix regression in Dropwizard runtime dependency
Brett Wooldridge b6a3f3d346 Update README.md
Brett Wooldridge d3cfa6cc31 [maven-release-plugin] prepare for next development iteration
Brett Wooldridge 7f574415f2 [maven-release-plugin] prepare release HikariCP-2.3.4
Brett Wooldridge e68bb6e833 Adjust the leak task stacktrace to eliminate HikariCP from the leak stacktrace.
Brett Wooldridge e94cff0699 Merge branch '2.3.x' of github.com-brettwooldridge:brettwooldridge/HikariCP into 2.3.x 
* '2.3.x' of github.com-brettwooldridge:brettwooldridge/HikariCP:
  Update CHANGES
Brett Wooldridge 538546e630 Move LeakTask into pool package
Brett Wooldridge 3ca1d0b3f1 Fix ensure all properties are Strings when passed to driver's connect method
Brett Wooldridge 338d556479 Update CHANGES
Brett Wooldridge 46b7589026 Improve leak logging
Brett Wooldridge 718b9b5c9d Update CHANGES
Brett Wooldridge 0e242affc0 Fixes allow Dropwizard MetricTracker and HealthCheckTracker to be set after pool startup (one time).
Brett Wooldridge d3bff837b7 Remove connectionInitSql deprecation.
Brett Wooldridge f82a5afe2d Fixes make logger non-static and use getClass()
Brett Wooldridge 38e4ac8dee Revert pax exam for java 6 compatibility
Brett Wooldridge 4c89007aad Modernize dependencies.
Brett Wooldridge f7df7cd0b0 Fixes make global lock non-static
Brett Wooldridge e9e7f05c42 Merge pull request from tedeling/2.3.x 
Unwrap ConnectionProvider to DataSource
Thies Edeling 59bc166268 , special case for when called to unwrap a DataSource, copying the same behavior as the ConnectionProvider implementations by Hibernate.
Brett Wooldridge 4ce4fb49ae [maven-release-plugin] prepare for next development iteration
Brett Wooldridge b1fde2f9f7 [maven-release-plugin] prepare release HikariCP-2.3.3
Brett Wooldridge 935155ad76 Update CHANGES
Brett Wooldridge 6833c25ab6 Merge branch '2.3.x' of github.com-brettwooldridge:brettwooldridge/HikariCP into 2.3.x 
# By Brett Wooldridge (1) and johnon (1)
* '2.3.x' of github.com-brettwooldridge:brettwooldridge/HikariCP:
  Fix  Guard against drivers that construct an SQLException where the 'cause' is self-referential.  Hopefully the cycle is not multi-layers deep, because this check will only guard against one "loop".
  Allows Hikari to look up an arbitary JNDI resource name for the metric registry
Brett Wooldridge 9804b8602e Fixes Throw a typed exception for pool initialization failures.
Brett Wooldridge 79c9e5a709 Merge branch '2.3.x' of https://github.com/brettwooldridge/HikariCP into dev
Brett Wooldridge a310df95d7 Fix Guard against drivers that construct an SQLException where the 'cause' is self-referential. Hopefully the cycle is not multi-layers deep, because this check will only guard against one "loop".