This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.2.x in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 74391c295b5cf9433bcb8b2162291cbfc67fca13 Merge: 19f9fb50d2 8b2f7d0c12 Author: James Daugherty <[email protected]> AuthorDate: Sun May 17 13:34:43 2026 -0400 Merge branch '7.1.x' into 7.2.x # Conflicts: # dependencies.gradle # gradle.properties # grails-core/src/test/groovy/grails/util/GrailsUtilTests.java .gitattributes | 53 ++++ .github/vote_templates/announce.txt | 4 + .github/vote_templates/staged.txt | 7 - .github/workflows/groovy-joint-workflow.yml | 4 +- .github/workflows/release.yml | 2 + NOTICE | 8 +- RELEASE.md | 18 +- codecov.yml | 37 +++ dependencies.gradle | 2 +- etc/bin/Dockerfile | 9 + etc/bin/verify-cli-distribution.sh | 18 ++ etc/bin/verify-wrapper-distribution.sh | 19 ++ etc/bin/verify.sh | 5 + gradle.properties | 2 +- .../reporting/DefaultStackTraceFilterer.java | 56 ++-- .../exceptions/reporting/StackTraceFilterer.java | 6 + .../src/main/groovy/grails/config/Settings.groovy | 35 +++ .../reporting/StackTraceFiltererSpec.groovy | 300 ++++++++++++++++----- .../src/main/resources/fonts/archia-bold.eot | Bin 15838 -> 0 bytes .../src/main/resources/fonts/archia-bold.ttf | Bin 41696 -> 0 bytes .../src/main/resources/fonts/archia-bold.woff | Bin 19684 -> 0 bytes .../src/main/resources/fonts/archia-bold.woff2 | Bin 14136 -> 0 bytes .../src/main/resources/fonts/archia-light.eot | Bin 42146 -> 0 bytes .../src/main/resources/fonts/archia-light.ttf | Bin 41864 -> 0 bytes .../src/main/resources/fonts/archia-light.woff | Bin 19908 -> 0 bytes .../src/main/resources/fonts/archia-light.woff2 | Bin 14240 -> 0 bytes .../src/main/resources/fonts/archia-medium.eot | Bin 16471 -> 0 bytes .../src/main/resources/fonts/archia-medium.ttf | Bin 43528 -> 0 bytes .../src/main/resources/fonts/archia-medium.woff | Bin 20436 -> 0 bytes .../src/main/resources/fonts/archia-medium.woff2 | Bin 14484 -> 0 bytes .../src/main/resources/fonts/archia-regular.eot | Bin 15329 -> 0 bytes .../src/main/resources/fonts/archia-regular.ttf | Bin 41328 -> 0 bytes .../src/main/resources/fonts/archia-regular.woff | Bin 19244 -> 0 bytes .../src/main/resources/fonts/archia-regular.woff2 | Bin 13656 -> 0 bytes .../src/main/resources/fonts/archia-semibold.eot | Bin 43510 -> 0 bytes .../src/main/resources/fonts/archia-semibold.ttf | Bin 43216 -> 0 bytes .../src/main/resources/fonts/archia-semibold.woff | Bin 20240 -> 0 bytes .../src/main/resources/fonts/archia-semibold.woff2 | Bin 14460 -> 0 bytes .../src/main/resources/fonts/archia-thin.eot | Bin 15796 -> 0 bytes .../src/main/resources/fonts/archia-thin.ttf | Bin 41700 -> 0 bytes .../src/main/resources/fonts/archia-thin.woff | Bin 19676 -> 0 bytes .../src/main/resources/fonts/archia-thin.woff2 | Bin 14004 -> 0 bytes .../src/main/resources/stylesheets/screen.css | 57 +--- grails-data-hibernate5/dbmigration/build.gradle | 8 + .../src/test/resources/logging.properties | 16 ++ .../config/logging/loggingFullStackTraces.adoc | 212 +++++++++++++++ grails-doc/src/en/guide/index.adoc | 5 + grails-doc/src/en/guide/toc.yml | 1 + .../src/en/guide/upgrading/upgrading71x.adoc | 56 ++++ grails-test-examples/issue-10279/build.gradle | 48 ++++ .../issue-10279/grails-app/conf/application.groovy | 26 ++ .../issue-10279/grails-app/conf/application.yml | 44 +++ .../issue-10279/grails-app/conf/logback.xml | 39 +++ .../controllers/issue10279/UrlMappings.groovy | 25 ++ .../grails-app/init/issue10279/Application.groovy | 28 ++ .../issue10279/ActuatorEnvClosureSpec.groovy | 56 ++++ grails-test-examples/jetty/build.gradle | 64 +++++ .../grails-app/assets/javascripts/application.js | 16 ++ .../grails-app/assets/stylesheets/application.css | 18 ++ .../jetty/grails-app/conf/application.yml | 60 +++++ .../jetty/grails-app/conf/logback-spring.xml | 42 +++ .../jetty/grails-app/conf/spring/resources.groovy | 22 ++ .../issue12688/SessionController.groovy | 38 +++ .../controllers/issue12688/UrlMappings.groovy | 33 +++ .../grails-app/init/issue12688/Application.groovy | 31 +++ .../grails-app/init/issue12688/BootStrap.groovy | 29 ++ .../jetty/grails-app/views/error.gsp | 29 ++ .../jetty/grails-app/views/index.gsp | 28 ++ .../jetty/grails-app/views/notFound.gsp | 28 ++ .../jetty/grails-app/views/session/index.gsp | 30 +++ .../jetty/grails-app/views/session/show.gsp | 27 ++ .../groovy/issue12688/JettySessionSpec.groovy | 51 ++++ .../groovy/issue12688/pages/SessionFormPage.groovy | 32 +++ .../groovy/issue12688/pages/SessionShowPage.groovy | 31 +++ .../org/grails/web/errors/AuditorAwareLookup.java | 101 +++++++ .../grails/web/errors/GrailsExceptionResolver.java | 116 ++++++++ .../web/errors/GrailsExceptionResolverSpec.groovy | 263 +++++++++++++++++- settings.gradle | 4 + 78 files changed, 2149 insertions(+), 150 deletions(-) diff --cc dependencies.gradle index fe0d35b7bf,913cc7ebc4..400ea37eaf --- a/dependencies.gradle +++ b/dependencies.gradle @@@ -73,9 -73,7 +73,9 @@@ ext 'commons-codec.version' : '1.18.0', 'commons-lang3.version' : '3.20.0', 'geb-spock.version' : '8.0.1', + 'graphql-java.version' : '24.3', + 'graphql-java-extended-scalars.version': '24.0', - 'groovy.version' : '4.0.31', + 'groovy.version' : '4.0.32', 'jackson.version' : '2.21.2', 'jquery.version' : '3.7.1', 'hibernate-groovy-proxy.version': '1.1',
