This is an automated email from the ASF dual-hosted git repository.

tanner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new f136c13b2f [CALCITE-5938] Update HSQLDB to Version 2.7.2 (using JDK8 
JAR, default supports JDK11+)
f136c13b2f is described below

commit f136c13b2f165595965caa011fd22ecb6bf03f22
Author: Tanner Clary <[email protected]>
AuthorDate: Thu Sep 14 14:46:09 2023 -0700

    [CALCITE-5938] Update HSQLDB to Version 2.7.2 (using JDK8 JAR, default 
supports JDK11+)
---
 babel/build.gradle.kts      | 2 +-
 core/build.gradle.kts       | 2 +-
 gradle.properties           | 2 +-
 piglet/build.gradle.kts     | 2 +-
 plus/build.gradle.kts       | 2 +-
 server/build.gradle.kts     | 2 +-
 testkit/build.gradle.kts    | 2 +-
 ubenchmark/build.gradle.kts | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/babel/build.gradle.kts b/babel/build.gradle.kts
index 82d1ebd1b3..c96f5276a2 100644
--- a/babel/build.gradle.kts
+++ b/babel/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 
     testImplementation("net.hydromatic:quidem")
     testImplementation("net.hydromatic:scott-data-hsqldb")
-    testImplementation("org.hsqldb:hsqldb")
+    testImplementation("org.hsqldb:hsqldb::jdk8")
     testImplementation("org.incava:java-diff")
     testImplementation(project(":testkit"))
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 1aa45832c1..9674eb8d92 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -94,7 +94,7 @@ dependencies {
     testImplementation("net.hydromatic:quidem")
     testImplementation("org.apache.calcite.avatica:avatica-server")
     testImplementation("org.apache.commons:commons-pool2")
-    testImplementation("org.hsqldb:hsqldb")
+    testImplementation("org.hsqldb:hsqldb::jdk8")
     testImplementation("sqlline:sqlline")
     testImplementation(kotlin("stdlib-jdk8"))
     testImplementation(kotlin("test"))
diff --git a/gradle.properties b/gradle.properties
index fc461b9a48..f161b2efa2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ h2.version=2.1.210
 hadoop.version=2.7.5
 hamcrest-date.version=2.0.4
 hamcrest.version=2.1
-hsqldb.version=2.5.2
+hsqldb.version=2.7.2
 httpclient.version=4.5.9
 httpcore.version=4.4.11
 hydromatic.tpcds.version=0.4
diff --git a/piglet/build.gradle.kts b/piglet/build.gradle.kts
index 8d8ab7954d..148c8777d9 100644
--- a/piglet/build.gradle.kts
+++ b/piglet/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     testImplementation(project(":testkit"))
     testImplementation("net.hydromatic:scott-data-hsqldb")
     testImplementation("org.apache.hadoop:hadoop-client")
-    testImplementation("org.hsqldb:hsqldb")
+    testImplementation("org.hsqldb:hsqldb::jdk8")
     testRuntimeOnly("org.slf4j:slf4j-log4j12")
     annotationProcessor("org.immutables:value")
     compileOnly("org.immutables:value-annotations")
diff --git a/plus/build.gradle.kts b/plus/build.gradle.kts
index 1b58da0029..fc696a4497 100644
--- a/plus/build.gradle.kts
+++ b/plus/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation("net.hydromatic:chinook-data-hsqldb")
     implementation("net.hydromatic:tpcds")
     implementation("org.apache.calcite.avatica:avatica-server")
-    implementation("org.hsqldb:hsqldb")
+    implementation("org.hsqldb:hsqldb::jdk8")
 
     testImplementation("net.hydromatic:sql-logic-test")
     testImplementation(project(":testkit"))
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 4f91a925b8..f80fe872fd 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     testImplementation(project(":testkit"))
     testImplementation("net.hydromatic:quidem")
     testImplementation("net.hydromatic:scott-data-hsqldb")
-    testImplementation("org.hsqldb:hsqldb")
+    testImplementation("org.hsqldb:hsqldb::jdk8")
     testImplementation("org.incava:java-diff")
     testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 }
diff --git a/testkit/build.gradle.kts b/testkit/build.gradle.kts
index bd39ef1a69..5f4ab9f554 100644
--- a/testkit/build.gradle.kts
+++ b/testkit/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     implementation("org.apache.commons:commons-lang3")
     implementation("org.apache.commons:commons-pool2")
     implementation("org.hamcrest:hamcrest")
-    implementation("org.hsqldb:hsqldb")
+    implementation("org.hsqldb:hsqldb::jdk8")
     annotationProcessor("org.immutables:value")
     compileOnly("org.immutables:value-annotations")
     implementation("org.incava:java-diff")
diff --git a/ubenchmark/build.gradle.kts b/ubenchmark/build.gradle.kts
index f314d2524d..7af86bb461 100644
--- a/ubenchmark/build.gradle.kts
+++ b/ubenchmark/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     jmhImplementation("org.openjdk.jmh:jmh-core")
     jmhImplementation("org.openjdk.jmh:jmh-generator-annprocess")
     jmhImplementation(project(":testkit"))
-    jmhImplementation("org.hsqldb:hsqldb")
+    jmhImplementation("org.hsqldb:hsqldb::jdk8")
 }
 
 // See https://github.com/melix/jmh-gradle-plugin

Reply via email to