[groovy] 01/03: GROOVY-10432: Bump hsqldb to 2.6.1

[paulk]

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

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

commit cfc5686106894d9b6a2c31c7a3c2d023309a467a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Dec 23 12:04:30 2021 +1000

    GROOVY-10432: Bump hsqldb to 2.6.1
---
 gradle/verification-metadata.xml                    | 5 +++--
 subprojects/groovy-sql/build.gradle                 | 2 +-
 subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index becc89f..9d18aba 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1067,8 +1067,8 @@
             <pgp value="4db1a49729b053caf015cee9a6adfc93ef34893e"/>
          </artifact>
       </component>
-      <component group="org.hsqldb" name="hsqldb" version="2.5.1">
-         <artifact name="hsqldb-2.5.1.jar">
+      <component group="org.hsqldb" name="hsqldb" version="2.6.1">
+         <artifact name="hsqldb-2.6.1-jdk8.jar">
             <pgp value="d76260c72df74e66268f7770ab049df4ab24c1ef"/>
          </artifact>
       </component>
@@ -1195,6 +1195,7 @@
       </component>
       <component group="org.spockframework" name="spock-core" 
version="2.0-groovy-3.0">
          <artifact name="spock-core-2.0-groovy-3.0.jar">
+            <pgp value="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1"/>
             <sha512 
value="f04664ae75de37db38b6ad4aa997e7b99f184d1282e6dcb5202ede90b5ad8e5f99172eb224713049123495b4d63954acb7d3ec895414e11a80049067ba7346e4"
 origin="Generated by Gradle because a key couldn't be downloaded"/>
          </artifact>
       </component>
diff --git a/subprojects/groovy-sql/build.gradle 
b/subprojects/groovy-sql/build.gradle
index b678c9f..1007669 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.5.1'
+    testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.6.1', 
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 7dc94de..16c3ee8 100644
--- a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
+++ b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
@@ -72,7 +72,7 @@ class SqlTest extends GroovyTestCase {
         /*
         commented out as already on classpath
 // tag::sql_connecting_grab[]
-        @Grab('org.hsqldb:hsqldb:2.5.1')
+        @Grab('org.hsqldb:hsqldb:2.6.1:jdk8')
         @GrabConfig(systemClassLoader=true)
         // create, use, and then close sql instance ...
 // end::sql_connecting_grab[]
@@ -335,7 +335,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.5.1'
+              assert md.databaseProductVersion == '2.6.1'
               assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it] 
} == [4, 2]
               assert md.stringFunctions.tokenize(',').contains('CONCAT')
               def rs = md.getTables(null, null, 'AUTH%', null)