(groovy) 01/05: GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)

[paulk]

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

paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit b074761a4bf07121ce2c6e811f84afd4f938fa7e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jun 24 11:10:27 2024 +1000

    GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)
---
 subprojects/groovy-sql/build.gradle                 | 2 +-
 subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/subprojects/groovy-sql/build.gradle 
b/subprojects/groovy-sql/build.gradle
index 860b0f89f1..3b638f0787 100644
--- a/subprojects/groovy-sql/build.gradle
+++ b/subprojects/groovy-sql/build.gradle
@@ -22,7 +22,7 @@ plugins {
 
 dependencies {
     api rootProject // Sql uses Closure...
-    testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.2', 
classifier: 'jdk8'
+    testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.3', 
classifier: 'jdk8'
 // uncomment to test with other databases (requires changes elsewhere too)
 //    testImplementation 'com.h2database:h2:1.3.164'
 //    testImplementation 'hsqldb:hsqldb:1.8.0.10'
diff --git a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy 
b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
index 4f28d32697..6eb99a87e6 100644
--- a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
+++ b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
@@ -72,7 +72,11 @@ class SqlTest extends GroovyTestCase {
         /*
         commented out as already on classpath
 // tag::sql_connecting_grab[]
+<<<<<<< HEAD
         @Grab('org.hsqldb:hsqldb:2.7.2:jdk8')
+=======
+        @Grab('org.hsqldb:hsqldb:2.7.3')
+>>>>>>> 35be169b6c (GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency))
         @GrabConfig(systemClassLoader=true)
         // create, use, and then close sql instance ...
 // end::sql_connecting_grab[]
@@ -335,7 +339,7 @@ class SqlTest extends GroovyTestCase {
               // tag::sql_basic_table_metadata[]
               def md = sql.connection.metaData
               assert md.driverName == 'HSQL Database Engine Driver'
-              assert md.databaseProductVersion == '2.7.2'
+              assert md.databaseProductVersion == '2.7.3'
               assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it] 
} == [4, 2]
               assert md.stringFunctions.tokenize(',').contains('CONCAT')
               def rs = md.getTables(null, null, 'AUTH%', null)