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 2022/11/14 14:15:29 UTC
[groovy] branch master updated (7e01ecee58 -> 2f7a448374)
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 7e01ecee58 GROOVY-10829: Bump htmlunit to 2.66.0 (test dependency)
new 773b9d49b4 GROOVY-10830: Bump jackson-databind to 2.14.0
new 34a84781b3 GROOVY-10831: Bump hsqldb to 2.7.1 (test dependency)
new 29e5678733 GROOVY-10833: Bump gson (test dependency) to 2.10
new 2f7a448374 GROOVY-10832: Bump json-unit (test dependency) to 2.36.0
The 4 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/verification-metadata.xml | 14 ++++++++++++--
src/test/groovy/bugs/Groovy10461.groovy | 2 +-
subprojects/groovy-json/build.gradle | 4 ++--
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
versions.properties | 4 ++--
6 files changed, 20 insertions(+), 10 deletions(-)
[groovy] 02/04: GROOVY-10831: Bump hsqldb to 2.7.1 (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 34a84781b3f21dba957ba58559520841a7d83daa
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Nov 15 00:04:28 2022 +1000
GROOVY-10831: Bump hsqldb to 2.7.1 (test dependency)
---
gradle/verification-metadata.xml | 7 ++++++-
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9349856af8..e2161a8642 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -171,7 +171,7 @@
<trusted-key id="cfc10b69382cbcf5387e51484ece492b63e38acf" group="com.h3xstream.findsecbugs"/>
<trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr" name="ST4" version="4.3"/>
<trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62" group="org.apache.commons" name="commons-parent"/>
- <trusted-key id="d76260c72df74e66268f7770ab049df4ab24c1ef" group="org.hsqldb" name="hsqldb" version="2.6.1"/>
+ <trusted-key id="d76260c72df74e66268f7770ab049df4ab24c1ef" group="org.hsqldb" name="hsqldb" version="2.7.1"/>
<trusted-key id="d790f72ea8fd39551012b62dcf9f3090ce4cb752" group="org.abego.treelayout" name="org.abego.treelayout.core"/>
<trusted-key id="dc98224c6421a7a5bb87f346ed2378cd09a08cde" group="org.fusesource.jansi" name="jansi" version="2.4.0"/>
<trusted-key id="e3a9f95079e84ce201f7cf60bede11eaf1164480" group="org.hamcrest"/>
@@ -654,6 +654,11 @@
<sha512 value="1378fc44bd73525218e4e435b638d77de1c41185c1813220a024a564d63a1bdcb9fb20fb460937cd7e26b302d5ed0024835c8337b807f1e2f8c4cd63a16db794" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
+ <component group="org.hsqldb" name="hsqldb" version="2.7.1">
+ <artifact name="hsqldb-2.7.1.jar">
+ <pgp value="d76260c72df74e66268f7770ab049df4ab24c1ef"/>
+ </artifact>
+ </component>
<component group="org.jboss" name="jboss-parent" version="23">
<artifact name="jboss-parent-23.pom">
<sha512 value="b7995e364497bc026efe1ab2a0144ea7905f63acb04f9501842c8172f522e646c6c30c73ff53e45eab52490a6b1bf9b5a9d75a53b8dbb70ca212dd5aad277fbb" origin="Generated by Gradle because artifact wasn't signed"/>
diff --git a/subprojects/groovy-sql/build.gradle b/subprojects/groovy-sql/build.gradle
index 1bd3e90e47..7de62daa78 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.6.1', classifier: 'jdk8'
+ testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.1'
// 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 16c3ee8e77..601a05ea31 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.6.1:jdk8')
+ @Grab('org.hsqldb:hsqldb:2.7.1')
@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.6.1'
+ assert md.databaseProductVersion == '2.7.1'
assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it] } == [4, 2]
assert md.stringFunctions.tokenize(',').contains('CONCAT')
def rs = md.getTables(null, null, 'AUTH%', null)
[groovy] 01/04: GROOVY-10830: Bump jackson-databind to 2.14.0
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 773b9d49b4b2383fa531ab5f406e656d46dfd329
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Nov 14 23:56:57 2022 +1000
GROOVY-10830: Bump jackson-databind to 2.14.0
---
gradle/verification-metadata.xml | 7 ++++++-
src/test/groovy/bugs/Groovy10461.groovy | 2 +-
versions.properties | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7f80d77cfb..9349856af8 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -66,7 +66,7 @@
<trusting group="commons-collections" name="commons-collections" version="3.2.2"/>
<trusting group="commons-logging" name="commons-logging" version="1.2"/>
</trusted-key>
- <trusted-key id="120d6f34e627ed3a772ebbfe55c7e5e701832382" group="org.yaml" name="snakeyaml" version="1.31"/>
+ <trusted-key id="120d6f34e627ed3a772ebbfe55c7e5e701832382" group="org.yaml" name="snakeyaml" version="1.33"/>
<trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b" group="org.apache.commons" name="commons-math3" version="3.2"/>
<trusted-key id="190d5a957ff22273e601f7a7c92c5fec70161c62">
<trusting group="org.codehaus.plexus"/>
@@ -762,6 +762,11 @@
<pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
</artifact>
</component>
+ <component group="org.yaml" name="snakeyaml" version="1.33">
+ <artifact name="snakeyaml-1.33.jar">
+ <pgp value="120d6f34e627ed3a772ebbfe55c7e5e701832382"/>
+ </artifact>
+ </component>
<component group="org.ysb33r.gradle" name="grolifant" version="0.16.1">
<artifact name="grolifant-0.16.1.jar">
<ignored-keys>
diff --git a/src/test/groovy/bugs/Groovy10461.groovy b/src/test/groovy/bugs/Groovy10461.groovy
index 19e43e14d8..087a957124 100644
--- a/src/test/groovy/bugs/Groovy10461.groovy
+++ b/src/test/groovy/bugs/Groovy10461.groovy
@@ -30,7 +30,7 @@ final class Groovy10461 {
@GrabExclude('org.codehaus.groovy:groovy-xml')
@GrabExclude('org.codehaus.groovy:groovy-json')
- @Grab('com.fasterxml.jackson.core:jackson-databind:2.13.4.2')
+ @Grab('com.fasterxml.jackson.core:jackson-databind:2.14.0')
import com.fasterxml.jackson.databind.ObjectMapper
@Grab('io.rest-assured:rest-assured:4.4.0')
diff --git a/versions.properties b/versions.properties
index f471d9ef7b..d61be74fff 100644
--- a/versions.properties
+++ b/versions.properties
@@ -28,8 +28,8 @@ commonsMath3=3.6.1
gpars=1.2.1
ivy=2.5.1
jansi=2.4.0
-jacksonDatabind=2.13.4.2
-jackson=2.13.4
+jacksonDatabind=2.14.0
+jackson=2.14.0
jarjar=1.8.1
javaParser=3.24.7
jline=2.14.6
[groovy] 04/04: GROOVY-10832: Bump json-unit (test dependency) to 2.36.0
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 2f7a448374ae211cdd0230fbffa9efacd3afddd1
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Nov 15 00:14:01 2022 +1000
GROOVY-10832: Bump json-unit (test dependency) to 2.36.0
---
subprojects/groovy-json/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
index b48984b1ef..d05beb9dde 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -25,7 +25,7 @@ dependencies {
testImplementation projects.groovyTest
testImplementation projects.groovyDateutil
- testImplementation 'net.javacrumbs.json-unit:json-unit:2.35.0'
+ testImplementation 'net.javacrumbs.json-unit:json-unit:2.36.0'
testRuntimeOnly project(':'), {
because "Tests are using Grapes"
[groovy] 03/04: GROOVY-10833: Bump gson (test dependency) to 2.10
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 29e56787337d8175f328e195668106b21c4cf4e6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Nov 15 00:13:30 2022 +1000
GROOVY-10833: Bump gson (test dependency) to 2.10
---
subprojects/groovy-json/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
index 2683a5580d..b48984b1ef 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -34,7 +34,7 @@ dependencies {
}
}
testRuntimeOnly projects.groovyAnt // for JavadocAssertionTests
- testRuntimeOnly 'com.google.code.gson:gson:2.9.1' // json-unit requires gson, jackson1 or jackson2
+ testRuntimeOnly 'com.google.code.gson:gson:2.10' // json-unit requires gson, jackson1 or jackson2
}
plugins.withId('eclipse') {