diff --git a/README.md b/README.md index bdf78c3b..01042dd6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Or look at this: com.zaxxer HikariCP - 1.2.6 + 1.2.8 compile ``` @@ -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)); @@ -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.