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
The following commit(s) were added to refs/heads/master by this push:
new e1c008e08a support also providing 5.0.x versions
e1c008e08a is described below
commit e1c008e08a4f3dcc1d49ad464d42a1173b61b66e
Author: Paul King <[email protected]>
AuthorDate: Wed Sep 11 12:58:38 2024 +1000
support also providing 5.0.x versions
---
.../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 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 909915c6ff..055a9085b1 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
@@ -86,9 +86,9 @@ class PerformanceTestsExtension {
it.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
objects.named(LibraryElements, LibraryElements.JAR))
it.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage,
Usage.JAVA_RUNTIME))
}
- conf.dependencies.add(dependencies.create(v.startsWith('current')
? dependencies.project([path: ':']) : "org.apache.groovy:groovy:$v"))
+ conf.dependencies.add(dependencies.create(v.startsWith('current')
? dependencies.project([path: ':']) : v.startsWith('3') ?
"org.codehaus.groovy:groovy:$v" : "org.apache.groovy:groovy:$v"))
['groovy-dateutil', 'groovy-datetime', 'groovy-ant',
'groovy-swing', 'groovy-sql', 'groovy-xml', 'groovy-templates'].each { m ->
-
conf.dependencies.add(dependencies.create(v.startsWith('current') ?
dependencies.project([path: ":$m"]) : "org.apache.groovy:$m:$v"))
+
conf.dependencies.add(dependencies.create(v.startsWith('current') ?
dependencies.project([path: ":$m"]) : v.startsWith('3') ?
"org.codehaus.groovy:$m:$v" : "org.apache.groovy:$m:$v"))
}
[
'org.cyberneko:html:1.9.8',
