This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch singleGroovy in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 18c7d18d22523687b11f3e88d65602e665ae1202 Author: James Daugherty <[email protected]> AuthorDate: Thu May 22 14:35:26 2025 -0400 unified groovy version --- dependencies.gradle | 2 +- gradle/docs-config.gradle | 11 ----------- gradle/docs-dependencies.gradle | 11 ++--------- grails-gradle/gradle/docs-config.gradle | 8 -------- grails-shell-cli/build.gradle | 18 +++++------------- grails-spring/build.gradle | 2 +- 6 files changed, 9 insertions(+), 43 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index fe9cbda489..1175340681 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -132,7 +132,7 @@ ext { 'bootstrap.version' : '5.3.3', 'commons-codec.version' : '1.17.1', 'geb-spock.version' : '7.0', - 'groovy.version' : '4.0.26', + 'groovy.version': '4.0.27-SNAPSHOT', 'h2.version' : '2.3.232', 'jackson.version' : '2.18.2', 'jquery.version' : '3.7.1', diff --git a/gradle/docs-config.gradle b/gradle/docs-config.gradle index 54d72ea135..5b5c7d1794 100644 --- a/gradle/docs-config.gradle +++ b/gradle/docs-config.gradle @@ -21,15 +21,4 @@ apply from: rootProject.layout.projectDirectory.file('gradle/docs-dependencies.g ext { includeInApiDocs = true -} - -tasks.named('groovydoc', Groovydoc).configure { Groovydoc it -> - // TODO: Fix this for testFixtures - it.classpath = configurations.documentation - it.groovyClasspath = configurations.documentation - it.access = GroovydocAccess.PROTECTED - it.includeAuthor = false - it.includeMainForScripts = false - it.processScripts = false - it.noTimestamp = true } \ No newline at end of file diff --git a/gradle/docs-dependencies.gradle b/gradle/docs-dependencies.gradle index bc18092644..73f5494e17 100644 --- a/gradle/docs-dependencies.gradle +++ b/gradle/docs-dependencies.gradle @@ -31,20 +31,12 @@ dependencies { add('documentation', 'org.fusesource.jansi:jansi') add('documentation', 'jline:jline') add('documentation', 'com.github.javaparser:javaparser-core') - - /* - Temporarily use 4.0.27-SNAPSHOT for documentation generation until 4.0.27 is released. + // not every project includes groovy, so include it in the documentation config so it can be found add('documentation', 'org.apache.groovy:groovy') add('documentation', 'org.apache.groovy:groovy-groovydoc') add('documentation', 'org.apache.groovy:groovy-ant') add('documentation', 'org.apache.groovy:groovy-docgenerator') add('documentation', 'org.apache.groovy:groovy-templates') -*/ - add('documentation', 'org.apache.groovy:groovy:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-groovydoc:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-ant:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-docgenerator:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-templates:4.0.27-SNAPSHOT') } String resolveProjectVersion(String artifact) { @@ -68,6 +60,7 @@ tasks.withType(Groovydoc).configureEach { Groovydoc gdoc -> gdoc.includeAuthor = true gdoc.includeMainForScripts = false gdoc.processScripts = false + gdoc.noTimestamp = true doFirst { def gebVersion = resolveProjectVersion('geb-spock') diff --git a/grails-gradle/gradle/docs-config.gradle b/grails-gradle/gradle/docs-config.gradle index 3a6bc80bc0..ba817669f8 100644 --- a/grails-gradle/gradle/docs-config.gradle +++ b/grails-gradle/gradle/docs-config.gradle @@ -31,19 +31,11 @@ dependencies { add('documentation', 'org.fusesource.jansi:jansi') add('documentation', 'jline:jline') add('documentation', 'com.github.javaparser:javaparser-core') -/* - Temporarily use 4.0.27-SNAPSHOT for documentation generation until 4.0.27 is released. add('documentation', "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}") add('documentation', "org.apache.groovy:groovy-groovydoc:${bomDependencyVersions['groovy.version']}") add('documentation', "org.apache.groovy:groovy-ant:${bomDependencyVersions['groovy.version']}") add('documentation', "org.apache.groovy:groovy-docgenerator:${bomDependencyVersions['groovy.version']}") add('documentation', "org.apache.groovy:groovy-templates:${bomDependencyVersions['groovy.version']}") -*/ - add('documentation', 'org.apache.groovy:groovy:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-groovydoc:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-ant:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-docgenerator:4.0.27-SNAPSHOT') - add('documentation', 'org.apache.groovy:groovy-templates:4.0.27-SNAPSHOT') } ext { diff --git a/grails-shell-cli/build.gradle b/grails-shell-cli/build.gradle index 22c7159724..d0bf08f576 100644 --- a/grails-shell-cli/build.gradle +++ b/grails-shell-cli/build.gradle @@ -35,19 +35,11 @@ dependencies { implementation platform(project(':grails-bom')) - // compile grails-shell-cli with the Groovy version provided by Gradle - // to ensure build compatibility with Gradle, currently Groovy 3.0.x - // when used by grails-gradle-plugin - // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy - compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version" - compileOnly "org.codehaus.groovy:groovy-templates:$GroovySystem.version" - compileOnly "org.codehaus.groovy:groovy-xml:$GroovySystem.version" - compileOnly "org.codehaus.groovy:groovy-ant:$GroovySystem.version" - compileOnly "org.codehaus.groovy:groovy-json:$GroovySystem.version" - - runtimeOnly 'org.apache.groovy:groovy-ant' - runtimeOnly 'org.apache.groovy:groovy-json' - runtimeOnly 'org.apache.groovy:groovy-xml' + implementation 'org.apache.groovy:groovy' + implementation 'org.apache.groovy:groovy-templates' + implementation 'org.apache.groovy:groovy-xml' + implementation 'org.apache.groovy:groovy-ant' + implementation 'org.apache.groovy:groovy-json' api project(':grails-bootstrap') api 'org.apache.grails.gradle:grails-gradle-model' diff --git a/grails-spring/build.gradle b/grails-spring/build.gradle index 91b1a53d40..da9ddbfcf0 100644 --- a/grails-spring/build.gradle +++ b/grails-spring/build.gradle @@ -35,7 +35,7 @@ dependencies { api 'org.springframework:spring-context' api project(':grails-bootstrap') api 'org.apache.groovy:groovy' - api ( 'org.apache.groovy:groovy-xml' ) + api 'org.apache.groovy:groovy-xml' testImplementation 'org.apache.groovy:groovy-test-junit5' testImplementation 'org.junit.jupiter:junit-jupiter-api'
