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 @@ hibernate-core-jakarta - - org.hibernate - hibernate-entitymanager - - - - org.hibernate - hibernate-c3p0 - - joda-time 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 @@ ${org.hibernate.hibernate.version} - - org.hibernate - hibernate-entitymanager - ${org.hibernate.hibernate.version} - - - - org.hibernate - hibernate-c3p0 - ${org.hibernate.hibernate.version} - - org.freemarker freemarker