From 0d20c0458051a5c4e056904ab0933c87236d2e62 Mon Sep 17 00:00:00 2001
From: nmihajlovski <nikolce.mihajlovski@gmail.com>
Date: Mon, 29 May 2017 19:35:24 +0200
Subject: [PATCH] Configuring Hikari as the default connection pool for JDBC
 and JPA (WiP).

---
 .../src/main/resources/built-in-config.yml            |  8 ++++++++
 rapidoid-quick/pom.xml                                | 11 +++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rapidoid-commons/src/main/resources/built-in-config.yml b/rapidoid-commons/src/main/resources/built-in-config.yml
index 3eef2d2dbf..b19f44ff7a 100644
--- a/rapidoid-commons/src/main/resources/built-in-config.yml
+++ b/rapidoid-commons/src/main/resources/built-in-config.yml
@@ -72,6 +72,14 @@ hibernate:
     acquireIncrement: ${c3p0.acquireIncrement}
     maxStatementsPerConnection: ${c3p0.maxStatementsPerConnection}
     idleConnectionTestPeriod: ${c3p0.idleConnectionTestPeriod}
+  hikari:
+#    minimumIdle: 20
+#    maximumPoolSize: 100
+#    idleTimeout: 30000
+    dataSource:
+      url: ${jdbc.url}
+    username: ${jdbc.username}
+    password: ${jdbc.password}
 
 c3p0:
   debug: false
diff --git a/rapidoid-quick/pom.xml b/rapidoid-quick/pom.xml
index a34072855e..8dce0db664 100644
--- a/rapidoid-quick/pom.xml
+++ b/rapidoid-quick/pom.xml
@@ -45,20 +45,15 @@
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-c3p0</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>${validator.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.mchange</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>${c3p0.version}</version>
+			<groupId>com.zaxxer</groupId>
+			<artifactId>HikariCP</artifactId>
+			<version>${hikari.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.el</groupId>