From facaac0916532e3eb2f14f12a4fa21739749c6fc Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 22 Jan 2014 14:34:10 +0900 Subject: [PATCH 1/6] Update maven info for release 1.2.7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bdf78c3b..eb14ae7e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Or look at this: com.zaxxer HikariCP - 1.2.6 + 1.2.7 compile ``` From 211062540c5ae9ba882ffbc41cb6be12c4850518 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 22 Jan 2014 16:06:33 +0900 Subject: [PATCH 2/6] Update README.md --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eb14ae7e..9a0ab593 100644 --- a/README.md +++ b/README.md @@ -230,8 +230,14 @@ props.setProperty("dataSource.logWriter", new PrintWriter(System.out)); HikariConfig config = new HikariConfig(props); HikariDataSource ds = new HikariDataSource(config); ``` +---------------------------------------------------- -**See the [Wiki](https://github.com/brettwooldridge/HikariCP/wiki) for additional configuration examples (such as MySQL, Hibernate, etc.).** +#### Wiki #### +Don't forget the [Wiki](https://github.com/brettwooldridge/HikariCP/wiki) for additional information such as: + * [FAQ](https://github.com/brettwooldridge/HikariCP/wiki/FAQ) + * [Hibernate 4.x Configuration](https://github.com/brettwooldridge/HikariCP/wiki/Hibernate4) + * [MySQL Configuration Tips](https://github.com/brettwooldridge/HikariCP/wiki/MySQL-Configuration) + * etc. ---------------------------------------------------- @@ -258,9 +264,6 @@ Google discussion group [HikariCP here](https://groups.google.com/d/forum/hikari * Javassist 3.18.1+ library * slf4j library -1It might work with other JVM, but defintely won't work with Java 6 and below because of the use of -classes that are only available in Java 7. - #### Contributions #### Please perform changes and submit pull requests from the ``dev`` branch instead of ``master``. Please set your editor to use spaces instead of tabs, and adhere to the apparent style of the code you are editing. The ``dev`` branch is always more "current" than the ``master`` if you are looking to live life on the edge. From 5693262b8f892b60606ccf78d461ab258b5bf09f Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 22 Jan 2014 23:25:52 +0900 Subject: [PATCH 3/6] [maven-release-plugin] prepare release HikariCP-1.2.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3750f5e..82d7e1be 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.zaxxer HikariCP - 1.2.8-SNAPSHOT + 1.2.8 bundle HikariCP From c90344d280d2f860db5f992bb312841c8214ccc5 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 22 Jan 2014 23:25:59 +0900 Subject: [PATCH 4/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82d7e1be..e308521b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.zaxxer HikariCP - 1.2.8 + 1.2.9-SNAPSHOT bundle HikariCP From 44e60376d60bae7778dc53e7562153b2362f1907 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Thu, 23 Jan 2014 09:14:03 +0900 Subject: [PATCH 5/6] Updated release version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a0ab593..c7e56c02 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Or look at this: com.zaxxer HikariCP - 1.2.7 + 1.2.8 compile ``` From db746228557d96788f82e14fcba0549fc7a86f57 Mon Sep 17 00:00:00 2001 From: jhoffart Date: Tue, 4 Feb 2014 17:57:10 +0100 Subject: [PATCH 6/6] Correcting username strings in example --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c7e56c02..01042dd6 100644 --- a/README.md +++ b/README.md @@ -212,7 +212,7 @@ acquireIncrement=3 acquireRetryDelay=1000 connectionTestQuery=SELECT 1 dataSourceClassName=org.postgresql.ds.PGSimpleDataSource -dataSource.username=test +dataSource.user=test dataSource.password=test dataSource.databaseName=mydb dataSource.serverName=localhost @@ -222,7 +222,7 @@ or ``java.util.Properties`` based: Properties props = new Properties(); props.setProperty("maximumPoolSize", 100); props.setProperty("dataSourceClassName", "org.postgresql.ds.PGSimpleDataSource"); -props.setProperty("dataSource.username", "test"); +props.setProperty("dataSource.user", "test"); props.setProperty("dataSource.password", "test"); props.setProperty("dataSource.databaseName", "mydb"); props.setProperty("dataSource.logWriter", new PrintWriter(System.out));