Skip to content

Commit b43b777

Browse files
guFalconguFalcon
committed
Merge branch 'develop'
2 parents 23bdfb7 + 50e62c1 commit b43b777

File tree

4 files changed

+43
-28
lines changed

4 files changed

+43
-28
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ hs_err_pid*
2626
.settings/
2727

2828
.classpath
29+
/bin/
2930

3031
bin/

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>rdb-utils</artifactId>
13-
<version>0.1.19</version>
13+
<version>0.1.20</version>
1414
<name>RdbUtils</name>
1515
<packaging>jar</packaging>
1616

@@ -34,17 +34,17 @@
3434
<dependency>
3535
<groupId>org.hibernate</groupId>
3636
<artifactId>hibernate-c3p0</artifactId>
37-
<version>6.0.2.Final</version>
37+
<version>5.4.15.Final</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.hibernate</groupId>
4141
<artifactId>hibernate-core</artifactId>
42-
<version>6.0.2.Final</version>
42+
<version>5.4.24.Final</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.hibernate</groupId>
4646
<artifactId>hibernate-entitymanager</artifactId>
47-
<version>6.0.0.Alpha7</version>
47+
<version>5.4.15.Final</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.liquibase</groupId>

‎src/main/java/info/unterrainer/commons/rdbutils/Information.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public class Information {
44
public static final String name = "RDB-Utils";
5-
public static final String buildTime = "2022-03-14T14:34:56Z";
6-
public static final String pomVersion = "0.1.15";
5+
public static final String buildTime = "2022-06-04T22:27:29Z";
6+
public static final String pomVersion = "0.1.18";
77
}

‎src/test/resources/META-INF/persistence.xml

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,49 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<persistence version="2.0"
3-
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
5-
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
6-
<persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
2+
<persistence version="2.2"
3+
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
6+
<persistence-unit name="test"
7+
transaction-type="RESOURCE_LOCAL">
78
<!-- Hibernate specific -->
89
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
9-
10+
1011
<class>info.unterrainer.commons.rdbutils.entities.BasicJpa</class>
1112
<class>info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter</class>
12-
13+
1314
<properties>
1415
<!-- Hibernate-specific / MariaDB-JDBC-driver specific -->
15-
<property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
16-
<property name="hibernate.connection.driver_class" value="org.mariadb.jdbc.Driver" />
17-
<property name="hibernate.dialect" value="org.hibernate.dialect.MariaDBDialect" />
18-
<property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
19-
<property name="hibernate.jdbc.time_zone" value="UTC"/>
20-
16+
<property name="javax.persistence.jdbc.driver"
17+
value="org.mariadb.jdbc.Driver" />
18+
<property name="hibernate.connection.driver_class"
19+
value="org.mariadb.jdbc.Driver" />
20+
<property name="hibernate.dialect"
21+
value="org.hibernate.dialect.MariaDBDialect" />
22+
<property name="hibernate.temp.use_jdbc_metadata_defaults"
23+
value="false" />
24+
<property name="hibernate.jdbc.time_zone" value="UTC" />
25+
2126
<property name="hibernate.show_sql" value="false" />
27+
<property name="hibernate.format_sql" value="false" />
2228
<property name="hibernate.c3p0.min_size" value="5" />
23-
<property name="hibernate.c3p0.max_size" value="20" />
24-
<!-- Seconds a Connection can remain pooled but unused before being discarded. Zero means idle connections never expire. -->
29+
<property name="hibernate.c3p0.max_size" value="500" />
30+
<!-- Seconds a Connection can remain pooled but unused before being discarded.
31+
Zero means idle connections never expire. -->
2532
<property name="hibernate.c3p0.timeout" value="300" />
26-
<!-- The size of c3p0’s global PreparedStatement cache over all connections. Zero means statement caching is turned off. -->
27-
<property name="hibernate.c3p0.max_statements" value="50" />
28-
<!-- If this is a number greater than 0, c3p0 will test all idle, pooled but unchecked-out connections, every this number of seconds. -->
29-
<property name="hibernate.c3p0.idle_test_period" value="3000" />
30-
<!-- Is set to true, the connection is tested with a simple query before being returned to a user -->
31-
<property name="hibernate.c3p0.testConnectionOnCheckout" value="true" />
32-
33+
<!-- The size of c3p0’s global PreparedStatement cache over all connections.
34+
Zero means statement caching is turned off. -->
35+
<property name="hibernate.c3p0.max_statements" value="500" />
36+
<!-- If this is a number greater than 0, c3p0 will test all idle, pooled
37+
but unchecked-out connections, every this number of seconds. -->
38+
<property name="hibernate.c3p0.idle_test_period"
39+
value="3000" />
40+
<!-- Is set to true, the connection is tested with a simple query before
41+
being returned to a user -->
42+
<property name="hibernate.c3p0.testConnectionOnCheckout"
43+
value="true" />
44+
<property
45+
name="hibernate.c3p0.statementCacheNumDeferredCloseThreads"
46+
value="1" />
3347
</properties>
3448
</persistence-unit>
3549
</persistence>

0 commit comments

Comments
 (0)