This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new b92094ecf6 TOMEE-3775 Upgrade to HSQLDB 2.5.2
b92094ecf6 is described below
commit b92094ecf6ec093e4f2e749c13906af84539fd8b
Author: Jonathan Gallimore <[email protected]>
AuthorDate: Wed May 25 09:10:32 2022 +0100
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 dff24f356b..ac33a31c90 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1841,7 +1841,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 e403fce97d..4cd9ad4994 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1984,7 +1984,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 6bed278b53..170637e5af 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1984,7 +1984,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 181de0f78c..bf564b7063 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1269,7 +1269,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 dc91c2d558..c6c4430ab4 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>5.6.7.Final</version.hibernate>
