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 2023/08/07 01:24:07 UTC
[groovy] branch GROOVY_4_0_X updated (c519625273 -> 8ac6354bb9)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
from c519625273 deprecate some classes/methods/fields removed for Groovy 5 (might need further assessment)
new b5a8e3498b GROOVY-11148: Bump JUnit Jupiter/JUnit Platform to 5.10.0/1.10.0
new d0c8e7a368 GROOVY-11149: Bump logback-classic to 1.3.9 (test dependency)
new eb60151d26 minor refactor
new 8ac6354bb9 minor refactor
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:
.../groovy/gradle/PerformanceTestsExtension.groovy | 55 ++++++++++++----------
versions.properties | 6 +--
2 files changed, 32 insertions(+), 29 deletions(-)
[groovy] 02/04: GROOVY-11149: Bump logback-classic to 1.3.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 GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit d0c8e7a368211b5228fbdfed5f82b9f0ae581410
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 7 10:18:15 2023 +1000
GROOVY-11149: Bump logback-classic to 1.3.9 (test dependency)
---
versions.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/versions.properties b/versions.properties
index 2f5708ccd3..e93d56f8d1 100644
--- a/versions.properties
+++ b/versions.properties
@@ -37,7 +37,7 @@ jline=2.14.6
jmh=1.35
jmock=1.2.0
jruby=9.2.17.0
-logback=1.3.8
+logback=1.3.9
junit=4.13.2
log4j=1.2.17
log4j2=2.20.0
[groovy] 03/04: minor refactor
Posted by pa...@apache.org.
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 eb60151d26ab43bd75e3bd0a6940a461d12dec47
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 7 11:18:09 2023 +1000
minor refactor
---
.../groovy/gradle/PerformanceTestsExtension.groovy | 51 +++++++++++-----------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 4cf8f15074..91be471946 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -73,41 +73,40 @@ class PerformanceTestsExtension {
void version(String v) {
def version = v.replace('.', '_')
- def groovyConf = configurations.create("perfGroovy$version") { Configuration it ->
- it.canBeResolved = true
- it.canBeConsumed = false
- it.resolutionStrategy {
+ def groovyConf = configurations.create("perfGroovy$version") { Configuration conf ->
+ conf.canBeResolved = true
+ conf.canBeConsumed = false
+ conf.resolutionStrategy {
disableDependencyVerification()
}
- it.extendsFrom(configurations.getByName("stats"))
- it.attributes {
+ conf.extendsFrom(configurations.getByName("stats"))
+ conf.attributes {
it.attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
it.attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
it.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
it.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
}
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':']) : (v.startsWith('4') ? "org.apache.groovy:groovy:$v" : "org.codehaus.groovy:groovy:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':']) : (v.startsWith('4') ? "org.apache.groovy:groovy:$v" : "org.codehaus.groovy:groovy:$v")))
if (!v.startsWith('2.4')) {
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-dateutil']) : (v.startsWith('4') ? "org.apache.groovy:groovy-dateutil:$v" : "org.codehaus.groovy:groovy-dateutil:$v")))
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-datetime']) : (v.startsWith('4') ? "org.apache.groovy:groovy-datetime:$v" : "org.codehaus.groovy:groovy-datetime:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-dateutil']) : (v.startsWith('4') ? "org.apache.groovy:groovy-dateutil:$v" : "org.codehaus.groovy:groovy-dateutil:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-datetime']) : (v.startsWith('4') ? "org.apache.groovy:groovy-datetime:$v" : "org.codehaus.groovy:groovy-datetime:$v")))
}
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-swing']) : (v.startsWith('4') ? "org.apache.groovy:groovy-swing:$v" : "org.codehaus.groovy:groovy-swing:$v")))
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-sql']) : (v.startsWith('4') ? "org.apache.groovy:groovy-sql:$v" : "org.codehaus.groovy:groovy-sql:$v")))
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-xml']) : (v.startsWith('4') ? "org.apache.groovy:groovy-xml:$v" : "org.codehaus.groovy:groovy-xml:$v")))
- it.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-templates']) : (v.startsWith('4') ? "org.apache.groovy:groovy-templates:$v" : "org.codehaus.groovy:groovy-templates:$v")))
- it.dependencies.add(dependencies.create('org.cyberneko:html:1.9.8'))
- it.dependencies.add(dependencies.create('commons-net:commons-net:3.9.0'))
- it.dependencies.add(dependencies.create('net.sourceforge.htmlunit:htmlunit:2.70.0'))
- it.dependencies.add(dependencies.create('com.sleepycat:je:18.3.12'))
- it.dependencies.add(dependencies.create('commons-httpclient:commons-httpclient:3.1'))
- it.dependencies.add(dependencies.create('net.sf.jopt-simple:jopt-simple:5.0.4'))
- it.dependencies.add(dependencies.create('com.baulsupp.kolja:jcurses:0.9.5.3'))
- it.dependencies.add(dependencies.create('org.mnode.mstor:mstor:1.0.3'))
- it.dependencies.add(dependencies.create('commons-lang:commons-lang:2.6'))
- it.dependencies.add(dependencies.create('dnsjava:dnsjava:3.5.2'))
- it.dependencies.add(dependencies.create('net.sourceforge.expectj:expectj:2.0.7'))
- it.dependencies.add(dependencies.create('jline:jline:2.14.6'))
- it.dependencies.add(dependencies.create('prevayler:prevayler:2.02.005'))
+ [
+ 'org.cyberneko:html:1.9.8',
+ 'commons-net:commons-net:3.9.0',
+ 'net.sourceforge.htmlunit:htmlunit:2.70.0',
+ 'com.sleepycat:je:18.3.12',
+ 'commons-httpclient:commons-httpclient:3.1',
+ 'net.sf.jopt-simple:jopt-simple:5.0.4',
+ 'com.baulsupp.kolja:jcurses:0.9.5.3',
+ 'org.mnode.mstor:mstor:1.0.3',
+ 'commons-lang:commons-lang:2.6',
+ 'dnsjava:dnsjava:3.5.2',
+ 'net.sourceforge.expectj:expectj:2.0.7',
+ 'jline:jline:2.14.6',
+ 'prevayler:prevayler:2.02.005',
+ 'xerces:xercesImpl:2.12.2'
+ ].each {conf.dependencies.add(dependencies.create(it)) }
}
def outputFile = layout.buildDirectory.file("compilation-stats-${version}.csv")
def perfTest = tasks.register("performanceTestGroovy${version}", JavaExec) {
[groovy] 04/04: minor refactor
Posted by pa...@apache.org.
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 8ac6354bb9dd9c4a4981b86d79902b09fd4951a5
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 7 11:20:39 2023 +1000
minor refactor
---
.../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 91be471946..91d792a2e1 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -91,6 +91,10 @@ class PerformanceTestsExtension {
conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-dateutil']) : (v.startsWith('4') ? "org.apache.groovy:groovy-dateutil:$v" : "org.codehaus.groovy:groovy-dateutil:$v")))
conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-datetime']) : (v.startsWith('4') ? "org.apache.groovy:groovy-datetime:$v" : "org.codehaus.groovy:groovy-datetime:$v")))
}
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-swing']) : (v.startsWith('4') ? "org.apache.groovy:groovy-swing:$v" : "org.codehaus.groovy:groovy-swing:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-sql']) : (v.startsWith('4') ? "org.apache.groovy:groovy-sql:$v" : "org.codehaus.groovy:groovy-sql:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-xml']) : (v.startsWith('4') ? "org.apache.groovy:groovy-xml:$v" : "org.codehaus.groovy:groovy-xml:$v")))
+ conf.dependencies.add(dependencies.create(v == 'current' ? dependencies.project([path: ':groovy-templates']) : (v.startsWith('4') ? "org.apache.groovy:groovy-templates:$v" : "org.codehaus.groovy:groovy-templates:$v")))
[
'org.cyberneko:html:1.9.8',
'commons-net:commons-net:3.9.0',
[groovy] 01/04: GROOVY-11148: Bump JUnit Jupiter/JUnit Platform to 5.10.0/1.10.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_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b5a8e3498bb40963677199efb9e07b98733e6fe0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Aug 6 13:21:26 2023 +1000
GROOVY-11148: Bump JUnit Jupiter/JUnit Platform to 5.10.0/1.10.0
---
versions.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/versions.properties b/versions.properties
index 87fd251806..2f5708ccd3 100644
--- a/versions.properties
+++ b/versions.properties
@@ -51,8 +51,8 @@ spock=2.3-groovy-4.0
spotbugs=4.7.3
spotbugsAnnotations=4.7.3
checkstyle=9.3
-junit5=5.9.3
-junit5Platform=1.9.3
+junit5=5.10.0
+junit5Platform=1.10.0
jcipAnnotations=1.0
treelayout=1.0.3
javaxServletApi=4.0.1