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/10/08 16:21:42 UTC

(grails-core) 01/01: Merge pull request #16547 from jdaugherty/fix/15840-config-merge-7.0.x

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 3ec69de7a2ea5fa14a93cfc4eb3393ea39e0faab
Merge: 3acc4032cf b92b61d8df
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Thu Oct 8 12:21:36 2026 -0400

    Merge pull request #16547 from jdaugherty/fix/15840-config-merge-7.0.x
    
    Fix configuration snapshot merges with Spring profile metadata

 .../groovy/org/grails/config/NavigableMap.groovy   |  42 --
 .../groovy/grails/config/NavigableMapSpec.groovy   |  21 +
 .../grails/config/SpringProfileExcludeSpec.groovy  | 173 --------
 .../config/yaml/YamlPropertySourceLoader.java      |  66 ++-
 .../grails/boot/GrailsAppYamlProfileSpec.groovy    | 100 +++++
 .../config/PropertySourcesConfigReloadSpec.groovy  | 220 ++++++++++
 .../config/YamlPropertySourceLoaderSpec.groovy     |  24 ++
 .../org/grails/config/YamlSpringProfileSpec.groovy | 463 +++++++++++++++++++++
 .../GroovyConfigPropertySourceLoaderSpec.groovy    |  50 +++
 grails-doc/src/en/guide/conf/config.adoc           |  31 ++
 .../externalconfig/ExternalConfigSpec.groovy       |  32 ++
 11 files changed, 1005 insertions(+), 217 deletions(-)