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 3349f75c65e404cbdd5071eea150b9d654223603 Merge: bafd1ead6e d12be969f7 Author: James Daugherty <[email protected]> AuthorDate: Tue Apr 29 11:12:20 2025 -0400 Merge pull request #14678 from jdaugherty/external-config Import the external config plugin .../external/ExternalConfigRunListener.groovy | 181 ++++++++++++ .../config/external/WriterFilteringMap.groovy | 97 ++++++ .../src/main/resources/META-INF/spring.factories | 23 +- .../config/external/WriteFilteringMapSpec.groovy | 73 +++++ grails-doc/build.gradle | 5 +- .../guide/conf/config/externalConfiguration.adoc | 135 +++++++++ .../{ymlOptions.adoc => ymlPropertyOptions.adoc} | 4 +- grails-doc/src/en/guide/index.adoc | 2 +- grails-doc/src/en/guide/introduction/whatsNew.adoc | 5 + grails-doc/src/en/guide/toc.yml | 7 +- .../external-configuration/build.gradle | 83 ++++++ .../grails-app/conf/application.yml | 142 +++++++++ .../grails-app/conf/logback-spring.xml | 60 ++++ .../grails-app/conf/spring/resources.groovy | 25 ++ .../controllers/test/app/UrlMappings.groovy | 34 +++ .../grails-app/i18n/messages.properties | 69 +++++ .../grails-app/init/test/app/Application.groovy | 31 ++ .../grails-app/init/test/app/BootStrap.groovy | 29 ++ .../services/test/app/TestService.groovy | 30 ++ .../groovy/test/app/TestServiceGroovySpec.groovy | 66 +++++ .../test/app/TestServicePropertiesSpec.groovy | 41 +++ .../groovy/test/app/TestServiceSpec.groovy | 41 +++ .../groovy/test/app/TestServiceYamlSpec.groovy | 41 +++ .../resources/testResourceConfig.groovy | 24 ++ .../resources/testResourceConfig.properties | 19 ++ .../resources/testResourceConfig.yml | 17 ++ .../src/main/groovy/test/app/TestSingleton.groovy | 32 ++ .../src/main/resources/resourceConfig.yml | 17 ++ .../ConfigWithCanonicalParameter.groovy | 27 ++ .../ConfigWithEnvironmentBlock.groovy | 34 +++ .../ConfigWithSecondLevelCanonicalParameter.groovy | 26 ++ .../ConfigWithoutEnvironmentBlock.groovy | 27 ++ .../externalconfig/ExternalConfigSpec.groovy | 326 +++++++++++++++++++++ .../plugin/externalconfig/MergedConfigSpec.groovy | 83 ++++++ .../src/test/resources/externalConfig.groovy | 22 ++ .../src/test/resources/externalConfig.properties | 20 ++ .../src/test/resources/externalConfig.yml | 16 + .../test/resources/externalConfigEnvironments.yml | 23 ++ .../test/resources/externalConfigMultipleDocs.yml | 19 ++ .../externalConfigWithReferencedValue.groovy | 23 ++ .../externalConfigWithReferencedValue.properties | 22 ++ .../externalConfigWithReferencedValue.yml | 17 ++ .../src/test/resources/mergeExternalConfig.groovy | 24 ++ .../test/resources/mergeExternalConfig.properties | 20 ++ .../src/test/resources/mergeExternalConfig.yml | 17 ++ .../src/test/resources/mergeExternalConfig2.groovy | 25 ++ settings.gradle | 2 + 47 files changed, 2096 insertions(+), 10 deletions(-)
