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/13 10:25:31 UTC
(grails-core) branch 7.2.x updated (36b45a4519 -> 93bc170840)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 7.2.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 36b45a4519 Merge branch '7.1.x' into 7.2.x
add e57bd1359a fix: preserve configuration snapshots when merging profile metadata
add 0aa7bf735f fix: support YAML profile expressions and multiple active profiles
add d6fd8ac1ee fix: handle blank YAML selectors and clarify Groovy profile semantics
add a643247dd2 fix: evaluate sequence-valued YAML profile selectors
add b92b61d8df fix: remove selected YAML profile selectors before Boot evaluates them
add 3ec69de7a2 Merge pull request #16547 from jdaugherty/fix/15840-config-merge-7.0.x
add c965fc4baa Build with Gradle 8.14.6
add dd59549883 Merge pull request #16622 from jdaugherty/deps/gradle-8.14.6
add 84f222b74d Merge branch '7.0.x' into 7.1.x
new 93bc170840 Merge branch '7.1.x' into 7.2.x
The 1 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:
.sdkmanrc | 2 +-
build-logic/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
.../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 ++
grails-forge/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
grails-forge/gradlew.bat | 0
.../templates/gradleWrapperProperties.rocker.raw | 2 +-
grails-gradle/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../skeleton/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../skeleton/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../externalconfig/ExternalConfigSpec.groovy | 32 ++
27 files changed, 1014 insertions(+), 226 deletions(-)
delete mode 100644 grails-bootstrap/src/test/groovy/grails/config/SpringProfileExcludeSpec.groovy
create mode 100644 grails-core/src/test/groovy/grails/boot/GrailsAppYamlProfileSpec.groovy
create mode 100644 grails-core/src/test/groovy/org/grails/config/PropertySourcesConfigReloadSpec.groovy
create mode 100644 grails-core/src/test/groovy/org/grails/config/YamlSpringProfileSpec.groovy
mode change 100644 => 100755 grails-forge/gradlew.bat
(grails-core) 01/01: Merge branch '7.1.x' into 7.2.x
Posted by jd...@apache.org.
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 93bc170840fe2be2bfa29dd6bfd7ae67a80df3f7
Merge: 36b45a4519 84f222b74d
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Tue Oct 13 11:22:09 2026 +0100
Merge branch '7.1.x' into 7.2.x
.sdkmanrc | 2 +-
build-logic/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
.../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 ++
grails-forge/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
grails-forge/gradlew.bat | 0
.../templates/gradleWrapperProperties.rocker.raw | 2 +-
grails-gradle/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../skeleton/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../skeleton/gradle/wrapper/gradle-wrapper.jar | Bin 43764 -> 44309 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../externalconfig/ExternalConfigSpec.groovy | 32 ++
27 files changed, 1014 insertions(+), 226 deletions(-)