From 1974a8bb8d89bd5d6413e9237374d29cc6a8bd5c Mon Sep 17 00:00:00 2001
From: bgamard <b.gamard@sismics.com>
Date: Wed, 12 Apr 2023 17:58:51 +0200
Subject: [PATCH] #668: cleanup hibernate dependencies

---
 docs-core/pom.xml                                    | 10 ----------
 .../src/main/java/com/sismics/util/jpa/EMF.java      |  9 +++------
 docs-core/src/test/resources/hibernate.properties    |  7 +++----
 docs-web/src/dev/resources/hibernate.properties      |  9 +++------
 docs-web/src/test/resources/hibernate.properties     |  7 +++----
 pom.xml                                              | 12 ------------
 6 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/docs-core/pom.xml b/docs-core/pom.xml
index ec6deaad..4decd254 100644
--- a/docs-core/pom.xml
+++ b/docs-core/pom.xml
@@ -21,16 +21,6 @@
       <artifactId>hibernate-core-jakarta</artifactId>
     </dependency>
     
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-c3p0</artifactId>
-    </dependency>
-    
     <!-- Other external dependencies -->
     <dependency>
       <groupId>joda-time</groupId>
diff --git a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java
index 5912e2ad..77708465 100644
--- a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java
+++ b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java
@@ -101,12 +101,9 @@ public final class EMF {
         props.put("hibernate.format_sql", "false");
         props.put("hibernate.max_fetch_depth", "5");
         props.put("hibernate.cache.use_second_level_cache", "false");
-        props.put("hibernate.c3p0.min_size", "1");
-        props.put("hibernate.c3p0.max_size", "10");
-        props.put("hibernate.c3p0.timeout", "5000");
-        props.put("hibernate.c3p0.max_statements", "0");
-        props.put("hibernate.c3p0.acquire_increment", "1");
-        props.put("hibernate.c3p0.idle_test_period", "10");
+        props.put("hibernate.connection.initial_pool_size", "1");
+        props.put("hibernate.connection.pool_size", "10");
+        props.put("hibernate.connection.pool_validation_interval", "5");
         return props;
     }
     
diff --git a/docs-core/src/test/resources/hibernate.properties b/docs-core/src/test/resources/hibernate.properties
index 2c068af9..b47cd667 100644
--- a/docs-core/src/test/resources/hibernate.properties
+++ b/docs-core/src/test/resources/hibernate.properties
@@ -8,7 +8,6 @@ hibernate.show_sql=true
 hibernate.format_sql=false
 hibernate.max_fetch_depth=5
 hibernate.cache.use_second_level_cache=false
-hibernate.c3p0.min_size=1
-hibernate.c3p0.max_size=10
-hibernate.c3p0.timeout=0
-hibernate.c3p0.max_statements=0
\ No newline at end of file
+hibernate.connection.initial_pool_size=1
+hibernate.connection.pool_size=10
+hibernate.connection.pool_validation_interval=5
\ No newline at end of file
diff --git a/docs-web/src/dev/resources/hibernate.properties b/docs-web/src/dev/resources/hibernate.properties
index 8b092865..33a61d08 100644
--- a/docs-web/src/dev/resources/hibernate.properties
+++ b/docs-web/src/dev/resources/hibernate.properties
@@ -8,9 +8,6 @@ hibernate.show_sql=false
 hibernate.format_sql=false
 hibernate.max_fetch_depth=5
 hibernate.cache.use_second_level_cache=false
-hibernate.c3p0.min_size=1
-hibernate.c3p0.max_size=10
-hibernate.c3p0.timeout=5000
-hibernate.c3p0.max_statements=0
-hibernate.c3p0.acquire_increment=1
-hibernate.c3p0.idle_test_period=10
+hibernate.connection.initial_pool_size=1
+hibernate.connection.pool_size=10
+hibernate.connection.pool_validation_interval=5
diff --git a/docs-web/src/test/resources/hibernate.properties b/docs-web/src/test/resources/hibernate.properties
index 7e4efc32..77fc66e4 100644
--- a/docs-web/src/test/resources/hibernate.properties
+++ b/docs-web/src/test/resources/hibernate.properties
@@ -8,7 +8,6 @@ hibernate.show_sql=false
 hibernate.format_sql=false
 hibernate.max_fetch_depth=5
 hibernate.cache.use_second_level_cache=false
-hibernate.c3p0.min_size=1
-hibernate.c3p0.max_size=10
-hibernate.c3p0.timeout=0
-hibernate.c3p0.max_statements=0
\ No newline at end of file
+hibernate.connection.initial_pool_size=1
+hibernate.connection.pool_size=10
+hibernate.connection.pool_validation_interval=5
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7cb9be5d..4c7ff8f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,18 +332,6 @@
         <version>${org.hibernate.hibernate.version}</version>
       </dependency>
       
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-entitymanager</artifactId>
-        <version>${org.hibernate.hibernate.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-c3p0</artifactId>
-        <version>${org.hibernate.hibernate.version}</version>
-      </dependency>
-      
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>