You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2021/04/04 11:52:45 UTC
[openjpa] branch master updated (e68083e -> 1c30090)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git.
from e68083e move to org.junit.Assert
new 7f92be5 OPENJPA-2858 update dbcp2 to 2.8.0
new 6d4f951 OPENJPA-2858 also update commons-pool
new 60cb785 update ant, hsqldb and log4j
new 1c30090 OPENJPA-2859 use DOUBLE instead of NUMERIC
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openjpa/jdbc/schema/DBCPDriverDataSource.java | 2 +-
.../org/apache/openjpa/jdbc/sql/HSQLDictionary.java | 2 --
.../openjpa/persistence/access/TestExplicitAccess.java | 6 +++---
openjpa-project/BUILDING.txt | 2 +-
pom.xml | 17 +++++++++--------
5 files changed, 14 insertions(+), 15 deletions(-)
[openjpa] 02/04: OPENJPA-2858 also update commons-pool
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 6d4f951d627c8a890f3d0e91c827b174749000f3
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Apr 3 23:19:15 2021 +0200
OPENJPA-2858 also update commons-pool
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2db65ab..f9d14b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1680,7 +1680,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1819,7 +1819,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
[openjpa] 04/04: OPENJPA-2859 use DOUBLE instead of NUMERIC
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 1c30090c8c611843860ff83be862e22cbcf46cee
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Apr 4 13:51:21 2021 +0200
OPENJPA-2859 use DOUBLE instead of NUMERIC
by default NUMERIC has no fraction digits, so rather use
DOUBLE data type which is a 64bit double value.
---
.../src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java | 2 --
.../org/apache/openjpa/persistence/access/TestExplicitAccess.java | 6 +++---
openjpa-project/BUILDING.txt | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
index 8c4f23c..35d6010 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
@@ -80,8 +80,6 @@ public class HSQLDictionary extends DBDictionary {
supportsSelectEndIndex = true;
supportsDeferredConstraints = false;
- doubleTypeName = "NUMERIC";
-
supportsNullTableForGetPrimaryKeys = false;
supportsNullTableForGetIndexInfo = false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
index 7d186732..d019f74 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
@@ -1114,17 +1114,17 @@ public class TestExplicitAccess extends SingleEMFTestCase {
assertTrue(ing2.containsKey("Peanut Butter"));
Quantity q = ing2.get("Peanut Butter").getQuantity();
assertNotNull(q);
- assertEquals(1.0, q.getAmount());
+ assertEquals(1.0d, q.getAmount(), 0.001d);
assertEquals("Tbsp", q.getUnitOfMeasure());
assertTrue(ing2.containsKey("Jelly"));
q = ing2.get("Jelly").getQuantity();
assertNotNull(q);
- assertEquals(1.5, q.getAmount());
+ assertEquals(1.5d, q.getAmount(), 0.001d);
assertEquals("Tbsp", q.getUnitOfMeasure());
assertTrue(ing2.containsKey("Bread"));
q = ing2.get("Bread").getQuantity();
assertNotNull(q);
- assertEquals(2.0, q.getAmount());
+ assertEquals(2.0d, q.getAmount(), 0.001d);
assertEquals("Slice", q.getUnitOfMeasure());
em.remove(mi2);
diff --git a/openjpa-project/BUILDING.txt b/openjpa-project/BUILDING.txt
index 8144675..e2bbd6a 100644
--- a/openjpa-project/BUILDING.txt
+++ b/openjpa-project/BUILDING.txt
@@ -210,7 +210,7 @@ For running against a h2 based installation:
-ea -Dopenjpa.ConnectionDriverName=org.h2.Driver -Dopenjpa.ConnectionURL=jdbc:h2:./target/database/openjpa-h2-database -Dopenjpa.ConnectionUserName=root -Dopenjpa.ConnectionPassword=openjpatst
For running against a hsqldb based installation:
- -ea -Dopenjpa.ConnectionDriverName=org.hsqldb.Driver -Dopenjpa.ConnectionURL=jdbc:hsqldb:mem:openjpa20-hsqldb-database -Dopenjpa.ConnectionUserName=sa -Dopenjpa.ConnectionPassword=
+ -ea -Dopenjpa.ConnectionDriverName=org.hsqldb.jdbcDriver -Dopenjpa.ConnectionURL=jdbc:hsqldb:mem:openjpa20-hsqldb-database -Dopenjpa.ConnectionUserName=sa -Dopenjpa.ConnectionPassword=
For running tests against a Microsoft SQLServer Docker based installation:
-ea -Dopenjpa.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver -Dopenjpa.ConnectionURL=jdbc:sqlserver://localhost:1433;sendTimeAsDatetime=false -Dopenjpa.ConnectionUserName=SA -Dopenjpa.ConnectionPassword=OpenJP8tst
[openjpa] 03/04: update ant, hsqldb and log4j
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 60cb785a3b528c57f0c55b62d3e67b4d9b2ca1f4
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Apr 4 13:51:03 2021 +0200
update ant, hsqldb and log4j
---
pom.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index f9d14b2..375e1a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,10 +75,10 @@
<createSources>false</createSources>
<!-- common JDBC driver versions -->
<derby.version>10.14.2.0</derby.version>
- <hsqldb.version>2.4.1</hsqldb.version>
+ <hsqldb.version>2.5.1</hsqldb.version>
<mysql.connector.version>5.1.47</mysql.connector.version>
<mariadb.connector.version>2.7.2</mariadb.connector.version>
- <postgresql.connector.version>42.2.9</postgresql.connector.version>
+ <postgresql.connector.version>42.2.19</postgresql.connector.version>
<mssql.connector.version>9.2.1.jre8</mssql.connector.version>
<!-- other common versions -->
@@ -96,7 +96,8 @@
<xbean.version>4.18</xbean.version>
<bval.version>1.1.2</bval.version>
- <log4j2.version>2.14.0</log4j2.version>
+ <log4j2.version>2.14.1</log4j2.version>
+ <ant.version>1.10.9</ant.version>
<jmock.version>2.9.0</jmock.version>
<automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>
@@ -1804,7 +1805,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7</version>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
@@ -2028,7 +2029,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.10.5</version>
+ <version>1.10.9</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
[openjpa] 01/04: OPENJPA-2858 update dbcp2 to 2.8.0
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 7f92be5e2bfbee3c2213f8d2609e9f619647d39f
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Apr 3 22:57:06 2021 +0200
OPENJPA-2858 update dbcp2 to 2.8.0
---
.../main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
index eaf68b4..2ad6f40 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
@@ -48,7 +48,7 @@ extends SimpleDriverDataSource implements Configurable, Closeable {
private static RuntimeException _dbcpEx;
protected JDBCConfiguration conf;
- private DataSource _ds;
+ private volatile DataSource _ds;
@Override
public Connection getConnection(Properties props) throws SQLException {
diff --git a/pom.xml b/pom.xml
index 139b31f..2db65ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1741,7 +1741,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>