This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch javax
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/javax by this push:
new 076e3a38a TAP5-2796: fixing some failures caused by upgrading HSQLDB
076e3a38a is described below
commit 076e3a38a1795c9f6e2c712ca6b95001f9f93bfe
Author: Thiago H. de Paula Figueiredo <[email protected]>
AuthorDate: Sat Nov 2 12:47:56 2024 -0300
TAP5-2796: fixing some failures caused by upgrading HSQLDB
---
build.gradle | 4 ++--
.../java/org/apache/tapestry5/integration/cluster/ClusterTests.java | 4 ++--
tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml | 2 +-
tapestry-hibernate/src/test/resources/hibernate.cfg.xml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 4f85e61bf..66e66ca8e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ project.ext.versions = [
commonsIo: "2.17.0",
webdriverManager: "5.3.1",
antlrRuntime: "3.5.3",
- hsqldb: "2.7.3",
+ hsqldb: "2.7.3:jdk8",
snakeyaml: "2.3"
]
@@ -416,7 +416,7 @@ subprojects {
"commons-codec:commons-codec:1.10",
"commons-io:commons-io:${versions.commonsIo}",
"commons-logging:commons-logging:1.1.3",
- "org.hsqldb:hsqldb:2.7.3",
+ "org.hsqldb:hsqldb:${versions.hsqldb}",
"org.antlr:antlr-runtime:${versions.antlrRuntime}",
"org.apache.tomcat:dbcp:6.0.32",
"org.hamcrest:hamcrest-core:1.3",
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
index 3b6f5f697..c3546ad4f 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/cluster/ClusterTests.java
@@ -198,7 +198,7 @@ public class ClusterTests
JDBCSessionIdManager idMgr = new
JDBCSessionIdManager(runner.getServer());
idMgr.setWorkerName(name);
- idMgr.setDriverInfo("org.hsqldb.jdbcDriver",
"jdbc:hsqldb:mem:clustertest");
+ idMgr.setDriverInfo("org.hsqldb.jdbc.JDBCDriver",
"jdbc:hsqldb:mem:clustertest");
Server server = runner.getServer();
server.setSessionIdManager(idMgr);
@@ -220,7 +220,7 @@ public class ClusterTests
private void createJettySessionsTable() throws ClassNotFoundException,
SQLException
{
- Class.forName("org.hsqldb.jdbcDriver");
+ Class.forName("org.hsqldb.jdbc.JDBCDriver");
Connection c =
DriverManager.getConnection("jdbc:hsqldb:mem:clustertest", "sa", "");
String sql = "create table JettySessions (" +
diff --git a/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
b/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
index d02951b94..1340455bd 100644
--- a/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
+++ b/tapestry-hibernate-core/src/test/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
<hibernate-configuration>
<session-factory>
- <property
name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property
name="hibernate.connection.driver_class">org.hsqldb.jdbc.JDBCDriver</property>
<property
name="hibernate.connection.url">jdbc:hsqldb:mem:test</property>
<property name="hibernate.connection.username">sa</property>
<property
name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
diff --git a/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
b/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
index 08faacc51..ebdc54aca 100644
--- a/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
+++ b/tapestry-hibernate/src/test/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
<hibernate-configuration>
<session-factory>
- <property
name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+ <property
name="hibernate.connection.driver_class">org.hsqldb.jdbc.JDBCDriver</property>
<property name="hibernate.connection.url">jdbc:hsqldb:mem:test</property>
<property name="hibernate.connection.username">sa</property>
<property
name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
