This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 3a4d947f66 TOMEE-3775 Upgrade to HSQLDB 2.5.2
3a4d947f66 is described below
commit 3a4d947f6667128265226cb03382b8c0576f6e51
Author: Jonathan Gallimore <[email protected]>
AuthorDate: Wed May 25 10:10:32 2022 +0200
TOMEE-3775 Upgrade to HSQLDB 2.5.2
---
boms/tomee-microprofile/pom.xml | 2 +-
boms/tomee-plume/pom.xml | 2 +-
boms/tomee-plus/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 2 +-
.../src/main/java/org/apache/openejb/loader/SystemInstance.java | 4 ++++
pom.xml | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index ff80590443..5adcadc112 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1836,7 +1836,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.4</version>
+ <version>2.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index f75d8bd287..5887dd84ed 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1958,7 +1958,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.4</version>
+ <version>2.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index a00f25acf2..c706f1f424 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1958,7 +1958,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.4</version>
+ <version>2.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 00a71982d5..5912ecdb4d 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1275,7 +1275,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.4</version>
+ <version>2.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git
a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
index c41bb37531..f200a16d7f 100644
---
a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
+++
b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
@@ -141,6 +141,10 @@ public final class SystemInstance {
if (!
this.internalProperties.containsKey(ACTIVEMQ_CREATE_JMX_CONNECTOR)) {
this.internalProperties.setProperty(ACTIVEMQ_CREATE_JMX_CONNECTOR,
Boolean.FALSE.toString());
}
+
+ if (getProperty("hsqldb.reconfig_logging") == null) {
+ setProperty("hsqldb.reconfig_logging", "false", true);
+ }
}
public <E> E fireEvent(final E event) {
diff --git a/pom.xml b/pom.xml
index 59ee33de68..bf6a605ee7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
'examples' have issues with hsqldb > 2.3.5
'QuartzPersistenceForEJBTimersTest' cannot obtain a connection -> never
timeouts
-->
- <version.hsqldb>2.3.4</version.hsqldb>
+ <version.hsqldb>2.5.2</version.hsqldb>
<version.axiom>1.3.0</version.axiom>
<version.xalan>2.7.2</version.xalan>
<version.hibernate>6.0.0.Final</version.hibernate>
