You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/09/30 00:18:58 UTC
(grails-core) branch 9.0.x updated (ce68e05de3 -> f32657939b)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from ce68e05de3 Merge 8.1.x into 9.0.x
add f921b366b3 Rebase test fork heap budget onto 8.0.x. Continues #16168 so the change can land against current 8.0.x instead of the old stacked base. Co-authored-by: James Fredley <ja...@users.noreply.github.com>
add 79d34939e2 build(test): condense the test fork heap budget
add ac4fefb5f5 Merge branch '8.0.x' into build/16168-test-fork-heap
add 9ad51a9b5c docs: document the test fork sizing properties
add 12be92bbb8 Merge pull request #16412 from sanjana2505006/build/16168-test-fork-heap
add 49e6984103 Resolve resource links to the controller exposing the domain class
add cf4dd26eff Prefer a controller named after the domain class for resource links
add f49e676d6f Resolve the controller for an uninitialised association too
add e5f7c19d22 Merge branch '8.0.x' into fix/resource-link-controller-lookup
add 4555348f95 Merge branch '8.0.x' into fix/resource-link-controller-lookup
add 6041eb1143 Merge branch '8.0.x' into fix/resource-link-controller-lookup
add 6ead0ff7e8 Cover RestfulController redirects for a controller not named after its domain
add 67f1e1a03a Publish each controller index together with the array it was built from
add 9093a83641 Keep resource controller resolution private
add 5c9a478575 Resolve resource links to the most specific controller serving the domain
add 1f8c49ad1a Fall back to an any-method mapping when a method-specific one does not fit
add 83c1cbab64 Resolve a controller name's namespace nearest scope first
add c6689d3c0a Pin which URL mapping a link uses when several could produce it
add 3d0e9e8c73 Resolve controller names and domain classes through one scope chain
add 66117ad7d1 Resolve a redirect from the issuing controller's namespace, not into it
add 06c74d17b1 Key cached links on what they resolve to, not on the request
add 238e333ffd Cache a link separately for each encoding it is generated in
add e2600b603f Correct the namespace a redirect to a domain instance is resolved from
add 084dfae190 Resolve a controller name no controller has to the namespace it is made from
add cbd5c0bbba Link fields plugin associations to the controller serving them
add 58419e9b9c Link a HAL collection to the controller serving its elements
add 9405350171 Redirect generated controllers to their own show action
add 7140a59ed0 Only send a resource link to a controller defining its action
add d6e7f36330 Warn when an ambiguous resource link falls back to the naming convention
add f538554a5c Keep link resolution cheap on a cache hit
add c88e535bf0 Key a cached link on its resolution even when makeKey is overridden
add e87bbf388f Assert link generation warnings through LogCapture
add 031440d091 Do not resolve a resource link that names its controller
add bf9c544d5b Report an ambiguity again once the controllers change
add cfbaf5c52a Store the issuing controller's namespace on the request as a String
add 2edef2b164 Call out where an unknown controller name now keeps the namespace
add d142808b20 Name the controller index accessor apart from its field
add e81621a6c2 Label the new spec blocks and say why the fixtures dependency is there
add 6fa9323088 Merge branch '8.0.x' into fix/resource-link-controller-lookup
add f504631349 Merge remote-tracking branch 'upstream/8.0.x' into fix/resource-link-controller-lookup
add d63aac9d10 Merge branch '8.0.x' into fix/resource-link-controller-lookup
add 5c4195c5a9 Correct where an unknown controller name keeps the namespace
add 8b871ccd73 Count only a RestfulController's domain class as the one it serves
add d5b714c80a Do not send a link to a namesake domain class's controller
add 97bbb161c8 Recognise the requesting controller by the name its URL gave it
add 690ed39928 Generate a REST controller parameterised on its domain class
add e8f0a338f2 Cover link resolution end to end in the namespaces app
add c466cbb2bd Cover fields plugin links under a renamed scaffold
add 446633b0b0 Cover HAL links for renamed controllers in views-functional-tests
add f56bf2d950 Cover hyphenated resource links with the suggested spec
add 7bbb43f28c Merge pull request #16272 from codeconsole/fix/resource-link-controller-lookup
add c262e97a03 Start @ManagedEntity instance id at 0 for Hibernate 7
add aa0b6c49e3 Merge pull request #16424 from matrei/fix/hibernate7-managed-entity-instance-id
add c60b226ad6 Update to asset pipeline 5.2.0-RC3
add d4a2633a4b Clarify the asset pipeline wildcard upgrade note
add db7a914f24 Merge pull request #16426 from apache/deps/asset-pipeline-5.2.0-RC3
add 34abe9ac5f Use SkillsJars Gradle plugin 0.1.4 for the agent skills
add 0ca770d33a Merge pull request #16430 from apache/docs/skillsjars-gradle-plugin-0.1.4
add d199bb475b Validate Grails BOM version properties against the Spring Boot BOM
add 8cfecb05fb Resolve BOM coordinates written as properties
add a90057b293 Merge pull request #16428 from apache/build/bom-parent-property-validation
add 067ca7da8c fix: nested criteria subqueries bind to the outer criteria under @CompileStatic (#16425)
add 12b3cc5211 Merge branch '8.0.x' into fix/nested-criteria-delegate-first
add 5a8d601ba5 Merge pull request #16429 from MartinJesusDev/fix/nested-criteria-delegate-first
add a3ebd1e52c Use SiteMesh 3.3.0-SNAPSHOT until 3.3.0-RC3 is released
add f93c85dcce Gate the SiteMesh 3 plugin with SiteMesh's @ConditionalOnSiteMeshIntegration
add 454b5f565d Merge branch '8.0.x' into deps/sitemesh-3.3.0-RC3
add a462eabcdf Merge branch '8.0.x' into deps/sitemesh-3.3.0-RC3
add 6221c7daab Merge branch '8.0.x' into deps/sitemesh-3.3.0-RC3
add 1a5c067904 Use released SiteMesh 3.3.0-RC3 dependencies
add 0c0afd98cb Merge branch '8.0.x' into deps/sitemesh-3.3.0-RC3
add ad8e2e47c1 Merge pull request #16413 from codeconsole/deps/sitemesh-3.3.0-RC3
add ec40330f3b Declare the map constructor of BeanPropertyAccessorImpl
add 52f71ed346 Store an attribute on subscript assignment to GSP tag attributes
add e1a2fc6c4e Skip interfaces when collecting static property values from a class hierarchy
add 7ff720a7cc Keep 8.0.x source compatible with Groovy 6
add 9d760780c8 Merge pull request #16427 from apache/chore/groovy-6-forward-compat
add b19f9d7d57 Update to 1.0.0-RC3 of the publish plugin
add b3678351e0 Merge 8.0.x into 8.1.x
add c4d5f26feb Declare DELEGATE_FIRST on the RxGORM criteria closure API
new aaa9403a42 Merge 8.1.x into 9.0.x
new f32657939b Remove the redundant httpcore5 pin
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.agents/skills/gradle-developer/SKILL.md | 16 +-
.github/workflows/gradle.yml | 38 ++
.github/workflows/release.yml | 2 +
AGENTS.md | 2 +
DEVELOPMENT.md | 13 +
build-logic/docs-core/build.gradle | 2 +
.../gradle/tasks/bom/PropertyNameCalculator.groovy | 9 +-
.../tasks/bom/PropertyNameCalculatorSpec.groovy | 104 +++
build-logic/plugins/build.gradle | 6 +
.../org/apache/grails/buildsrc/GradleUtils.groovy | 38 ++
.../GrailsBomPropertyValidatorPlugin.groovy | 161 +++++
.../GrailsDependencyValidatorPlugin.groovy | 56 +-
.../grails/buildsrc/ParentBomVersions.groovy | 151 +++++
.../org/apache/grails/buildsrc/PomVersions.groovy | 136 ++++
.../buildsrc/ValidateBomPropertiesTask.groovy | 215 ++++++
.../apache/grails/buildsrc/GradleUtilsSpec.groovy | 50 ++
.../GrailsBomPropertyValidatorPluginSpec.groovy | 62 ++
.../buildsrc/ValidateBomPropertiesTaskSpec.groovy | 466 +++++++++++++
.../ValidateDependencyVersionsTaskSpec.groovy | 143 ++++
build.gradle | 23 +
dependencies.gradle | 69 +-
end-to-end/agent-skills-plain-build/build.gradle | 2 +-
end-to-end/agent-skills/build.gradle | 2 +-
.../spring-dependency-management/build.gradle | 4 +-
gradle.properties | 4 +-
gradle/test-config.gradle | 2 +-
grails-bom/base/build.gradle | 3 +
grails-bom/default/build.gradle | 3 +
grails-bom/hibernate5/build.gradle | 3 +
grails-bom/hibernate7/build.gradle | 3 +
grails-bom/neo4j/build.gradle | 3 +
.../main/groovy/grails/artefact/Controller.groovy | 29 +-
.../grails/artefact/ControllerRedirectSpec.groovy | 81 ++-
.../main/groovy/grails/boot/GrailsBanner.groovy | 4 +-
.../config/external/WriterFilteringMap.groovy | 5 +-
.../grails/util/AbstractTypeConvertingMap.java | 10 +-
.../config/external/WriteFilteringMapSpec.groovy | 44 ++
.../orm/hibernate/HibernateGormStaticApi.groovy | 6 +-
.../compiler/HibernateEntityTransformation.groovy | 2 +-
.../grails/gorm/tests/ManagedEntitySaveSpec.groovy | 64 ++
.../HibernateEntityTransformationSpec.groovy | 20 +
grails-data-neo4j/core/build.gradle | 2 +-
.../groovy/grails/gorm/DetachedCriteria.groovy | 70 +-
.../query/criteria/AbstractDetachedCriteria.groovy | 72 +-
.../compiler/gorm/GormEntityTransformSpec.groovy | 4 +-
.../NestedCriteriaCompileStaticSpec.groovy | 663 ++++++++++++++++++
.../groovy/grails/gorm/rx/DetachedCriteria.groovy | 74 +-
.../org/grails/gorm/rx/api/RxGormStaticApi.groovy | 10 +-
.../grails/gorm/rx/DetachedCriteriaSpec.groovy | 32 +
.../dirty/checking/DirtyCheckingList.groovy | 4 +-
.../mapping/reflect/ClassPropertyFetcher.java | 1 -
.../reflect/ClassPropertyFetcherTests.groovy | 35 +
grails-doc/src/en/guide/REST/hypermedia/hal.adoc | 2 +-
.../extendingRestfulController.adoc | 2 +-
.../src/en/guide/REST/versioningResources.adoc | 2 +-
.../gradleBuild/gradleDependencies.adoc | 2 +
.../src/en/guide/gettingStarted/agentSkills.adoc | 6 +-
grails-doc/src/en/guide/scaffolding.adoc | 3 +
.../urlmappings/namespacedControllers.adoc | 14 +-
.../theWebLayer/urlmappings/restfulMappings.adoc | 64 ++
.../src/en/guide/upgrading/upgrading80x.adoc | 128 +++-
grails-fields/build.gradle | 1 +
.../plugin/formfields/FormFieldsTagLib.groovy | 16 +-
.../formfields/BeanPropertyAccessorImpl.groovy | 6 +
.../formfields/BeanPropertyAccessorImplSpec.groovy | 81 +++
.../taglib/AssociationLinkTargetSpec.groovy | 106 +++
.../plugin/geb/ThreadLocalPropertyScopeSpec.groovy | 58 ++
.../plugin/geb/ThreadLocalPropertyScope.java | 7 +-
grails-gradle/bom/build.gradle | 3 +
.../gradle/plugin/bom/BomManagedVersions.groovy | 31 +-
.../bom/BomOverrideResolutionFunctionalSpec.groovy | 9 +-
.../bom-override-resolution/build.gradle | 6 +
.../org/example/grouplib/1.0.0/grouplib-1.0.0.pom | 9 +
.../org/example/grouplib/2.0.0/grouplib-2.0.0.pom | 9 +
.../org/example/test-bom/1.0.0/test-bom-1.0.0.pom | 10 +-
.../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy | 5 +-
...OnSiteMeshViewResolverIntegrationCondition.java | 53 --
.../Sitemesh3RenderViewMutatorSpec.groovy | 4 +-
.../org/grails/taglib/GroovyPageAttributes.java | 16 +
.../grails/taglib/GroovyPageAttributesTests.groovy | 39 +-
.../templates/artifacts/RestfulController.groovy | 2 +-
.../render/util/AbstractLinkingRenderer.groovy | 2 +-
grails-scaffolding/build.gradle | 3 +
.../templates/scaffolding/AsyncController.groovy | 4 +-
.../main/templates/scaffolding/Controller.groovy | 4 +-
.../GeneratedAsyncControllerRedirectSpec.groovy | 38 +-
.../GeneratedControllerRedirectSpec.groovy | 101 +++
.../plugin/scaffolding/redirect/Fixtures.groovy | 39 +-
.../developer/skills/grails-developer/SKILL.md | 2 +-
.../skills/grails-8-upgrade/SKILL.md | 23 +-
.../oauth2/SpringSecurityOauth2BaseService.groovy | 1 +
.../SpringSecurityOauth2BaseServiceSpec.groovy | 46 ++
grails-test-examples/hyphenated/build.gradle | 1 +
.../hyphenated/CityGuidesController.groovy | 21 +-
.../hyphenated/LinkPageController.groovy | 21 +-
.../backoffice/GuideLedgerController.groovy | 22 +-
.../backoffice/TourDeskController.groovy | 22 +-
.../grails-app/domain/hyphenated/TourGuide.groovy | 21 +-
.../grails-app/views/links/guideLinks.gsp | 30 +
.../hyphenated/HyphenatedLinkResolutionSpec.groovy | 92 +++
grails-test-examples/namespaces/build.gradle | 1 +
.../grails-app/controllers/UrlMappings.groovy | 12 +
.../namespaces/AssessmentController.groovy | 22 +-
.../controllers/namespaces/AuthorController.groovy | 20 +-
.../controllers/namespaces/GadgetController.groovy | 20 +-
.../controllers/namespaces/HomeController.groovy | 30 +-
.../controllers/namespaces/MoviesController.groovy | 20 +-
.../namespaces/admin/AuthorController.groovy | 20 +-
.../namespaces/admin/GadgetReportController.groovy | 26 +-
.../namespaces/admin/PageController.groovy | 21 +
.../namespaces/archive/ItemController.groovy | 25 +-
.../namespaces/catalog/ItemController.groovy | 23 +-
.../namespaces/manage/DashboardController.groovy | 25 +-
.../manage/ManageAssessmentController.groovy | 26 +-
.../grails-app/domain/namespaces/Assessment.groovy | 20 +-
.../grails-app/domain/namespaces/Film.groovy | 20 +-
.../grails-app/domain/namespaces/Gadget.groovy | 20 +-
.../grails-app/domain/namespaces/Screening.groovy | 21 +-
.../domain/namespaces/archive/Item.groovy | 24 +-
.../domain/namespaces/catalog/Item.groovy | 20 +-
.../services/namespaces/LinkFixtureService.groovy | 28 +-
.../grails-app/views/links/methodLinks.gsp | 28 +
.../grails-app/views/links/resourceLinks.gsp | 44 ++
.../groovy/namespaces/LinkResolutionSpec.groovy | 216 ++++++
.../src/main/groovy/namespaces/ReportBase.groovy | 24 +-
.../scaffolding-fields/build.gradle | 1 +
.../scaffoldingfields/CrewController.groovy | 22 +-
.../scaffoldingfields/DeckhandsController.groovy | 25 +-
.../domain/scaffoldingfields/Crew.groovy | 21 +-
.../domain/scaffoldingfields/Sailor.groovy | 21 +-
.../RenamedScaffoldLinksSpec.groovy | 118 ++++
.../grails-app/conf/spring/resources.groovy | 25 +-
.../functional/tests/PapersController.groovy | 25 +-
.../functional/tests/PeriodicalsController.groovy | 24 +-
.../functional/tests/PublishersController.groovy | 21 +-
.../functional/tests/UrlMappings.groovy | 3 +
.../domain/functional/tests/Journal.groovy | 22 +-
.../domain/functional/tests/Magazine.groovy | 22 +-
.../domain/functional/tests/Publisher.groovy | 21 +-
.../grails-app/views/periodicals/index.gson | 24 +-
.../grails-app/views/periodicals/show.gson | 24 +-
.../tests/RenamedControllerHalLinksSpec.groovy | 102 +++
grails-test-suite-uber/build.gradle | 2 +-
.../RestfulControllerRedirectTargetSpec.groovy | 119 ++++
.../RestfulControllerResourceLinkSpec.groovy | 156 +++++
...directToControllerInDefaultNamespaceSpec.groovy | 48 ++
...RedirectToControllerInOtherNamespaceSpec.groovy | 67 ++
.../servlet/mvc/alpha/NamespacedController.groovy | 4 +
.../servlet/mvc/beta/NamespacedController.groovy | 4 +
.../testing/ParameterizedGrailsUnitTest.groovy | 1 +
.../mongo/StartMongoGrailsUnitExtension.groovy | 2 +-
.../grails/validation/ValidateableTraitSpec.groovy | 6 +-
.../view/api/internal/DefaultHalViewHelper.groovy | 5 +-
.../plugin/json/view/HalCollectionLinkSpec.groovy | 58 ++
.../plugin/json/view/hallinks/Fixtures.groovy | 29 +-
grails-web-url-mappings/build.gradle | 3 +-
.../groovy/grails/web/mapping/LinkGenerator.java | 13 +-
.../grails/web/mapping/CachingLinkGenerator.java | 67 +-
.../grails/web/mapping/DefaultLinkGenerator.groovy | 751 +++++++++++++++++----
.../web/mapping/DefaultUrlMappingsHolder.java | 2 +-
.../web/mapping/CachingLinkGeneratorSpec.groovy | 106 ++-
.../LinkGeneratorNamespaceInferenceSpec.groovy | 85 ++-
.../LinkGeneratorResourceControllerSpec.groovy | 674 ++++++++++++++++++
.../grails/web/mapping/LinkGeneratorSpec.groovy | 6 +-
.../mapping/ReverseMappingPrecedenceSpec.groovy | 150 ++++
.../mapping/UrlMappingsWithHttpMethodSpec.groovy | 46 ++
.../mapping/domainlink/DomainLinkFixtures.groovy | 370 ++++++++++
.../domainlink/archive/ItemController.groovy | 31 +-
.../domainlink/archive/PamphletsController.groovy | 26 +-
.../domainlink/catalog/ItemController.groovy | 30 +-
.../domainlink/print/PamphletsController.groovy | 24 +-
.../src/test/resources/logback-test.xml | 0
.../src/test/resources/simplelogger.properties | 20 -
173 files changed, 7116 insertions(+), 1276 deletions(-)
create mode 100644 build-logic/docs-core/src/test/groovy/org/apache/grails/gradle/tasks/bom/PropertyNameCalculatorSpec.groovy
create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GrailsBomPropertyValidatorPlugin.groovy
create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/ParentBomVersions.groovy
create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PomVersions.groovy
create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/ValidateBomPropertiesTask.groovy
create mode 100644 build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsBomPropertyValidatorPluginSpec.groovy
create mode 100644 build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/ValidateBomPropertiesTaskSpec.groovy
create mode 100644 build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/ValidateDependencyVersionsTaskSpec.groovy
create mode 100644 grails-data-hibernate7/core/src/test/groovy/grails/gorm/tests/ManagedEntitySaveSpec.groovy
create mode 100644 grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/query/criteria/NestedCriteriaCompileStaticSpec.groovy
create mode 100644 grails-fields/src/test/groovy/grails/plugin/formfields/BeanPropertyAccessorImplSpec.groovy
create mode 100644 grails-fields/src/test/groovy/grails/plugin/formfields/taglib/AssociationLinkTargetSpec.groovy
create mode 100644 grails-geb/src/test/groovy/grails/plugin/geb/ThreadLocalPropertyScopeSpec.groovy
create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/grouplib/1.0.0/grouplib-1.0.0.pom
create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/grouplib/2.0.0/grouplib-2.0.0.pom
delete mode 100644 grails-gsp/grails-sitemesh3/src/main/java/org/grails/plugins/sitemesh3/OnSiteMeshViewResolverIntegrationCondition.java
copy grails-test-examples/namespaces/grails-app/controllers/namespaces/admin/PageController.groovy => grails-scaffolding/src/test/groovy/grails/plugin/scaffolding/GeneratedAsyncControllerRedirectSpec.groovy (54%)
create mode 100644 grails-scaffolding/src/test/groovy/grails/plugin/scaffolding/GeneratedControllerRedirectSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-scaffolding/src/test/groovy/grails/plugin/scaffolding/redirect/Fixtures.groovy (57%)
create mode 100644 grails-spring-security/oauth2/plugin/src/integration-test/groovy/grails/plugin/springsecurity/oauth2/SpringSecurityOauth2BaseServiceSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/hyphenated/grails-app/controllers/hyphenated/CityGuidesController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/hyphenated/grails-app/controllers/hyphenated/LinkPageController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/hyphenated/grails-app/controllers/hyphenated/backoffice/GuideLedgerController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/hyphenated/grails-app/controllers/hyphenated/backoffice/TourDeskController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/hyphenated/grails-app/domain/hyphenated/TourGuide.groovy (62%)
create mode 100644 grails-test-examples/hyphenated/grails-app/views/links/guideLinks.gsp
create mode 100644 grails-test-examples/hyphenated/src/integration-test/groovy/hyphenated/HyphenatedLinkResolutionSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/AssessmentController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/AuthorController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/GadgetController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/HomeController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/MoviesController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/admin/AuthorController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/admin/GadgetReportController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/archive/ItemController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/catalog/ItemController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/manage/DashboardController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/controllers/namespaces/manage/ManageAssessmentController.groovy (63%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/Assessment.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/Film.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/Gadget.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/Screening.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/archive/Item.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/domain/namespaces/catalog/Item.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/grails-app/services/namespaces/LinkFixtureService.groovy (58%)
create mode 100644 grails-test-examples/namespaces/grails-app/views/links/methodLinks.gsp
create mode 100644 grails-test-examples/namespaces/grails-app/views/links/resourceLinks.gsp
create mode 100644 grails-test-examples/namespaces/src/integration-test/groovy/namespaces/LinkResolutionSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/namespaces/src/main/groovy/namespaces/ReportBase.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/scaffolding-fields/grails-app/controllers/scaffoldingfields/CrewController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/scaffolding-fields/grails-app/controllers/scaffoldingfields/DeckhandsController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/scaffolding-fields/grails-app/domain/scaffoldingfields/Crew.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/scaffolding-fields/grails-app/domain/scaffoldingfields/Sailor.groovy (62%)
create mode 100644 grails-test-examples/scaffolding-fields/src/integration-test/groovy/scaffoldingfields/RenamedScaffoldLinksSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/conf/spring/resources.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/controllers/functional/tests/PapersController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/controllers/functional/tests/PeriodicalsController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/controllers/functional/tests/PublishersController.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/domain/functional/tests/Journal.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/domain/functional/tests/Magazine.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/domain/functional/tests/Publisher.groovy (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/views/periodicals/index.gson (62%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-test-examples/views-functional-tests/grails-app/views/periodicals/show.gson (62%)
create mode 100644 grails-test-examples/views-functional-tests/src/integration-test/groovy/functional/tests/RenamedControllerHalLinksSpec.groovy
create mode 100644 grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerRedirectTargetSpec.groovy
create mode 100644 grails-test-suite-uber/src/test/groovy/org/grails/web/mapping/RestfulControllerResourceLinkSpec.groovy
create mode 100644 grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToControllerInDefaultNamespaceSpec.groovy
create mode 100644 grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToControllerInOtherNamespaceSpec.groovy
create mode 100644 grails-views-gson/src/test/groovy/grails/plugin/json/view/HalCollectionLinkSpec.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-views-gson/src/test/groovy/grails/plugin/json/view/hallinks/Fixtures.groovy (66%)
create mode 100644 grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorResourceControllerSpec.groovy
create mode 100644 grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/ReverseMappingPrecedenceSpec.groovy
create mode 100644 grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/domainlink/DomainLinkFixtures.groovy
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/domainlink/archive/ItemController.groovy (64%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/domainlink/archive/PamphletsController.groovy (64%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/domainlink/catalog/ItemController.groovy (66%)
copy grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy => grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/domainlink/print/PamphletsController.groovy (66%)
copy {grails-core => grails-web-url-mappings}/src/test/resources/logback-test.xml (100%)
delete mode 100644 grails-web-url-mappings/src/test/resources/simplelogger.properties
(grails-core) 01/02: Merge 8.1.x into 9.0.x
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit aaa9403a420510398283748f19099319ea3ae2fc
Merge: ce68e05de3 c4d5f26feb
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Tue Sep 29 20:04:35 2026 -0400
Merge 8.1.x into 9.0.x
# Conflicts:
# dependencies.gradle
# grails-core/src/main/groovy/grails/boot/GrailsBanner.groovy
# grails-core/src/main/groovy/grails/config/external/WriterFilteringMap.groovy
# grails-core/src/main/groovy/grails/util/AbstractTypeConvertingMap.java
# grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy
# grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/dirty/checking/DirtyCheckingList.groovy
# grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
# grails-geb/src/testFixtures/java/grails/plugin/geb/ThreadLocalPropertyScope.java
# grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3RenderViewMutatorSpec.groovy
# grails-gsp/grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageAttributesTests.groovy
# grails-spring-security/oauth2/plugin/grails-app/services/grails/plugin/springsecurity/oauth2/SpringSecurityOauth2BaseService.groovy
# grails-testing-support-core/src/main/groovy/org/grails/testing/ParameterizedGrailsUnitTest.groovy
# grails-testing-support-mongodb/src/main/groovy/org/apache/grails/testing/mongo/StartMongoGrailsUnitExtension.groovy
# grails-validation/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy
.agents/skills/gradle-developer/SKILL.md | 16 +-
.github/workflows/gradle.yml | 38 ++
.github/workflows/release.yml | 2 +
AGENTS.md | 2 +
DEVELOPMENT.md | 13 +
build-logic/docs-core/build.gradle | 2 +
.../gradle/tasks/bom/PropertyNameCalculator.groovy | 9 +-
.../tasks/bom/PropertyNameCalculatorSpec.groovy | 104 +++
build-logic/plugins/build.gradle | 6 +
.../org/apache/grails/buildsrc/GradleUtils.groovy | 38 ++
.../GrailsBomPropertyValidatorPlugin.groovy | 161 +++++
.../GrailsDependencyValidatorPlugin.groovy | 56 +-
.../grails/buildsrc/ParentBomVersions.groovy | 151 +++++
.../org/apache/grails/buildsrc/PomVersions.groovy | 136 ++++
.../buildsrc/ValidateBomPropertiesTask.groovy | 215 ++++++
.../apache/grails/buildsrc/GradleUtilsSpec.groovy | 50 ++
.../GrailsBomPropertyValidatorPluginSpec.groovy | 62 ++
.../buildsrc/ValidateBomPropertiesTaskSpec.groovy | 466 +++++++++++++
.../ValidateDependencyVersionsTaskSpec.groovy | 143 ++++
build.gradle | 23 +
dependencies.gradle | 64 +-
end-to-end/agent-skills-plain-build/build.gradle | 2 +-
end-to-end/agent-skills/build.gradle | 2 +-
.../spring-dependency-management/build.gradle | 4 +-
gradle.properties | 4 +-
gradle/test-config.gradle | 2 +-
grails-bom/base/build.gradle | 3 +
grails-bom/default/build.gradle | 3 +
grails-bom/hibernate5/build.gradle | 3 +
grails-bom/hibernate7/build.gradle | 3 +
grails-bom/neo4j/build.gradle | 3 +
.../main/groovy/grails/artefact/Controller.groovy | 29 +-
.../grails/artefact/ControllerRedirectSpec.groovy | 81 ++-
.../main/groovy/grails/boot/GrailsBanner.groovy | 4 +-
.../config/external/WriterFilteringMap.groovy | 5 +-
.../grails/util/AbstractTypeConvertingMap.java | 10 +-
.../config/external/WriteFilteringMapSpec.groovy | 44 ++
.../orm/hibernate/HibernateGormStaticApi.groovy | 6 +-
.../compiler/HibernateEntityTransformation.groovy | 2 +-
.../grails/gorm/tests/ManagedEntitySaveSpec.groovy | 64 ++
.../HibernateEntityTransformationSpec.groovy | 20 +
grails-data-neo4j/core/build.gradle | 2 +-
.../groovy/grails/gorm/DetachedCriteria.groovy | 70 +-
.../query/criteria/AbstractDetachedCriteria.groovy | 72 +-
.../compiler/gorm/GormEntityTransformSpec.groovy | 4 +-
.../NestedCriteriaCompileStaticSpec.groovy | 663 ++++++++++++++++++
.../groovy/grails/gorm/rx/DetachedCriteria.groovy | 74 +-
.../org/grails/gorm/rx/api/RxGormStaticApi.groovy | 10 +-
.../grails/gorm/rx/DetachedCriteriaSpec.groovy | 32 +
.../dirty/checking/DirtyCheckingList.groovy | 4 +-
.../mapping/reflect/ClassPropertyFetcher.java | 1 -
.../reflect/ClassPropertyFetcherTests.groovy | 35 +
grails-doc/src/en/guide/REST/hypermedia/hal.adoc | 2 +-
.../extendingRestfulController.adoc | 2 +-
.../src/en/guide/REST/versioningResources.adoc | 2 +-
.../gradleBuild/gradleDependencies.adoc | 2 +
.../src/en/guide/gettingStarted/agentSkills.adoc | 6 +-
grails-doc/src/en/guide/scaffolding.adoc | 3 +
.../urlmappings/namespacedControllers.adoc | 14 +-
.../theWebLayer/urlmappings/restfulMappings.adoc | 64 ++
.../src/en/guide/upgrading/upgrading80x.adoc | 128 +++-
grails-fields/build.gradle | 1 +
.../plugin/formfields/FormFieldsTagLib.groovy | 16 +-
.../formfields/BeanPropertyAccessorImpl.groovy | 6 +
.../formfields/BeanPropertyAccessorImplSpec.groovy | 81 +++
.../taglib/AssociationLinkTargetSpec.groovy | 106 +++
.../plugin/geb/ThreadLocalPropertyScopeSpec.groovy | 58 ++
.../plugin/geb/ThreadLocalPropertyScope.java | 7 +-
grails-gradle/bom/build.gradle | 3 +
.../gradle/plugin/bom/BomManagedVersions.groovy | 31 +-
.../bom/BomOverrideResolutionFunctionalSpec.groovy | 9 +-
.../bom-override-resolution/build.gradle | 6 +
.../org/example/grouplib/1.0.0/grouplib-1.0.0.pom | 9 +
.../org/example/grouplib/2.0.0/grouplib-2.0.0.pom | 9 +
.../org/example/test-bom/1.0.0/test-bom-1.0.0.pom | 10 +-
.../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy | 5 +-
...OnSiteMeshViewResolverIntegrationCondition.java | 53 --
.../Sitemesh3RenderViewMutatorSpec.groovy | 4 +-
.../org/grails/taglib/GroovyPageAttributes.java | 16 +
.../grails/taglib/GroovyPageAttributesTests.groovy | 39 +-
.../templates/artifacts/RestfulController.groovy | 2 +-
.../render/util/AbstractLinkingRenderer.groovy | 2 +-
grails-scaffolding/build.gradle | 3 +
.../templates/scaffolding/AsyncController.groovy | 4 +-
.../main/templates/scaffolding/Controller.groovy | 4 +-
.../GeneratedAsyncControllerRedirectSpec.groovy | 38 +-
.../GeneratedControllerRedirectSpec.groovy | 101 +++
.../plugin/scaffolding/redirect/Fixtures.groovy | 39 +-
.../developer/skills/grails-developer/SKILL.md | 2 +-
.../skills/grails-8-upgrade/SKILL.md | 23 +-
.../oauth2/SpringSecurityOauth2BaseService.groovy | 1 +
.../SpringSecurityOauth2BaseServiceSpec.groovy | 46 ++
grails-test-examples/hyphenated/build.gradle | 1 +
.../hyphenated/CityGuidesController.groovy | 21 +-
.../hyphenated/LinkPageController.groovy | 21 +-
.../backoffice/GuideLedgerController.groovy | 22 +-
.../backoffice/TourDeskController.groovy | 22 +-
.../grails-app/domain/hyphenated/TourGuide.groovy | 21 +-
.../grails-app/views/links/guideLinks.gsp | 30 +
.../hyphenated/HyphenatedLinkResolutionSpec.groovy | 92 +++
grails-test-examples/namespaces/build.gradle | 1 +
.../grails-app/controllers/UrlMappings.groovy | 12 +
.../namespaces/AssessmentController.groovy | 22 +-
.../controllers/namespaces/AuthorController.groovy | 20 +-
.../controllers/namespaces/GadgetController.groovy | 20 +-
.../controllers/namespaces/HomeController.groovy | 30 +-
.../controllers/namespaces/MoviesController.groovy | 20 +-
.../namespaces/admin/AuthorController.groovy | 20 +-
.../namespaces/admin/GadgetReportController.groovy | 26 +-
.../namespaces/admin/PageController.groovy | 21 +
.../namespaces/archive/ItemController.groovy | 25 +-
.../namespaces/catalog/ItemController.groovy | 23 +-
.../namespaces/manage/DashboardController.groovy | 25 +-
.../manage/ManageAssessmentController.groovy | 26 +-
.../grails-app/domain/namespaces/Assessment.groovy | 20 +-
.../grails-app/domain/namespaces/Film.groovy | 20 +-
.../grails-app/domain/namespaces/Gadget.groovy | 20 +-
.../grails-app/domain/namespaces/Screening.groovy | 21 +-
.../domain/namespaces/archive/Item.groovy | 24 +-
.../domain/namespaces/catalog/Item.groovy | 20 +-
.../services/namespaces/LinkFixtureService.groovy | 28 +-
.../grails-app/views/links/methodLinks.gsp | 28 +
.../grails-app/views/links/resourceLinks.gsp | 44 ++
.../groovy/namespaces/LinkResolutionSpec.groovy | 216 ++++++
.../src/main/groovy/namespaces/ReportBase.groovy | 24 +-
.../scaffolding-fields/build.gradle | 1 +
.../scaffoldingfields/CrewController.groovy | 22 +-
.../scaffoldingfields/DeckhandsController.groovy | 25 +-
.../domain/scaffoldingfields/Crew.groovy | 21 +-
.../domain/scaffoldingfields/Sailor.groovy | 21 +-
.../RenamedScaffoldLinksSpec.groovy | 118 ++++
.../grails-app/conf/spring/resources.groovy | 25 +-
.../functional/tests/PapersController.groovy | 25 +-
.../functional/tests/PeriodicalsController.groovy | 24 +-
.../functional/tests/PublishersController.groovy | 21 +-
.../functional/tests/UrlMappings.groovy | 3 +
.../domain/functional/tests/Journal.groovy | 22 +-
.../domain/functional/tests/Magazine.groovy | 22 +-
.../domain/functional/tests/Publisher.groovy | 21 +-
.../grails-app/views/periodicals/index.gson | 24 +-
.../grails-app/views/periodicals/show.gson | 24 +-
.../tests/RenamedControllerHalLinksSpec.groovy | 102 +++
grails-test-suite-uber/build.gradle | 2 +-
.../RestfulControllerRedirectTargetSpec.groovy | 119 ++++
.../RestfulControllerResourceLinkSpec.groovy | 156 +++++
...directToControllerInDefaultNamespaceSpec.groovy | 48 ++
...RedirectToControllerInOtherNamespaceSpec.groovy | 67 ++
.../servlet/mvc/alpha/NamespacedController.groovy | 4 +
.../servlet/mvc/beta/NamespacedController.groovy | 4 +
.../testing/ParameterizedGrailsUnitTest.groovy | 1 +
.../mongo/StartMongoGrailsUnitExtension.groovy | 2 +-
.../grails/validation/ValidateableTraitSpec.groovy | 6 +-
.../view/api/internal/DefaultHalViewHelper.groovy | 5 +-
.../plugin/json/view/HalCollectionLinkSpec.groovy | 58 ++
.../plugin/json/view/hallinks/Fixtures.groovy | 29 +-
grails-web-url-mappings/build.gradle | 3 +-
.../groovy/grails/web/mapping/LinkGenerator.java | 13 +-
.../grails/web/mapping/CachingLinkGenerator.java | 67 +-
.../grails/web/mapping/DefaultLinkGenerator.groovy | 751 +++++++++++++++++----
.../web/mapping/DefaultUrlMappingsHolder.java | 2 +-
.../web/mapping/CachingLinkGeneratorSpec.groovy | 106 ++-
.../LinkGeneratorNamespaceInferenceSpec.groovy | 85 ++-
.../LinkGeneratorResourceControllerSpec.groovy | 674 ++++++++++++++++++
.../grails/web/mapping/LinkGeneratorSpec.groovy | 6 +-
.../mapping/ReverseMappingPrecedenceSpec.groovy | 150 ++++
.../mapping/UrlMappingsWithHttpMethodSpec.groovy | 46 ++
.../mapping/domainlink/DomainLinkFixtures.groovy | 370 ++++++++++
.../domainlink/archive/ItemController.groovy | 31 +-
.../domainlink/archive/PamphletsController.groovy | 26 +-
.../domainlink/catalog/ItemController.groovy | 30 +-
.../domainlink/print/PamphletsController.groovy | 24 +-
.../src/test/resources/logback-test.xml | 22 +
.../src/test/resources/simplelogger.properties | 20 -
173 files changed, 7138 insertions(+), 1271 deletions(-)
diff --cc dependencies.gradle
index e8dbe7711a,1a12637f0b..ec28016cbf
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@@ -198,21 -191,16 +194,21 @@@ ext
'groovy-xml' : "org.apache.groovy:groovy-xml:${bomDependencyVersions['groovy.version']}",
'groovy-yaml' : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
'guava' : "com.google.guava:guava:${bomDependencyVersions['guava.version']}",
+ // Security override of spring-boot-dependencies - see httpcore5.version
+ 'httpcore5' : "org.apache.httpcomponents.core5:httpcore5:${bomDependencyVersions['httpcore5.version']}",
+ 'httpcore5-h2' : "org.apache.httpcomponents.core5:httpcore5-h2:${bomDependencyVersions['httpcore5.version']}",
// Security override of the 2.21.5 spring-boot-dependencies imports through
- // com.fasterxml.jackson:jackson-bom - see jackson2.version. groovy-yaml 6.0.0
- // com.fasterxml.jackson:jackson-bom - see jackson-2-bom.version
++ // com.fasterxml.jackson:jackson-bom - see jackson-2-bom.version. groovy-yaml 6.0.0
+ // also pulls jackson-dataformat-yaml, so the BOM must manage it at >= the resolved version.
'jackson2-annotations' : "com.fasterxml.jackson.core:jackson-annotations:${bomDependencyVersions['jackson2-annotations.version']}",
- 'jackson2-core' : "com.fasterxml.jackson.core:jackson-core:${bomDependencyVersions['jackson2.version']}",
- 'jackson2-databind' : "com.fasterxml.jackson.core:jackson-databind:${bomDependencyVersions['jackson2.version']}",
- 'jackson2-dataformat-yaml' : "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${bomDependencyVersions['jackson2.version']}",
- 'jackson2-datatype-jsr310' : "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${bomDependencyVersions['jackson2.version']}",
+ 'jackson-2-bom-core' : "com.fasterxml.jackson.core:jackson-core:${bomDependencyVersions['jackson-2-bom.version']}",
+ 'jackson-2-bom-databind' : "com.fasterxml.jackson.core:jackson-databind:${bomDependencyVersions['jackson-2-bom.version']}",
++ 'jackson-2-bom-dataformat-yaml': "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${bomDependencyVersions['jackson-2-bom.version']}",
+ 'jackson-2-bom-datatype-jsr310': "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${bomDependencyVersions['jackson-2-bom.version']}",
// Security override of the 3.1.5 spring-boot-dependencies imports through
- // tools.jackson:jackson-bom - see jackson3.version
- 'jackson3-core' : "tools.jackson.core:jackson-core:${bomDependencyVersions['jackson3.version']}",
- 'jackson3-databind' : "tools.jackson.core:jackson-databind:${bomDependencyVersions['jackson3.version']}",
+ // tools.jackson:jackson-bom - see jackson-bom.version
+ 'jackson-bom-core' : "tools.jackson.core:jackson-core:${bomDependencyVersions['jackson-bom.version']}",
+ 'jackson-bom-databind' : "tools.jackson.core:jackson-databind:${bomDependencyVersions['jackson-bom.version']}",
'jquery' : "org.webjars.npm:jquery:${bomDependencyVersions['jquery.version']}",
// Security override of the transitive 1.5.38 - see logback.version
'logback-classic' : "ch.qos.logback:logback-classic:${bomDependencyVersions['logback.version']}",
@@@ -264,6 -252,30 +260,30 @@@
combinedDependencies = gradleBomDependencies + bomDependencies
combinedVersions = gradleBomDependencyVersions + bomDependencyVersions
+ // The third-party BOM every Grails BOM inherits from. validateBomProperties checks each Grails BOM's
+ // published POM against it: a version the parent also manages must be declared under the parent's
+ // property name, and must differ from the parent's version.
+ parentBoms = [gradleBomPlatformDependencies['spring-boot-bom']]
+
+ // Deliberate exceptions to validateBomProperties; each one needs its reason here.
+ bomUnusedVersionExemptions = [
+ // Read directly by build-logic and grails-gradle-plugins, and kept out of the published
+ // BOMs on purpose - see grails-gradle/plugins/build.gradle.
+ 'maven-model.version',
+ ]
+ bomPropertyNameExemptions = [
+ // jackson-annotations has had no patch releases since 2.20, so it cannot share
+ // jackson-2-bom.version with the rest of the Jackson 2 family it is pinned alongside.
+ 'jackson2-annotations.version',
+ // The Gradle BOM tracks the Groovy 4 line Gradle embeds, while groovy.version is the
- // application's Groovy 5 line; both live in combinedVersions, so they cannot share a name.
++ // application's Groovy 6 line; both live in combinedVersions, so they cannot share a name.
+ 'gradle-groovy.version',
+ ]
+ bomRedundantVersionExemptions = [
+ // Kept equal to Spring Boot's on purpose - see graphql-java.version
+ 'graphql-java.version',
+ ]
+
// Defaults for per-BOM overrides; populated in the if/else blocks below
customBomVersions = [:]
customBomDependencies = [:]
diff --cc grails-fields/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy
index e8881f4d4c,ad23beda13..3d20171147
--- a/grails-fields/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy
+++ b/grails-fields/src/main/groovy/grails/plugin/formfields/BeanPropertyAccessorImpl.groovy
@@@ -40,18 -40,15 +40,24 @@@ import org.grails.datastore.mapping.mod
import org.grails.datastore.mapping.model.PersistentProperty
import org.grails.scaffolding.model.property.Constrained
+// Groovy 6.0.0-beta-2: @Canonical no longer auto-generates @MapConstructor
+// under @CompileStatic, so the named-argument call site in
+// `BeanPropertyAccessorFactory.resolvePropertyFromPath` (`new BeanPropertyAccessorImpl(params)`)
+// can't bind to a constructor and the compiler reports
+// "Target constructor for constructor call expression hasn't been set".
+// Declaring @MapConstructor explicitly restores the Groovy 4 / 5 behaviour
+// without changing the positional @TupleConstructor or @Canonical-generated
+// toString / equals / hashCode contract.
@CompileStatic
@Canonical
+@MapConstructor
@TupleConstructor(includes = ['beanType', 'propertyName', 'propertyType'])
+ // The map constructor is declared rather than left to @TupleConstructor. Groovy 5 adds a
+ // LinkedHashMap constructor only because the first declared property, rootBean, is an Object
+ // that `includes` leaves out; Groovy 6 decides from the included properties and adds none, so
+ // new BeanPropertyAccessorImpl(params) in BeanPropertyAccessorFactory would no longer compile.
+ // With @MapConstructor both versions generate the same BeanPropertyAccessorImpl(Map).
+ @MapConstructor
class BeanPropertyAccessorImpl implements BeanPropertyAccessor {
Object rootBean
(grails-core) 02/02: Remove the redundant httpcore5 pin
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit f32657939b284babfc09afaa324d6e6dff3e3389
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Tue Sep 29 20:13:43 2026 -0400
Remove the redundant httpcore5 pin
Spring Boot 4.1.1 manages httpcore5 at 5.4.3, the version the pin set, so
validateBomProperties rejects it after merging 8.1.x. 8.0.x removed the
same pin in ecf1615df0.
---
dependencies.gradle | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index ec28016cbf..97480cbcfa 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -86,8 +86,6 @@ ext {
'graphql-java-extended-scalars.version': '24.0',
'groovy.version' : '6.0.0',
'guava.version' : '33.7.1-jre',
- // Security: overrides spring-boot-dependencies (5.4.2). 5.4.3 fixes CVE-2026-54399 (httpcore5) and CVE-2026-54428 (httpcore5-h2).
- 'httpcore5.version' : '5.4.3',
// Groovy YAML 6.0.0 requires Jackson 2.22.x, and 2.22.2 also overrides the
// 2.21.5 Spring Boot 4.1 manages: it adds the StreamReadConstraints length limit to
// GregorianCalendar/Duration (CVE-2026-68497) and restricts the URI schemes
@@ -194,9 +192,6 @@ ext {
'groovy-xml' : "org.apache.groovy:groovy-xml:${bomDependencyVersions['groovy.version']}",
'groovy-yaml' : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
'guava' : "com.google.guava:guava:${bomDependencyVersions['guava.version']}",
- // Security override of spring-boot-dependencies - see httpcore5.version
- 'httpcore5' : "org.apache.httpcomponents.core5:httpcore5:${bomDependencyVersions['httpcore5.version']}",
- 'httpcore5-h2' : "org.apache.httpcomponents.core5:httpcore5-h2:${bomDependencyVersions['httpcore5.version']}",
// Security override of the 2.21.5 spring-boot-dependencies imports through
// com.fasterxml.jackson:jackson-bom - see jackson-2-bom.version. groovy-yaml 6.0.0
// also pulls jackson-dataformat-yaml, so the BOM must manage it at >= the resolved version.