You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2026/04/24 14:44:09 UTC
(grails-core) 01/01: Merge pull request #15574 from apache/align-cli-conf-output
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5efadac62da74e5ef07cf4f6026adb6d8be717d9
Merge: 31555d7c43 fa1d3576b3
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Fri Apr 24 09:44:04 2026 -0500
Merge pull request #15574 from apache/align-cli-conf-output
Cleanup and align `application.yml` in generated applications
.../src/en/guide/upgrading/upgrading60x.adoc | 40 +++++++++++++++
.../org/grails/forge/feature/view/GrailsGsp.java | 4 --
.../grails/forge/feature/view/json/ViewJson.java | 1 -
.../forge/feature/view/markup/ViewMarkup.java | 1 -
.../org/grails/forge/feature/web/GrailsWeb.java | 7 ---
.../grails/forge/feature/view/GrailsGspSpec.groovy | 4 --
.../forge/feature/view/json/ViewJsonSpec.groovy | 1 -
.../grails/forge/feature/web/GrailsWebSpec.groovy | 12 -----
.../base/skeleton/grails-app/conf/application.yml | 43 ++--------------
.../skeleton/grails-app/conf/application.yml | 15 ------
.../web/skeleton/grails-app/conf/application.yml | 20 --------
.../app1/grails-app/conf/application.yml | 26 +---------
.../app2/grails-app/conf/application.yml | 25 ----------
.../app3/grails-app/conf/application.yml | 18 -------
.../grails-app/conf/application.yml | 11 -----
.../cache/grails-app/conf/application.yml | 48 +-----------------
.../datasources/grails-app/conf/application.yml | 27 +---------
.../demo33/grails-app/conf/application.yml | 53 +-------------------
.../exploded/grails-app/conf/application.yml | 28 +----------
.../grails-app/conf/application.yml | 35 +------------
.../test/app/ConfigurationPrioritySpec.groovy | 2 +-
.../test/app/EnvironmentConfigurationSpec.groovy | 28 +++--------
.../geb-gebconfig/grails-app/conf/application.yml | 13 -----
.../geb/grails-app/conf/application.yml | 13 -----
.../gorm/grails-app/conf/application.yml | 28 +----------
.../gsp-layout/grails-app/conf/application.yml | 13 -----
.../gsp-sitemesh3/grails-app/conf/application.yml | 13 -----
.../grails-app/conf/application.yml | 8 ---
.../grails-app/conf/application.yml | 13 -----
.../grails-app/conf/application.yml | 20 +-------
.../grails-app/conf/application.yml | 20 +-------
.../grails-app/conf/application.yml | 20 +-------
.../grails-app/conf/application.yml | 8 ---
.../grails-app/conf/application.yml | 20 +-------
.../grails-app/conf/application.yml | 28 ++---------
.../issue450/grails-app/conf/application.yml | 18 -------
.../hyphenated/grails-app/conf/application.yml | 32 +-----------
.../issue-11102/grails-app/conf/application.yml | 44 +----------------
.../issue-11767/grails-app/conf/application.yml | 8 ---
.../issue-15228/grails-app/conf/application.yml | 8 ---
.../grails-app/conf/application.yml | 27 +---------
.../grails-app/conf/application.yml | 34 -------------
.../grails-app/conf/application.yml | 43 ----------------
.../micronaut/grails-app/conf/application.yml | 50 -------------------
.../mongodb/base/grails-app/conf/application.yml | 38 ++++-----------
.../grails-app/conf/application.yml | 29 ++---------
.../gson-templates/grails-app/conf/application.yml | 29 +----------
.../hibernate5/grails-app/conf/application.yml | 20 +-------
.../grails-app/conf/application.yml | 31 ------------
.../namespaces/grails-app/conf/application.yml | 28 +----------
.../exploded/grails-app/conf/application.yml | 43 +---------------
.../groovy/exploded/PluginDependencySpec.groovy | 2 +-
.../issue11005/grails-app/conf/application.yml | 43 +---------------
.../loadafter/grails-app/conf/application.yml | 43 +---------------
.../loadfirst/grails-app/conf/application.yml | 36 ++------------
.../loadsecond/grails-app/conf/application.yml | 36 ++------------
.../grails-app/conf/application.yml | 28 +----------
.../scaffolding/grails-app/conf/application.yml | 57 ----------------------
.../grails-app/conf/application.yml | 31 +-----------
59 files changed, 102 insertions(+), 1322 deletions(-)
diff --cc grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
index e87edf1696,e76a02a941..609afda46d
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
@@@ -68,10 -67,9 +65,9 @@@ class GrailsGspSpec extends Application
void "test mime configuration"() {
when:
- final GeneratorContext ctx = buildGeneratorContext(["grails-gsp"])
+ final GeneratorContext ctx = buildGeneratorContext(["gsp"])
then:
- ctx.getConfiguration().get("grails.mime.disable.accept.header.userAgents") == Arrays.asList("Gecko", "WebKit", "Presto", "Trident")
ctx.getConfiguration().get("grails.mime.types.all") == "*/*"
ctx.getConfiguration().get("grails.mime.types.atom") == "application/atom+xml"
ctx.getConfiguration().get("grails.mime.types.css") == "text/css"