Skip to content

Commit 5a86dad

Browse files
author
Gerald Unterrainer
committed
Merge branch 'develop'
2 parents b43b777 + ea2e69e commit 5a86dad

File tree

4 files changed

+21
-41
lines changed

4 files changed

+21
-41
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ hs_err_pid*
2828
.classpath
2929
/bin/
3030

31-
bin/
31+
src/main/java/info/unterrainer/commons/rdbutils/Information.java

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>info.unterrainer.commons</groupId>
77
<artifactId>parent-pom</artifactId>
8-
<version>0.1.26</version>
8+
<version>0.2.1</version>
99
</parent>
1010

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

@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>info.unterrainer.commons</groupId>
2626
<artifactId>jre-utils</artifactId>
27-
<version>0.2.13</version>
27+
<version>0.3.0</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>javax.persistence</groupId>
@@ -49,12 +49,12 @@
4949
<dependency>
5050
<groupId>org.liquibase</groupId>
5151
<artifactId>liquibase-core</artifactId>
52-
<version>4.11.0</version>
52+
<version>4.12.0</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.mariadb.jdbc</groupId>
5656
<artifactId>mariadb-java-client</artifactId>
57-
<version>3.0.5</version>
57+
<version>3.0.6</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.yaml</groupId>

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,34 @@
33
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
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">
6+
<persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
87
<!-- Hibernate specific -->
98
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
109

1110
<class>info.unterrainer.commons.rdbutils.entities.BasicJpa</class>
1211
<class>info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter</class>
13-
12+
1413
<properties>
1514
<!-- Hibernate-specific / MariaDB-JDBC-driver specific -->
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-
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+
2621
<property name="hibernate.show_sql" value="false" />
2722
<property name="hibernate.format_sql" value="false" />
2823
<property name="hibernate.c3p0.min_size" value="5" />
2924
<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. -->
25+
<!-- Seconds a Connection can remain pooled but unused before being discarded. Zero means idle connections never expire. -->
3226
<property name="hibernate.c3p0.timeout" value="300" />
33-
<!-- The size of c3p0’s global PreparedStatement cache over all connections.
34-
Zero means statement caching is turned off. -->
27+
<!-- The size of c3p0’s global PreparedStatement cache over all connections. Zero means statement caching is turned off. -->
3528
<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" />
29+
<!-- If this is a number greater than 0, c3p0 will test all idle, pooled but unchecked-out connections, every this number of seconds. -->
30+
<property name="hibernate.c3p0.idle_test_period" value="3000" />
31+
<!-- Is set to true, the connection is tested with a simple query before being returned to a user -->
32+
<property name="hibernate.c3p0.testConnectionOnCheckout" value="true" />
33+
<property name="hibernate.c3p0.statementCacheNumDeferredCloseThreads" value="1" />
4734
</properties>
4835
</persistence-unit>
4936
</persistence>

0 commit comments

Comments
 (0)