This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a change to branch deps/micronaut-5.0.0
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from f49f4203a1 Merge branch '8.0.x' into deps/micronaut-5.0.0
add ca495ab528 feat: replace Spring Dependency Management plugin with
Gradle platform and lightweight BOM property overrides
add 531041ba92 Address review: add XInclude hardening and extract
interpolation depth constant
add 5e89656e46 fix: apply grails-bom platform to all declarable
configurations
add 1a2cea3467 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 30a46f6bc7 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 96fea95743 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 5607ddbb51 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 575b77f841 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add a4511eb3ab Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 28a68177da Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 77932f2e2f fix: allow Micronaut BOM validator to coexist with
plugin-injected platform
add 54fbe932fb fix: exclude annotation-processor configurations from
grails-bom platform
add 4d1bcdb0c9 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 90c12389f6 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add a2363aec1f Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add f0c1934444 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 2ca302b164 Extract BOM property overrides into a standalone Gradle
plugin (PR #15467 review)
add bbf5e5320c Fix GrailsDependencyValidatorPlugin to prefer
enforcedPlatform BOM
add 9204972468 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 0178a108c7 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add ba8459faea Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add e1f8fc8342 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 5a7e6be14e Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 5254097913 Address PR #15467 cosmetic review comments from matrei and
jdaugherty
add 7948432096 Apply matrei's wording suggestion for grails-bom intro
add e98b6a8068 Merge remote-tracking branch 'origin/8.0.x' into
feat/gradle-managed-version-overrides
add d67ef28405 Address review feedback: consolidate bom-property-overrides
+ def style + drop duplicates workaround
add 931a54b54a docs: document Spring DM removal in Grails 8 upgrade guide
add 48de2b8d0d Address final 3 review threads + drop last Spring DM
coupling
add 882932312e chore: remove accidentally-committed local cruft from
previous commit
add 7194c66660 Merge branch 'fix/8.0.x-merge-sb4-fallout' into
feat/gradle-managed-version-overrides
add b59ce4f404 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add abd68cd937 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add be2c6af006 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 545b847495 fix: correct BOM property-override edge cases found in
review
add f1c76ac9f4 docs: align BOM property-override docs with
strict-constraint behavior
add c2ac4a6948 style: apply Groovy idioms from PR review feedback
add 28302d4d3e Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 20f3304490 fix: parse BOM POMs with maven-model instead of custom XML
parsing
add f94480a184 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add bc933faa7a Use maven-model to parse BOM POMs for property overrides
add 6ef4ec203b Apply exactly one Grails BOM via a configurable grails.bom
property
add 59dcb7e586 Add example apps covering the legacy Spring Dependency
Management plugin
add 8cba52320a Restrict single-BOM detection to platform declarations
add f63f02897a Remove explanatory comment from the maven-model.version
entry
add 9bd7f11085 Merge branch '8.0.x' into
feat/gradle-managed-version-overrides
add 76f44f560e Merge remote-tracking branch 'origin/8.0.x' into
feat/gradle-managed-version-overrides
add 179ae7d39b fix: ignore documentation configuration when detecting the
project BOM
add 3be255b194 Merge pull request #15467 from
apache/feat/gradle-managed-version-overrides
add a2df81e649 Update Spring Boot 4.1 dependency versions
add 1c2d8a6485 Merge pull request #15727 from apache/deps/spring-boot-4.1.0
add c7f4064653 Fix ignored failOnError argument in DeleteEntityDataFetcher
add e66eebbc2b Merge branch '7.2.x' into fix/graphql-delete-failonerror
add f02220ec71 Merge branch '7.2.x' into fix/graphql-delete-failonerror
add cb9afdd16a Remove no-op failOnError argument from
DeleteEntityDataFetcher
add 0f4fe69053 Merge branch '7.2.x' into fix/graphql-delete-failonerror
add 9d1843747d Merge pull request #15692 from
apache/fix/graphql-delete-failonerror
add 616f03f91c scaffolding: parameterize @Scaffold superclass so
scaffold-service methods aren't type-erased
add 5b905ebeaf scaffolding: emit generic @Scaffold superclass signature
for the simple form + add tests
add b6e790eeef Merge pull request #15717 from
codeconsole/scaffold-generic-fix
add 134abe7a23 fix: Order milestone and release candidate versions in
VersionComparator
add edf2dda0f1 fix: Treat unknown version qualifiers as final release and
correct ordering docs
add 953c93ec16 Merge branch '7.0.x' into
fix/14058-plugin-compatibility-milestone-snapshot
add 839efa484d Merge branch '7.0.x' into
fix/14058-plugin-compatibility-milestone-snapshot
add cd75a0fec7 fix: Restore InvalidVersionException for malformed versions
in VersionComparator
add d01e3002a1 Set up default protection ruleset for default and release
branches
add 4f2953b097 [INFRA] Use Grails *.x version branch pattern for branch
protection
add c4cf1ea57d Merge pull request #15665 from
apache/infrastructure-ruleset-bot/default-branch-protection
add 6f0861bd70 Merge branch '7.0.x' into
fix/14058-plugin-compatibility-milestone-snapshot
add 9fb955f3ed Merge pull request #15696 from
apache/fix/14058-plugin-compatibility-milestone-snapshot
add 2241b12890 Update Spring Boot to 3.5.15
add 5c21bd0d8c Merge pull request #15728 from
apache/deps/spring-boot-3.5.15
add 4af0ab3e1e Merge origin/7.0.x into 7.1.x
add 07652254e8 Merge remote-tracking branch 'origin/7.1.x' into 7.2.x
add 7da662f8bd Merge branch '7.2.x' into 8.0.x
add db90e5c316 Merge branch '8.0.x' into deps/micronaut-5.0.0
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 12 +
build-logic/docs-core/build.gradle | 5 +-
.../tasks/bom/ExtractDependenciesTask.groovy | 129 +++---
.../GrailsDependencyValidatorPlugin.groovy | 55 ++-
.../GrailsDependencyValidatorPluginSpec.groovy | 98 ++++
dependencies.gradle | 7 +-
grails-bom/base/build.gradle | 2 +-
.../groovy/grails/plugins/VersionComparator.groovy | 225 ++++++---
.../grails/plugins/VersionComparatorSpec.groovy | 70 +++
.../grails/core/plugins/PluginUtilsSpec.groovy | 10 +
.../fetcher/impl/DeleteEntityDataFetcher.groovy | 2 +-
.../impl/DeleteEntityDataFetcherSpec.groovy | 14 +
.../gradleBuild/gradleDependencies.adoc | 77 +++-
.../src/en/guide/upgrading/upgrading80x.adoc | 109 ++++-
grails-gradle/plugins/build.gradle | 24 +-
.../gradle/plugin/bom/BomManagedVersions.groovy | 510 +++++++++++++++++++++
.../bom/BomPropertyOverridesExtension.groovy | 105 +++++
.../plugin/bom/BomPropertyOverridesPlugin.groovy | 208 +++++++++
.../gradle/plugin/core/GrailsExtension.groovy | 93 +++-
.../gradle/plugin/core/GrailsGradlePlugin.groovy | 225 ++++++++-
.../plugin/bom/BomManagedVersionsSpec.groovy | 95 ++++
.../bom/BomOverrideResolutionFunctionalSpec.groovy | 61 +++
...BomPropertyOverridesPluginFunctionalSpec.groovy | 51 +++
.../bom/BomPropertyOverridesPluginSpec.groovy | 143 ++++++
.../plugin/core/BomOptOutFunctionalSpec.groovy | 48 ++
.../plugin/core/BomPlatformFunctionalSpec.groovy | 68 +++
.../gradle/plugin/core/GrailsExtensionSpec.groovy | 128 ++++++
.../src/test/resources/test-poms/test-bom.pom | 51 +++
.../auto-apply-bom-disabled/build.gradle | 23 +
.../gradle.properties | 0
.../grails-app/conf/application.yml | 2 +
.../auto-apply-bom-disabled/settings.gradle | 1 +
.../bom-override-resolution/build.gradle | 39 ++
.../example/child-bom/1.0.0/child-bom-1.0.0.pom | 23 +
.../example/child-bom/2.0.0/child-bom-2.0.0.pom | 23 +
.../org/example/childlib/1.0.0/childlib-1.0.0.pom | 9 +
.../org/example/childlib/2.0.0/childlib-2.0.0.pom | 9 +
.../org/example/mylib/1.0.0/mylib-1.0.0.pom | 9 +
.../org/example/mylib/2.0.0/mylib-2.0.0.pom | 9 +
.../org/example/test-bom/1.0.0/test-bom-1.0.0.pom | 32 ++
.../bom-override-resolution/settings.gradle | 1 +
.../test-projects/bom-platform-basic/build.gradle | 19 +
.../gradle.properties | 0
.../grails-app/conf/application.yml | 2 +
.../bom-platform-basic/settings.gradle | 1 +
.../test-projects/bom-platform-manual/build.gradle | 42 ++
.../gradle.properties | 0
.../grails-app/conf/application.yml | 2 +
.../bom-platform-manual/settings.gradle | 1 +
.../bom-property-overrides-basic/build.gradle | 22 +
.../bom-property-overrides-basic/gradle.properties | 1 +
.../bom-property-overrides-basic/settings.gradle | 1 +
.../templates/grailsCentralPublishing.gradle | 2 +-
.../scaffolding/ScaffoldingServiceInjector.groovy | 12 +-
.../ScaffoldingServiceInjectorSpec.groovy | 159 +++++++
grails-shell-cli/build.gradle | 6 +-
.../gsp-spring-boot/app/build.gradle | 31 +-
.../app/src/main/resources/application.properties | 4 +
.../app/src/test/java/hello/WebControllerTest.java | 67 +++
.../spring-dependency-management/build.gradle | 76 +++
.../grails-app/conf/application.yml | 21 +-
.../grails-app/controllers}/UrlMappings.groovy | 6 +-
.../controllers/springdm/HelloController.groovy} | 6 +-
.../grails-app/init/springdm}/Application.groovy | 2 +-
.../grails-app/views}/error.gsp | 5 +-
.../grails-app/views}/index.gsp | 12 +-
.../grails-app/views/notFound.gsp} | 7 +-
.../groovy/springdm/HelloControllerSpec.groovy} | 23 +-
settings.gradle | 6 +-
69 files changed, 3105 insertions(+), 236 deletions(-)
create mode 100644
build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsDependencyValidatorPluginSpec.groovy
create mode 100644
grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/bom/BomManagedVersions.groovy
create mode 100644
grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/bom/BomPropertyOverridesExtension.groovy
create mode 100644
grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/bom/BomPropertyOverridesPlugin.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/bom/BomManagedVersionsSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/bom/BomOverrideResolutionFunctionalSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/bom/BomPropertyOverridesPluginFunctionalSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/bom/BomPropertyOverridesPluginSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/BomOptOutFunctionalSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/BomPlatformFunctionalSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/GrailsExtensionSpec.groovy
create mode 100644
grails-gradle/plugins/src/test/resources/test-poms/test-bom.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/auto-apply-bom-disabled/build.gradle
copy
grails-gradle/plugins/src/test/resources/test-projects/{fork-settings-custom =>
auto-apply-bom-disabled}/gradle.properties (100%)
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/auto-apply-bom-disabled/grails-app/conf/application.yml
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/auto-apply-bom-disabled/settings.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/build.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/child-bom/1.0.0/child-bom-1.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/child-bom/2.0.0/child-bom-2.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/childlib/1.0.0/childlib-1.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/childlib/2.0.0/childlib-2.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/mylib/1.0.0/mylib-1.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/mylib/2.0.0/mylib-2.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/maven-repo/org/example/test-bom/1.0.0/test-bom-1.0.0.pom
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-override-resolution/settings.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-basic/build.gradle
copy
grails-gradle/plugins/src/test/resources/test-projects/{fork-settings-custom =>
bom-platform-basic}/gradle.properties (100%)
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-basic/grails-app/conf/application.yml
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-basic/settings.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-manual/build.gradle
copy
grails-gradle/plugins/src/test/resources/test-projects/{fork-settings-custom =>
bom-platform-manual}/gradle.properties (100%)
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-manual/grails-app/conf/application.yml
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-platform-manual/settings.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-property-overrides-basic/build.gradle
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-property-overrides-basic/gradle.properties
create mode 100644
grails-gradle/plugins/src/test/resources/test-projects/bom-property-overrides-basic/settings.gradle
create mode 100644
grails-scaffolding/src/test/groovy/org/grails/compiler/scaffolding/ScaffoldingServiceInjectorSpec.groovy
create mode 100644
grails-test-examples/gsp-spring-boot/app/src/test/java/hello/WebControllerTest.java
create mode 100644
grails-test-examples/spring-dependency-management/build.gradle
copy grails-test-examples/{micronaut-groovy-only =>
spring-dependency-management}/grails-app/conf/application.yml (83%)
copy grails-test-examples/{config-report/grails-app/controllers/configreport
=> spring-dependency-management/grails-app/controllers}/UrlMappings.groovy (92%)
copy
grails-test-examples/{app2/grails-app/controllers/app2/ErrorsController.groovy
=>
spring-dependency-management/grails-app/controllers/springdm/HelloController.groovy}
(89%)
copy grails-test-examples/{plugins/exploded/grails-app/init/exploded =>
spring-dependency-management/grails-app/init/springdm}/Application.groovy (98%)
mode change 100755 => 100644
copy grails-test-examples/{app1/grails-app/views/contentNegotiation =>
spring-dependency-management/grails-app/views}/error.gsp (89%)
copy grails-test-examples/{gsp-layout/grails-app/views/tagLib =>
spring-dependency-management/grails-app/views}/index.gsp (73%)
copy grails-test-examples/{app1/grails-app/views/contentNegotiation/error.gsp
=> spring-dependency-management/grails-app/views/notFound.gsp} (87%)
copy
grails-test-examples/{app1/src/integration-test/groovy/functionaltests/AtResourceSpec.groovy
=>
spring-dependency-management/src/integration-test/groovy/springdm/HelloControllerSpec.groovy}
(56%)
