-
-
Notifications
You must be signed in to change notification settings - Fork 974
Groovy 5.0.x support for Grails 8 + Spring Boot 4 #15557
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jamesfredley
wants to merge
119
commits into
8.0.x
Choose a base branch
from
grails8-groovy5-sb4
base: 8.0.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
119 commits
Select commit
Hold shift + click to select a range
6b8c1ad
build: Groovy 5.0.0-SNAPSHOT and Spock 2.4-M6-groovy-4.0
matrei 88baa17
build: add `-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true`
matrei f3edd09
fix: Groovy 5 compatibility
matrei d6b30be
test: Add `@PendingFeatureIf` for currently incompatible tests
matrei 00fcb6c
Merge remote-tracking branch 'upstream/7.0.x' into groovy-5
jdaugherty cb7d7ff
feature: allow pulling staged versions of groovy for testing
jdaugherty cd9ff39
fix: switch to groovy.transform.Generated
jdaugherty 457d6cd
chore: testing push access to grails-core
matrei c879a1c
Revert "chore: testing push access to grails-core"
matrei ace4d30
Merge branch '7.0.x' into groovy-5
matrei bd260ef
test(deps): update to Spock 2.4-groovy-5.0-SNAPSHOT
matrei 30b1611
fix(deps): update to Groovy 5.0.2
matrei 329f31e
test: remove `@PendingFeature` for passing tests
matrei 94a02b8
style: fix imports
matrei 41b8e09
Merge branch '7.0.x' into groovy-5
matrei bcbdff4
build: fix snapshot repositories
matrei efa1502
build: fix sbom issues
matrei 72bdc31
Merge branch '7.0.x' into groovy-5
matrei 554b802
fix: migrate to new groovysh api
matrei 9427f51
chore: bump Groovy to 5.0.3-SNAPSHOT
matrei c54de20
fix: more Groovy 5 compatibility changes
matrei bb53f13
chore: bump Groovy to 5.0.4-SNAPSHOT
matrei f5d023f
Merge branch '8.0.x' into groovy-5
jamesfredley 765ff5d
fix(deps): Bump Groovy to 5.0.5
matrei f64e026
test: Remove `@PendingFeature` from passing test
matrei d1b8b5f
fix(deps): Bump Grails Spring Security to 7.0.1
matrei 393bbfd
Merge remote-tracking branch 'apache/8.0.x' into groovy-5
matrei 4fe600e
Merge origin/groovy-5 into grails8-groovy5-sb4 (resolve: Groovy 5.0.5…
jamesfredley 4a27159
cherry-pick 9574fe8: Groovy 5 compatibility fixes (66 files)
jamesfredley 92b89ce
chore: remove unrelated files from previous branch
jamesfredley 5fc3bda
fix: improve Groovy 5 compatibility - replace dynamic workarounds wit…
jamesfredley bfe1492
fix: pin Groovy to 5.0.3 and resolve downstream test failures
jamesfredley a427c33
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley 28dd32f
fix(build): normalize line endings via .gitattributes
jamesfredley 7896ef8
fix(grails-gradle): skip missing input dirs in mergeTestReports
jamesfredley 708e03c
fix: bump Groovy to 5.0.5 with GROOVY-11907 workaround
jamesfredley 60c04d6
fix: clean up Groovy 5.0.3 workarounds now on 5.0.5
jamesfredley e82ea6b
fix: resolve CI failures for CodeNarc and cyclonedxBom
jamesfredley 83567f4
fix: resolve Groovy 5 CI failures for CodeNarc, controller params, an…
jamesfredley 10a450c
fix: resolve Groovy 5 deep compatibility issues for MongoDB, Hibernat…
jamesfredley a6e9881
fix: work around Groovy 5 @CompileStatic instanceof bytecode bug
jamesfredley 09a482f
chore: remove stale file
jamesfredley a191fec
fix: resolve remaining Hibernate5 config-binding and trait test failures
jamesfredley 153e14c
fix: cherry-pick Groovy 5 fixes from Groovy 6 canary branch
jamesfredley e9ddaf3
fix: resolve functional test failures for cache, async, geb, views, a…
jamesfredley 6ad040f
fix: replace DemoController method parameters with params access
jamesfredley d2441fb
fix: remove static fields from CommandLineHelper trait (GROOVY-11907)
jamesfredley ba430f3
fix: remove @Override from ProductController.index to avoid inherited…
jamesfredley 3608a76
fix: add explicit render(Map) to GrailsApplicationCommand trait
jamesfredley 43f98a1
fix: bypass named-arg render() in GenerateControllerCommand for Groovy 5
jamesfredley af8923a
Merge branch 'spring-boot-4' into grails8-groovy5-sb4
jamesfredley a0ee062
fix: convert GrailsApplicationCommand from trait to abstract class
jamesfredley 6972dd1
Merge branch 'spring-boot-4' into grails8-groovy5-sb4
jamesfredley 890c872
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley 0999a5b
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley ff5d972
Restore grails.plugin.json.builder deprecation shims for Groovy 5 build
jamesfredley 0270152
Resolve render(Map) statically in TemplateRendererImpl for Groovy 5
jamesfredley f408b2f
Derive Apache Groovy joint branch from dependencies.gradle
jamesfredley ff01c08
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 8c5d1d1
fix(sbom): align jline license overrides with post-merge resolved ver…
jamesfredley fe05ce8
ci: make groovy-joint-workflow patch pattern-based, not line-numbered
jamesfredley ba6c488
build: bump Apache Groovy to 5.0.6-SNAPSHOT for GROOVY-11907 trait-fi…
jamesfredley 325e2fe
fix: replace File truthy-check with explicit null checks in TemplateR…
jamesfredley 39b5e58
style: use single-quoted Strings for non-interpolated messages
jamesfredley 962b41e
Merge remote-tracking branch 'origin/upgrade/gradle-9.3.1' into pr-15557
jamesfredley cf7e003
fix(grails-gradle): pin documentation deps to gradle-groovy.version (…
jamesfredley 76f6f72
Merge branch 'upgrade/gradle-9.3.1' into grails8-groovy5-sb4
jamesfredley d280308
Revert: line-ending normalization (#15557 review feedback)
jamesfredley 4040590
Restore Map[key]++ form in MongoCodecSession (#15557 review feedback)
jamesfredley edb40f2
Make NavigableMap ConfigObject conversion shallow + lazy (#15557 revi…
jamesfredley 558e132
Replace Groovy joint-build awk patches with a Gradle init-script (#15…
jamesfredley 8af5d1d
Restore static SQL methods on HibernateEntity trait (GROOVY-11907 ver…
jamesfredley a290b37
Restore GROOVY-11907 trait static members in Geb and scaffolding helpers
jamesfredley a71c8b5
Restore generic trait property coverage in ClassPropertyFetcherTests
jamesfredley 2bb0930
Remove JspTagImpl CompileDynamic workaround after grails-web-jsp comp…
jamesfredley b0c7f34
Restore interface defaults for ContainerGebConfiguration after compil…
jamesfredley b8ee60d
Re-trait ContainerGebConfiguration: interface defaults still hit Groo…
jamesfredley 0804a4f
Re-CompileDynamic ContainerSupport: GROOVY-11907 fix incomplete for i…
jamesfredley 29a9a59
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 1bedef1
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley b1c235a
ci: add groovy-joint-build init-script to sparse-checkout list
jamesfredley 47ed74f
Restore GrailsApplicationCommand as trait; correct root-cause comments
jamesfredley e753a6e
Trim instanceof workaround to only the site that needs it; correct di…
jamesfredley 30200c7
Replace ConfigObject conversion shim with targeted root-cause fix in …
jamesfredley 878adaf
VariableScopeVisitor / @Slf4j workaround audit - keep what is needed,…
jamesfredley 057ad50
Validateable: link standalone reproducer for the TraitReceiverTransfo…
jamesfredley fa7260c
render(Map) silent no-op: note the regression also exists on Groovy 6…
jamesfredley 94f87b0
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley be0c63a
Align grails-micronaut-bom Groovy version with main bom
jamesfredley 1c723ed
Disable integrationTest for 5 test apps - Groovy 5 indy=false regress…
jamesfredley b91b576
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 74da807
Restore ContainerSupport @CompileStatic - GROOVY-11968 fixed in 5.0.6…
jamesfredley f61aa98
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley 5ff34e8
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 8ece2cb
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley 73bd63c
Restore instanceof shape - GROOVY-11983 fixed in 5.0.6-SNAPSHOT build…
jamesfredley ad634e0
Restore SUCCESS/FAILURE constants and revert validation drive-by
jamesfredley 65d194f
Restore IContainerGebConfiguration as interface - GROOVY-11982 fixed …
jamesfredley faef56c
render(Map) workarounds: align inline diagnoses with File-truthiness …
jamesfredley a0b7428
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley 43ad57a
Final Groovy 5 audit pass: clean up silent File-truthiness traps + st…
jamesfredley 813b131
Bump javaparser-core to 3.28.1 to align with Groovy 5.0.6-SNAPSHOT
jamesfredley 0ce8095
Fix dbmigration GroovyChangeLogSpec: drop env-dependent log-capture a…
jamesfredley bda52ad
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley a000a5f
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 4250923
Bring in #15294 compile-static dynamic-checking test app
jdaugherty 423022f
fix(deps): pin Groovy to released 5.0.6 to unblock CI dependency reso…
jamesfredley 84b0c95
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley f1b78b7
deps: bump Apache Groovy to 5.0.7-SNAPSHOT
jamesfredley 1c411f8
Merge branch 'fix/8.0.x-merge-sb4-fallout' into grails8-groovy5-sb4
jamesfredley 6ee894f
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 0a88ace
fix(ci): align micronaut-bom groovy version and resolve Groovy 5 STC …
jamesfredley 4ac7735
fix(test): drop generic argument from `instanceof List<FieldError>`
jamesfredley 68fe246
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley 649d7bb
fix(gsp): resolve g.taglib STC calls when the GSP page inherits getPr…
jamesfredley ef6cca8
Merge branch '8.0.x' into grails8-groovy5-sb4
jamesfredley fea4868
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley b73f6bc
Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4
jamesfredley db381c1
fix: drop ConfigurationBuilder @Builder-detection workaround (GROOVY-…
jamesfredley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // Gradle init-script applied during the Groovy joint-validation build. | ||
| // Overrides Develocity and build-cache configuration injected by Groovy's own | ||
| // build-scans.gradle without modifying any of Groovy's source files. | ||
| // | ||
| // Applied via: ./gradlew --init-script <path>/groovy-joint-build.init.gradle | ||
| // | ||
| // Defensive: the pluginManager.withPlugin guard makes this a no-op when the | ||
| // Develocity plugin is absent, so the script never crashes Groovy's build. | ||
|
|
||
| settingsEvaluated { settings -> | ||
| settings.pluginManager.withPlugin('com.gradle.develocity') { | ||
| def isAuthenticated = System.getenv('GRAILS_DEVELOCITY_ACCESS_KEY') != null | ||
|
|
||
| // 'develocity' is the DSL extension registered by the plugin on Settings. | ||
| settings.develocity { | ||
| server = 'https://develocity.apache.org' | ||
|
|
||
| buildScan { | ||
| // Tag the build for visibility on develocity.apache.org. Groovy's own | ||
| // gradle/build-scans.gradle does not add any tags, so additive is safe. | ||
| tag('groovy') | ||
| tag('grails-core') | ||
| // Only publish when a valid access key is present in the environment. | ||
| publishing.onlyIf { isAuthenticated } | ||
| uploadInBackground = false | ||
| } | ||
| } | ||
|
|
||
| settings.buildCache { | ||
| local { | ||
| enabled = false | ||
| } | ||
| remote(settings.develocity.buildCache) { | ||
| push = isAuthenticated | ||
| enabled = true | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,3 +63,5 @@ tmp/ | |
| !etc/bin | ||
| etc/bin/results | ||
| .vscode/ | ||
|
|
||
| .sisyphus/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,13 +15,31 @@ | |
| * limitations under the License. | ||
| */ | ||
|
|
||
| // TODO: BOOT4 - Integration tests disabled due to Spring Boot 4 incompatibilities. | ||
| // TODO: BOOT4 / GROOVY5 - Integration tests disabled due to known regressions. | ||
| // | ||
| // Modules applying this file have their integrationTest task disabled because of | ||
| // external plugin/library incompatibilities with Spring Boot 4 / Spring Framework 7. | ||
| // known incompatibilities that the PR has not yet fixed. STILL BROKEN - workaround | ||
| // only. Do NOT remove this apply without verifying each affected module's tests pass | ||
| // on Groovy 5.0.x with -PgrailsIndy=false. | ||
| // | ||
| // Known blockers: | ||
| // - SiteMesh3: Decorator/layout not compatible with Spring Framework 7 | ||
| // - SiteMesh3: Decorator/layout not compatible with Spring Framework 7. | ||
| // - Groovy 5 + indy=false: Controller action methods that declare parameters | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this still an issue? |
||
| // (e.g. `def myAction(String foo)`, `@RequestParameter` annotated params, | ||
| // command objects) throw MissingPropertyException at runtime because the | ||
| // parameter resolves to a propertyMissing lookup on the controller (via | ||
| // TagLibraryInvoker$Trait$Helper) instead of the local parameter. Triggered | ||
| // after ControllerActionTransformer.wrapMethodBodyWithExceptionHandling wraps | ||
| // the original method body in a try/catch; appears to be a Groovy 5 callsite | ||
| // dispatch regression specific to -PgrailsIndy=false. Affected tests in app1 | ||
| // include ForwardingSpec ('forwarding to a view'), InterceptorFunctionalSpec | ||
| // (after-redirect/forward/chain), AdvancedDataBindingSpec (@RequestParameter, | ||
| // type conversion), ChainingToNamespacedControllersFunctionalSpec, and | ||
| // CommandObjectSpec ('should display the correct title on the home page'). | ||
| // Functional Tests (indy=true) PASS for these projects, so the workaround is | ||
| // intentionally broad rather than per-test. Needs upstream Apache Groovy fix | ||
| // or a ControllerActionTransformer redesign that preserves parameter scope | ||
| // under indy=false dispatch. | ||
| // | ||
| // Re-enable each module's integrationTest when its blocking dependency is updated. | ||
| // Search for 'boot4-disabled-integration-test-config' to find all affected modules. | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is only needed if on a snapshot? If we're going to keep this, it should be on only tests