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/02/24 05:37:29 UTC
[groovy] branch GROOVY_3_0_X updated (bbf456e -> 9225f6e)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from bbf456e GROOVY-10493: Bump slf4j to 1.7.36 (test dependency)
new 42c88c3 GROOVY-10441: Bump testng to 7.5 (test dependency)
new a16581e GROOVY-10313: Bump jansi to 2.4.0
new 6cdf7de GROOVY-10507: Bump Spock to 2.1-groovy-3.0 (test dependency)
new c3cc3f7 GROOVY-10334: Bump Ant version to 1.10.12
new 109b3ed GROOVY-10432: Bump hsqldb to 2.6.1 (test dependency)
new 9225f6e ignore non-stable versions when using dependencyUpdates
The 6 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:
build.gradle | 15 ++++++++++++---
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
subprojects/groovy-testng/build.gradle | 3 ++-
4 files changed, 17 insertions(+), 7 deletions(-)
[groovy] 04/06: GROOVY-10334: Bump Ant version to 1.10.12
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c3cc3f71c332f273fba7df3a14d6b55a70fc6dc8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:15:16 2022 +1000
GROOVY-10334: Bump Ant version to 1.10.12
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index d6fb254..bab69c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ configurations {
}
ext {
- antVersion = '1.10.11'
+ antVersion = '1.10.12'
asmVersion = '9.2'
antlrVersion = '2.7.7'
antlr4Version = '4.9.0'
[groovy] 05/06: GROOVY-10432: Bump hsqldb to 2.6.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 GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 109b3eda909deed967d55d1057ad0da7b51583eb
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:19:45 2022 +1000
GROOVY-10432: Bump hsqldb to 2.6.1 (test dependency)
---
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-sql/build.gradle b/subprojects/groovy-sql/build.gradle
index a17563e..91bce19 100644
--- a/subprojects/groovy-sql/build.gradle
+++ b/subprojects/groovy-sql/build.gradle
@@ -18,7 +18,7 @@
*/
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 5dff0c5..8b1425b 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)
[groovy] 02/06: GROOVY-10313: Bump jansi to 2.4.0
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a16581e5897b32626a6948e15da5e233832a81cc
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:10:08 2022 +1000
GROOVY-10313: Bump jansi to 2.4.0
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 83a6864..e897db3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,7 +136,7 @@ ext {
commonsCliVersion = '1.4'
gparsVersion = '1.2.1'
ivyVersion = '2.5.0'
- jansiVersion = '2.1.1'
+ jansiVersion = '2.4.0'
jarjarVersion = '1.8.1'
javaParserVersion = '3.24.0'
jlineVersion = '2.14.6'
[groovy] 06/06: ignore non-stable versions when using dependencyUpdates
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9225f6e3d7a26ff28cf4a116c445763bd39013cf
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:37:22 2022 +1000
ignore non-stable versions when using dependencyUpdates
---
build.gradle | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/build.gradle b/build.gradle
index bab69c7..8a11181 100644
--- a/build.gradle
+++ b/build.gradle
@@ -481,3 +481,12 @@ project.afterEvaluate {
handler.each { checkRepo(it) }
}
}
+
+def UNSTABLE = /^([\d.-]+(alpha|beta|rc|ea|b|m)[\d.-]+(groovy[\d.-]+)?|2.4.0-b[\d.]+|200\d{5}(\.\d{6})?)$/
+// ignore non-stable releases
+tasks.named("dependencyUpdates")?.configure {
+ gradleReleaseChannel = 'current'
+ rejectVersionIf {
+ !(it.currentVersion.toLowerCase() ==~ UNSTABLE) && it.candidate.version.toLowerCase() ==~ UNSTABLE
+ }
+}
[groovy] 01/06: GROOVY-10441: Bump testng to 7.5 (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 GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 42c88c3b843327c21c288d31821b333651297a12
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:04:18 2022 +1000
GROOVY-10441: Bump testng to 7.5 (test dependency)
---
subprojects/groovy-testng/build.gradle | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-testng/build.gradle b/subprojects/groovy-testng/build.gradle
index 18c529e..3e5545e 100644
--- a/subprojects/groovy-testng/build.gradle
+++ b/subprojects/groovy-testng/build.gradle
@@ -18,8 +18,9 @@
*/
dependencies {
api rootProject // TestNgRunner implements GroovyRunner...
- runtime('org.testng:testng:7.4.0') {
+ runtime('org.testng:testng:7.5') {
exclude(group: 'com.google.inject', module: 'guice')
+ exclude(group: 'com.google.code.findbugs', module: 'jsr305')
exclude(group: 'junit', module: 'junit')
exclude(group: 'org.apache.ant', module: 'ant')
exclude(group: 'org.yaml', module: 'snakeyaml')
[groovy] 03/06: GROOVY-10507: Bump Spock to 2.1-groovy-3.0 (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 GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6cdf7de490ac93ae7c04b90794aaf4da01e79251
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Feb 24 15:11:28 2022 +1000
GROOVY-10507: Bump Spock to 2.1-groovy-3.0 (test dependency)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index e897db3..d6fb254 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,7 +150,7 @@ ext {
slf4jVersion = '1.7.36'
xmlunitVersion = '1.6'
xstreamVersion = '1.4.19'
- spockVersion = '2.0-groovy-3.0'
+ spockVersion = '2.1-groovy-3.0'
spotbugsVersion = '4.4.0'
spotbugsAnnotationsVersion = '4.4.0'
checkstyleVersion = '8.44'