You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2026/06/02 11:03:42 UTC
(grails-core) 01/04: Remove changes unrelated to Groovy 5
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch grails8-groovy5-sb4
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit b61bd6a9edb5f09f672005473d4c890f8e70aa73
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Mon Jun 1 22:29:55 2026 -0400
Remove changes unrelated to Groovy 5
Further stripping non-Groovy-5 changes so the PR is scoped to Groovy 5 only:
- settings.gradle and grails-forge/settings.gradle: removed redundant
dependencyResolutionManagement blocks. The base already applies
GrailsRepoSettingsPlugin (id 'org.apache.grails.buildsrc.repo'), which
declares FAIL_ON_PROJECT_REPOS and the org.apache.groovy.*-SNAPSHOT repo;
./gradlew help confirms Groovy 5 still resolves without these blocks.
- grails-forge ScaffoldingSpec: reverted - it was a Spring Boot 4 output
forwarding test tweak (per its own comment), not Groovy 5.
- .gitignore: removed a stray .sisyphus/ entry (tooling).
- async PromiseSpec/GparsPromiseSpec/RxJavaPromiseSpec: reverted
whitespace-only changes.
- GrailsConsoleSpec: reverted a single-line @IgnoreIf reformatting.
Assisted-by: claude-code:claude-4.8-opus
---
.gitignore | 2 -
.../test/groovy/grails/async/PromiseSpec.groovy | 2 +-
.../groovy/grails/async/GparsPromiseSpec.groovy | 2 +-
.../async/factory/rxjava/RxJavaPromiseSpec.groovy | 1 -
.../grails/build/logging/GrailsConsoleSpec.groovy | 4 +-
grails-forge/settings.gradle | 41 ---------------------
.../features/scaffolding/ScaffoldingSpec.groovy | 13 +++----
settings.gradle | 43 ----------------------
8 files changed, 9 insertions(+), 99 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4e063ed278..ca770d0c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,5 +63,3 @@ tmp/
!etc/bin
etc/bin/results
.vscode/
-
-.sisyphus/
diff --git a/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy b/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy
index 665b1d016f..4426722aea 100644
--- a/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy
+++ b/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy
@@ -42,7 +42,7 @@ class PromiseSpec extends Specification {
result == '*10*'
}
-
+
void 'Test promise timeout handling'() {
when: 'a promise that takes a while is created'
diff --git a/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy b/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy
index 9780ca6308..7462d5c5ce 100644
--- a/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy
+++ b/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy
@@ -47,7 +47,7 @@ class GparsPromiseSpec extends Specification {
then: 'the result is decorated'
result == '*10*'
}
-
+
void 'Test promise timeout handling'() {
when: 'a promise that takes longer than the timeout'
diff --git a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy
index 828bc1f660..7108caafa8 100644
--- a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy
+++ b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy
@@ -47,7 +47,6 @@ class RxJavaPromiseSpec extends Specification {
result == '*10*'
}
-
void 'Test promise timeout handling'() {
when: 'a promise that takes a while is created'
diff --git a/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy b/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy
index 25681aa5a9..4f99dd9650 100644
--- a/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy
+++ b/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy
@@ -43,9 +43,7 @@ import java.util.regex.Pattern
* @author Tom Bujok
* @since 2.3
*/
-@IgnoreIf({
- !GrailsConsole.instance.isAnsiEnabled()
-})
+@IgnoreIf({ !GrailsConsole.instance.isAnsiEnabled() })
class GrailsConsoleSpec extends Specification {
static final String RESET = Pattern.quote(Ansi.ansi().reset().toString())
diff --git a/grails-forge/settings.gradle b/grails-forge/settings.gradle
index 5f040f0bbc..3c3a65805d 100644
--- a/grails-forge/settings.gradle
+++ b/grails-forge/settings.gradle
@@ -78,44 +78,3 @@ includeBuild('..') {
includeBuild('../grails-gradle') {
name = 'grails-gradle'
}
-
-dependencyResolutionManagement {
- repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
- repositories {
- // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
- mavenCentral()
- maven { url = 'https://repo.grails.org/grails/restricted' }
- maven {
- url = 'https://repository.apache.org/content/groups/snapshots'
- content {
- includeVersionByRegex('org[.]apache[.]grails.*', '.*', '.*-SNAPSHOT')
- includeVersionByRegex('org[.]apache[.]groovy.*', '.*', '.*-SNAPSHOT')
- }
- }
- maven {
- url = 'https://repository.apache.org/content/groups/staging'
- content {
- includeGroupByRegex('org[.]apache[.]grails.*')
- }
- }
- maven {
- url = 'https://central.sonatype.com/repository/maven-snapshots'
- content {
- includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
- includeGroup('org.spockframework')
- }
- mavenContent {
- snapshotsOnly()
- }
- }
- maven {
- url = 'https://repository.apache.org/content/groups/staging'
- content {
- includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
- }
- mavenContent {
- releasesOnly()
- }
- }
- }
-}
diff --git a/grails-forge/test-core/src/test/groovy/org/grails/forge/features/scaffolding/ScaffoldingSpec.groovy b/grails-forge/test-core/src/test/groovy/org/grails/forge/features/scaffolding/ScaffoldingSpec.groovy
index 0664a1de63..302fca5ff4 100644
--- a/grails-forge/test-core/src/test/groovy/org/grails/forge/features/scaffolding/ScaffoldingSpec.groovy
+++ b/grails-forge/test-core/src/test/groovy/org/grails/forge/features/scaffolding/ScaffoldingSpec.groovy
@@ -40,16 +40,15 @@ class ScaffoldingSpec extends CommandSpec {
'''
String output = executeGradle('runCommand', '-Pargs=generate-controller example.grails.Bird').output
- then: 'generated files exist'
+ then:
+ output ==~ /(?s).*Rendered template Controller\.groovy to destination grails-app[\/\\]controllers[\/\\]example[\/\\]grails[\/\\]BirdController\.groovy(?s).*/
+ output ==~ /(?s).*Rendered template Service\.groovy to destination grails-app[\/\\]services[\/\\]example[\/\\]grails[\/\\]BirdService\.groovy(?s).*/
+ output ==~ /(?s).*Rendered template Spec\.groovy to destination src[\/\\]test[\/\\]groovy[\/\\]example[\/\\]grails[\/\\]BirdControllerSpec\.groovy(?s).*/
+ output ==~ /(?s).*Rendered template ServiceSpec\.groovy to destination src[\/\\]test[\/\\]groovy[\/\\]example[\/\\]grails[\/\\]BirdServiceSpec\.groovy(?s).*/
new File(dir, 'grails-app/controllers/example/grails/BirdController.groovy').exists()
new File(dir, 'grails-app/services/example/grails/BirdService.groovy').exists()
new File(dir, 'src/test/groovy/example/grails/BirdControllerSpec.groovy').exists()
- new File(dir, 'src/test/groovy/example/grails/BirdServiceSpec.groovy').exists()
-
- and: 'output contains rendering messages or task completed successfully'
- // Spring Boot 4 may not forward forked JVM println output to Gradle's captured output.
- // Verify via output pattern when available, but file existence above is the primary assertion.
- output.contains('runCommand') || output.contains('Rendered template')
+ new File(dir, 'src/test/groovy/example/grails/BirdControllerSpec.groovy').exists()
}
@Override
diff --git a/settings.gradle b/settings.gradle
index 7f6115578f..cf9363143c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -536,46 +536,3 @@ for (String pattern in DirectoryScanner.defaultExcludes) {
DirectoryScanner.removeDefaultExclude(pattern)
}
}
-
-dependencyResolutionManagement {
- repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
- repositories {
- // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
- maven { url = 'https://repo.grails.org/grails/restricted' }
- maven {
- url = 'https://repository.apache.org/content/groups/snapshots'
- content {
- includeVersionByRegex('org[.]apache[.]grails.*', '.*', '.*-SNAPSHOT')
- includeVersionByRegex('org[.]apache[.]groovy.*', '.*', '.*-SNAPSHOT')
- }
- }
- maven {
- url = 'https://central.sonatype.com/repository/maven-snapshots'
- content {
- includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
- }
- mavenContent {
- snapshotsOnly()
- }
- }
- maven {
- url = 'https://central.sonatype.com/repository/maven-snapshots/'
- content {
- includeGroup('org.spockframework')
- }
- mavenContent {
- snapshotsOnly()
- }
- }
- maven {
- url = 'https://repository.apache.org/content/groups/staging'
- content {
- includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
- includeModuleByRegex('org[.]apache[.]groovy[.]geb', 'geb-.*')
- }
- mavenContent {
- releasesOnly()
- }
- }
- }
-}