Index: eprms-tap/src/main/resources/hibernate.cfg.xml
===================================================================
--- eprms-tap/src/main/resources/hibernate.cfg.xml	(revision 1f949f9b6a898c2d94135aaf80b4bae8045b6e3c)
+++ eprms-tap/src/main/resources/hibernate.cfg.xml	(revision 7270e0306a8573cd95ea49ef6db712bc25065b14)
@@ -6,18 +6,23 @@
 	<session-factory>
 		<!-- JDBC connection properties taken from maven profile -->
-		<property name="connection.url">@jdbc.url@</property>
-		<property name="default_schema">@jdbc.default_schema@</property>
-		<property name="connection.username">@jdbc.username@</property>
-		<property name="connection.password">@jdbc.password@</property>
-
 		<!-- DB schema update property is taken from maven profile -->
 		<property name="hbm2ddl.auto">@hib.hbm2ddlauto@</property>
 
 		<!-- Fixed properties for PostgreSQL database -->
-		<property name="dialect">@hib.dialect@</property>
-		<property name="connection.driver_class">@jdbc.driver@</property>
-		<property name="bytecode.use_reflection_optimizer">false</property>
+		<property name="hibernate.show_sql">false</property>
 
-		<property name="hibernate.show_sql">@hib.showsql@</property>
+		<!-- HikariCP -->
+		<property name="hibernate.connection.provider_class">org.hibernate.hikaricp.internal.HikariCPConnectionProvider</property>
+		<property name="hibernate.hikari.poolName">TapestryHibernatePool</property>
+		<property name="hibernate.hikari.registerMbeans">true</property>
+		<property name="hibernate.hikari.minimumIdle">5</property>
+		<property name="hibernate.hikari.maximumPoolSize">16</property>
+		<property name="hibernate.hikari.idleTimeout">30000</property>
+		<property name="hibernate.hikari.dataSourceClassName">org.postgresql.ds.PGSimpleDataSource</property>
+		<property name="hibernate.hikari.dataSource.url">@jdbc.url@</property>
+		<property name="hibernate.hikari.dataSource.user">@jdbc.username@</property>
+		<property name="hibernate.hikari.dataSource.password">@jdbc.password@</property>
+		<property name="hibernate.hikari.schema">@jdbc.default_schema@</property>
+
 	</session-factory>
 </hibernate-configuration>