You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/12/23 02:10:43 UTC
[groovy] branch master updated (75d8945 -> 0cf158c)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 75d8945 too soon
new cfc5686 GROOVY-10432: Bump hsqldb to 2.6.1
new 20ffb9b GROOVY-10430: Bump gradle to 7.3.3 (build dependency)
new 0cf158c GROOVY-10431: Bump logback to 1.2.9 (test dependency)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gradle.properties | 2 +-
gradle/verification-metadata.xml | 5 +++--
gradle/wrapper/gradle-wrapper.properties | 2 +-
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
versions.properties | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
[groovy] 03/03: GROOVY-10431: Bump logback to 1.2.9 (test dependency)
Posted by pa...@apache.org.
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 0cf158c6e631af44e14d48e3af21f41105158354
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Dec 23 12:10:29 2021 +1000
GROOVY-10431: Bump logback to 1.2.9 (test dependency)
---
versions.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/versions.properties b/versions.properties
index 224a4f2..ff3652d 100644
--- a/versions.properties
+++ b/versions.properties
@@ -35,7 +35,7 @@ jline=2.14.6
jmh=1.27
jmock=1.2.0
jruby=9.2.17.0
-logback=1.2.8
+logback=1.2.9
junit=4.13.2
log4j=1.2.17
log4j2=2.17.0
[groovy] 02/03: GROOVY-10430: Bump gradle to 7.3.3 (build dependency)
Posted by pa...@apache.org.
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 20ffb9bbe07a9c7ca344f787b6e365826da9e254
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Dec 23 12:09:44 2021 +1000
GROOVY-10430: Bump gradle to 7.3.3 (build dependency)
---
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 74a0ee6..6530687 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=1.8
targetJavaVersion=8
binaryCompatibilityBaseline=3.0.9
-gradle_version=7.3.2
+gradle_version=7.3.3
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2880ba..2e6e589 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
[groovy] 01/03: GROOVY-10432: Bump hsqldb to 2.6.1
Posted by pa...@apache.org.
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)