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/08/03 15:46:13 UTC

(grails-core) branch 8.1.x updated (0885113a3d -> 4b7c10da0f)

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

jamesfredley pushed a change to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git


    from 0885113a3d Merge branch '8.0.x' into 8.1.x
     add aba633bdf2 Remove the hardcoded servlet API dependency from gspCompile
     add df12ea261e Merge branch '8.0.x' into fix/gspcompile-bom-managed-servlet-api
     add 7242de2e8d Declare the servlet API on grails-web-gsp and document gspCompile
     add be8a83bb08 Replace fusesource jansi with org.jline's fork
     add a5da57bacf Split tests for cli into their own classpath, enforce cli dependencies as separate from the production classpath, and remove the need for the legacy jansi library
     add 0055d02ae9 Fix defects in the jansi removal and CLI classpath split
     add e184cb5a63 Remove jlineVersion property and use version from dependencies.gradle
     add 36f1ea2402 Address review feedback on the CLI test tier and classpath validator
     add b9c162fefa Move dependency version validation into a task class
     add 34232aad4a Merge branch '8.0.x' into fix/legacy-jansi
     add f0425e8f59 Merge pull request #16078 from jdaugherty/fix/legacy-jansi
     add 55db8cc7e2 fix: route plugin src/main/scripts into companion -cli jars
     add 7a3049d707 fix: use unique Sync outputs for plugin command packaging
     add 2bd0199970 fix: type copyTemplates as Sync in spring-security-ui
     add f77f0cadef fix: unique Copy outputs for plugin commands (no Sync/filter)
     add 82ebbd775e fix: keep plugin templates out of the processResources filters
     add 492b3c5aef Merge branch '8.0.x' into fix/move-plugin-scripts-to-cli-companion
     add 3d129b7140 Merge pull request #16082 from apache/fix/move-plugin-scripts-to-cli-companion
     add ea59fc5192 Merge branch '8.0.x' into fix/gspcompile-bom-managed-servlet-api
     add 063ca5266c Merge pull request #16068 from codeconsole/fix/gspcompile-bom-managed-servlet-api
     add 308857cd77 fix: replace Gradle APIs deprecated for removal in Gradle 10
     add 15d7cfaa2e Merge pull request #16075 from codeconsole/fix/gradle10-plugin-deprecations-8.0.x
     add 80bf683305 Remove the vestigial gspCompile configuration
     add 3603e6919b Merge pull request #16088 from codeconsole/refactor/remove-gspcompile-configuration
     new 4b7c10da0f Merge branch '8.0.x' into 8.1.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:
 .github/workflows/gradle.yml                       |   5 +
 .../GrailsDependencyValidatorPlugin.groovy         | 145 ++++++----
 .../org/apache/grails/buildsrc/SbomPlugin.groovy   |  25 +-
 .../buildsrc/ValidateDependencyVersionsTask.groovy | 100 +++++++
 .../ValidateProductionClasspathTask.groovy         | 102 +++++++
 .../grails/buildsrc/VulnerabilityScanPlugin.groovy |   5 -
 dependencies.gradle                                |   6 +-
 gradle/docs-dependencies.gradle                    |   1 -
 grails-bootstrap/build.gradle                      |  20 +-
 .../groovy/grails/build/logging/ConsoleLogger.java |   0
 .../groovy/grails/build/logging/GrailsConsole.java | 154 ++++++++---
 .../grails/build/logging/GrailsEclipseConsole.java |   0
 .../CandidateListCompletionHandler.java            |   0
 .../org/grails/build/logging/ConsoleAnsi.java      | 146 ++++++++++
 .../build/logging/GrailsConsoleAntBuilder.java     |   0
 .../build/logging/GrailsConsoleBuildListener.java  |   0
 .../logging/GrailsConsoleErrorPrintStream.java     |   0
 .../build/logging/GrailsConsolePrintStream.java    |   0
 .../logging/GrailsConsoleCompleterSpec.groovy      |   0
 .../grails/build/logging/GrailsConsoleSpec.groovy  | 298 +++++++++++++++++++++
 .../CandidateListCompletionHandlerSpec.groovy      |   0
 .../grails/build/logging/GrailsConsoleSpec.groovy  | 109 --------
 grails-console/build.gradle                        |   1 -
 grails-controllers/build.gradle                    |   1 -
 grails-core/build.gradle                           |   7 +
 .../injection/ArtefactTypeAstTransformation.java   |  25 +-
 .../core/cli/ApplicationCommandProviderSpec.groovy |   0
 .../grails/core/cli/ConfigReportCommandSpec.groovy |   0
 .../CommandFactoriesTransformationSpec.groovy      |   0
 .../resources/META-INF/grails-cli.factories        |   0
 grails-data-hibernate5/dbmigration/build.gradle    |   4 +
 .../databasemigration/DbUpdateCommandSpec.groovy   |   0
 ...ationContextDatabaseMigrationCommandSpec.groovy |   0
 .../cli/DatabaseMigrationCommandConfigSpec.groovy  |   0
 .../cli/DatabaseMigrationCommandSpec.groovy        |   0
 .../cli/DbmChangelogSyncCommandSpec.groovy         |   0
 .../cli/DbmChangelogSyncCommandSqlSpec.groovy      |   0
 .../cli/DbmClearChecksumsCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmDiffCommandSpec.groovy      |   0
 .../dbmigration/cli/DbmDropAllCommandSpec.groovy   |   0
 .../DbmFutureRollbackCountSqlCommandSpec.groovy    |   0
 .../cli/DbmFutureRollbackSqlCommandSpec.groovy     |   0
 .../cli/DbmGenerateChangelogCommandSpec.groovy     |   0
 .../cli/DbmGenerateGormChangelogCommandSpec.groovy |   0
 .../dbmigration/cli/DbmGormDiffCommandSpec.groovy  |   0
 .../dbmigration/cli/DbmListLocksCommandSpec.groovy |   0
 .../cli/DbmMarkNextChangesetRanCommandSpec.groovy  |   0
 .../DbmMarkNextChangesetRanSqlCommandSpec.groovy   |   0
 .../cli/DbmPreviousChangesetSqlCommandSpec.groovy  |   0
 .../cli/DbmReleaseLocksCommandSpec.groovy          |   0
 .../dbmigration/cli/DbmRollbackCommandSpec.groovy  |   0
 .../cli/DbmRollbackCountCommandSpec.groovy         |   0
 .../cli/DbmRollbackCountSqlCommandSpec.groovy      |   0
 .../cli/DbmRollbackSqlCommandSpec.groovy           |   0
 .../cli/DbmRollbackToDateCommandSpec.groovy        |   0
 .../cli/DbmRollbackToDateSqlCommandSpec.groovy     |   0
 .../dbmigration/cli/DbmStatusCommandSpec.groovy    |   0
 .../dbmigration/cli/DbmUpdateCommandSpec.groovy    |   0
 .../cli/DbmUpdateCountCommandSpec.groovy           |   0
 .../cli/DbmUpdateCountSqlCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmUpdateSqlCommandSpec.groovy |   0
 .../dbmigration/cli/DbmValidateCommandSpec.groovy  |   0
 .../cli/ScriptDatabaseMigrationCommandSpec.groovy  |   0
 .../liquibase/GroovyChangeLogSpec.groovy           |   0
 .../liquibase/GroovyPreconditionSpec.groovy        |   0
 .../resources/logging.properties                   |   0
 grails-data-hibernate5/docs/build.gradle           |   1 -
 grails-data-hibernate7/dbmigration/build.gradle    |   5 +
 .../databasemigration/DbUpdateCommandSpec.groovy   |   0
 ...ationContextDatabaseMigrationCommandSpec.groovy |   0
 .../cli/DatabaseMigrationCommandConfigSpec.groovy  |   0
 .../cli/DatabaseMigrationCommandSpec.groovy        |   0
 .../cli/DbmChangelogSyncCommandSpec.groovy         |   0
 .../cli/DbmChangelogSyncCommandSqlSpec.groovy      |   0
 .../cli/DbmClearChecksumsCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmDiffCommandSpec.groovy      |   0
 .../dbmigration/cli/DbmDropAllCommandSpec.groovy   |   0
 .../DbmFutureRollbackCountSqlCommandSpec.groovy    |   0
 .../cli/DbmFutureRollbackSqlCommandSpec.groovy     |   0
 .../cli/DbmGenerateChangelogCommandSpec.groovy     |   0
 .../cli/DbmGenerateGormChangelogCommandSpec.groovy |   0
 .../dbmigration/cli/DbmGormDiffCommandSpec.groovy  |   0
 .../dbmigration/cli/DbmListLocksCommandSpec.groovy |   0
 .../cli/DbmMarkNextChangesetRanCommandSpec.groovy  |   0
 .../DbmMarkNextChangesetRanSqlCommandSpec.groovy   |   0
 .../cli/DbmPreviousChangesetSqlCommandSpec.groovy  |   0
 .../cli/DbmReleaseLocksCommandSpec.groovy          |   0
 .../dbmigration/cli/DbmRollbackCommandSpec.groovy  |   0
 .../cli/DbmRollbackCountCommandSpec.groovy         |   0
 .../cli/DbmRollbackCountSqlCommandSpec.groovy      |   0
 .../cli/DbmRollbackSqlCommandSpec.groovy           |   0
 .../cli/DbmRollbackToDateCommandSpec.groovy        |   0
 .../cli/DbmRollbackToDateSqlCommandSpec.groovy     |   0
 .../dbmigration/cli/DbmStatusCommandSpec.groovy    |   0
 .../dbmigration/cli/DbmUpdateCommandSpec.groovy    |   0
 .../cli/DbmUpdateCountCommandSpec.groovy           |   0
 .../cli/DbmUpdateCountSqlCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmUpdateSqlCommandSpec.groovy |   0
 .../dbmigration/cli/DbmValidateCommandSpec.groovy  |   0
 .../cli/ScriptDatabaseMigrationCommandSpec.groovy  |   0
 .../liquibase/GroovyChangeLogSpec.groovy           |   0
 .../liquibase/GroovyPreconditionSpec.groovy        |   0
 .../src/test-cli}/resources/logging.properties     |   0
 grails-data-hibernate7/docs/build.gradle           |   1 -
 grails-data-mongodb/docs/build.gradle              |   1 -
 grails-data-neo4j/docs/build.gradle                |   1 -
 grails-data-neo4j/gradle.properties                |   1 -
 grails-dependencies/starter-web/build.gradle       |  12 +-
 .../guide/commandLine/creatingCustomCommands.adoc  |   9 +-
 .../gradleBuild/gradleDependencies.adoc            |   1 -
 .../en/guide/plugins/providingBasicArtefacts.adoc  |   9 +
 .../src/en/guide/upgrading/upgrading80x.adoc       | 274 ++++++++++++++++++-
 grails-forge/gradle.properties                     |   2 -
 grails-forge/grails-forge-cli/build.gradle         |   7 +-
 .../org/grails/forge/cli/InteractiveShell.java     |  32 ++-
 .../org/grails/forge/feature/view/Scaffolding.java |   5 -
 .../forge/feature/view/ScaffoldingSpec.groovy      |   4 +-
 grails-gradle/gradle/docs-config.gradle            |   1 -
 grails-gradle/model/build.gradle                   |   1 -
 .../commands/GrailsCliArtifactGradlePlugin.groovy  |  97 ++++++-
 .../gradle/plugin/core/GrailsGradlePlugin.groovy   |  33 ++-
 .../plugin/core/GrailsPluginGradlePlugin.groovy    | 116 ++++++--
 .../plugin/core/TestPhasesGradlePlugin.groovy      |   2 +-
 .../plugin/views/gsp/GroovyPagePlugin.groovy       |   4 -
 .../PluginScriptCommandPackagingSpec.groovy        | 129 +++++++++
 .../plugin/core/TestPhasesGradlePluginSpec.groovy  | 108 ++++++++
 .../gsp/GroovyPagePluginFunctionalSpec.groovy      |  65 +++++
 .../gsp-compile-classpath/build.gradle             |  37 +++
 .../compile-classpath-marker/marker.txt            |   1 +
 .../provided-compile-marker/marker.txt             |   1 +
 .../gsp-compile-classpath/settings.gradle          |   1 +
 .../gradle.properties                              |   1 +
 .../plugin-with-cli/build.gradle                   |  89 ++++++
 .../grails-app/views/sample/show.gsp               |   1 +
 .../resources/META-INF/commands/hand-authored.yml  |   1 +
 .../src/main/scripts/example-multi-step.yml        |   3 +
 .../src/main/scripts/example-script.groovy         |   5 +
 .../plugin-with-cli/src/main/templates/example.gsp |   1 +
 .../plugin-with-cli/src/main/templates/example.txt |   1 +
 .../plugin-without-cli/build.gradle                |  38 +++
 .../src/main/scripts/legacy-only-script.groovy     |   5 +
 .../src/main/templates/legacy-only.gsp             |   1 +
 .../src/main/templates/legacy-only.txt             |   1 +
 .../plugin-script-commands/settings.gradle         |   3 +
 grails-gsp/grails-web-gsp/build.gradle             |   1 +
 grails-profiles/base/profile.yml                   |   2 -
 grails-scaffolding/build.gradle                    |   4 -
 grails-shell-cli/build.gradle                      |   8 +-
 .../profile/commands/CreateAppCommandSpec.groovy   |   2 +-
 .../cas/plugin/grails-app/conf/logback.xml         |   1 -
 .../ldap/plugin/grails-app/conf/logback.xml        |   1 -
 grails-spring-security/oauth2/plugin/build.gradle  |   2 -
 grails-spring-security/plugin/build.gradle         |   2 -
 grails-spring-security/ui/plugin/build.gradle      |  12 +-
 grails-test-core/build.gradle                      |   5 +-
 .../grails/test/io/SystemOutAndErrSwapper.groovy   |  24 +-
 .../async-events-pubsub-demo/build.gradle          |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../integration-test/resources/logback-test.xml    |   1 -
 grails-test-examples/cache/build.gradle            |   1 -
 .../external-configuration/build.gradle            |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 grails-test-examples/geb-context-path/build.gradle |   1 -
 grails-test-examples/geb-gebconfig/build.gradle    |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 grails-test-examples/geb/build.gradle              |   1 -
 .../geb/grails-app/conf/logback-spring.xml         |   1 -
 grails-test-examples/gsp-layout/build.gradle       |   1 -
 .../gsp-layout/grails-app/conf/logback-spring.xml  |   1 -
 grails-test-examples/gsp-sitemesh3/build.gradle    |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../async-events-pubsub-demo/build.gradle          |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../integration-test/resources/logback-test.xml    |   1 -
 .../issue-10279/grails-app/conf/logback.xml        |   1 -
 .../issue-11767/grails-app/conf/logback.xml        |   1 -
 .../issue-15228/grails-app/conf/logback.xml        |   1 -
 grails-test-examples/jetty/build.gradle            |   1 -
 .../jetty/grails-app/conf/logback-spring.xml       |   1 -
 grails-test-examples/mail/build.gradle             |   1 -
 .../mail/grails-app/conf/logback-spring.xml        |   1 -
 grails-test-examples/mongodb/base/build.gradle     |   1 -
 .../mongodb/database-per-tenant/build.gradle       |   1 -
 .../mongodb/hibernate5/build.gradle                |   1 -
 grails-test-examples/redis/build.gradle            |   1 -
 grails-test-examples/scaffolding/build.gradle      |   1 -
 .../acl/functional-test-app/build.gradle           |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../spring-security/cas/test1/build.gradle         |   1 -
 .../cas/test1/grails-app/conf/logback.xml          |   1 -
 .../build.gradle                                   |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/functional-test-app/build.gradle          |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/retrieve-db-roles/build.gradle            |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/retrieve-group-roles/build.gradle         |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../spring-security/ui/extended/build.gradle       |   1 -
 .../ui/extended/grails-app/conf/logback.xml        |   1 -
 .../spring-security/ui/simple/build.gradle         |   1 -
 .../ui/simple/grails-app/conf/logback.xml          |   1 -
 grails-test-examples/undertow/build.gradle         |   1 -
 .../undertow/grails-app/conf/logback-spring.xml    |   1 -
 grails-test-report/build.gradle                    |   9 +-
 grails-web-url-mappings/build.gradle               |   8 +-
 .../AnsiConsoleUrlMappingsRenderer.groovy          |  28 +-
 .../AnsiConsoleUrlMappingsRendererSpec.groovy      |   0
 .../mapping/UrlMappingsWithHttpMethodSpec.groovy   |   1 -
 210 files changed, 2031 insertions(+), 393 deletions(-)
 create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/ValidateDependencyVersionsTask.groovy
 create mode 100644 build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/ValidateProductionClasspathTask.groovy
 rename grails-bootstrap/src/{main => cli}/groovy/grails/build/logging/ConsoleLogger.java (100%)
 rename grails-bootstrap/src/{main => cli}/groovy/grails/build/logging/GrailsConsole.java (83%)
 rename grails-bootstrap/src/{main => cli}/groovy/grails/build/logging/GrailsEclipseConsole.java (100%)
 rename grails-bootstrap/src/{main => cli}/groovy/org/grails/build/interactive/CandidateListCompletionHandler.java (100%)
 create mode 100644 grails-bootstrap/src/cli/groovy/org/grails/build/logging/ConsoleAnsi.java
 rename grails-bootstrap/src/{main => cli}/groovy/org/grails/build/logging/GrailsConsoleAntBuilder.java (100%)
 rename grails-bootstrap/src/{main => cli}/groovy/org/grails/build/logging/GrailsConsoleBuildListener.java (100%)
 rename grails-bootstrap/src/{main => cli}/groovy/org/grails/build/logging/GrailsConsoleErrorPrintStream.java (100%)
 rename grails-bootstrap/src/{main => cli}/groovy/org/grails/build/logging/GrailsConsolePrintStream.java (100%)
 rename grails-bootstrap/src/{test => test-cli}/groovy/grails/build/logging/GrailsConsoleCompleterSpec.groovy (100%)
 create mode 100644 grails-bootstrap/src/test-cli/groovy/grails/build/logging/GrailsConsoleSpec.groovy
 rename grails-bootstrap/src/{test => test-cli}/groovy/org/grails/build/interactive/CandidateListCompletionHandlerSpec.groovy (100%)
 delete mode 100644 grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy
 rename grails-core/src/{test => test-cli}/groovy/org/apache/grails/core/cli/ApplicationCommandProviderSpec.groovy (100%)
 rename grails-core/src/{test => test-cli}/groovy/org/apache/grails/core/cli/ConfigReportCommandSpec.groovy (100%)
 rename grails-core/src/{test => test-cli}/groovy/org/apache/grails/core/cli/compiler/CommandFactoriesTransformationSpec.groovy (100%)
 rename grails-core/src/{test => test-cli}/resources/META-INF/grails-cli.factories (100%)
 rename grails-data-hibernate5/dbmigration/src/{integration-test => integration-test-cli}/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/ApplicationContextDatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DatabaseMigrationCommandConfigSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmChangelogSyncCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmChangelogSyncCommandSqlSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmClearChecksumsCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmDiffCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmDropAllCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmFutureRollbackCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmFutureRollbackSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmGenerateChangelogCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmGenerateGormChangelogCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmGormDiffCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmListLocksCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmMarkNextChangesetRanCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmMarkNextChangesetRanSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmPreviousChangesetSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmReleaseLocksCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackCountCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackToDateCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmRollbackToDateSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmStatusCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmUpdateCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmUpdateCountCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmUpdateCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmUpdateSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/DbmValidateCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate5/dbmigration/cli/ScriptDatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy (100%)
 rename grails-data-hibernate5/dbmigration/src/{test => test-cli}/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy (100%)
 copy grails-data-hibernate5/dbmigration/src/{test => test-cli}/resources/logging.properties (100%)
 rename grails-data-hibernate7/dbmigration/src/{integration-test => integration-test-cli}/groovy/org/grails/plugins/databasemigration/DbUpdateCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/ApplicationContextDatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DatabaseMigrationCommandConfigSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmChangelogSyncCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmChangelogSyncCommandSqlSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmClearChecksumsCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmDiffCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmDropAllCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmFutureRollbackCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmFutureRollbackSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmGenerateChangelogCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmGenerateGormChangelogCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmGormDiffCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmListLocksCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmMarkNextChangesetRanCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmMarkNextChangesetRanSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmPreviousChangesetSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmReleaseLocksCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackCountCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackToDateCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmRollbackToDateSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmStatusCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmUpdateCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmUpdateCountCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmUpdateCountSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmUpdateSqlCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/DbmValidateCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/apache/grails/data/hibernate7/dbmigration/cli/ScriptDatabaseMigrationCommandSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSpec.groovy (100%)
 rename grails-data-hibernate7/dbmigration/src/{test => test-cli}/groovy/org/grails/plugins/databasemigration/liquibase/GroovyPreconditionSpec.groovy (100%)
 copy {grails-data-hibernate5/dbmigration/src/test => grails-data-hibernate7/dbmigration/src/test-cli}/resources/logging.properties (100%)
 create mode 100644 grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/commands/PluginScriptCommandPackagingSpec.groovy
 create mode 100644 grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/TestPhasesGradlePluginSpec.groovy
 create mode 100644 grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePluginFunctionalSpec.groovy
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/gsp-compile-classpath/build.gradle
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/gsp-compile-classpath/compile-classpath-marker/marker.txt
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/gsp-compile-classpath/provided-compile-marker/marker.txt
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/gsp-compile-classpath/settings.gradle
 copy grails-gradle/plugins/src/test/resources/test-projects/{auto-apply-bom-disabled => plugin-script-commands}/gradle.properties (70%)
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/build.gradle
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/grails-app/views/sample/show.gsp
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/src/main/resources/META-INF/commands/hand-authored.yml
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/src/main/scripts/example-multi-step.yml
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/src/main/scripts/example-script.groovy
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/src/main/templates/example.gsp
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-with-cli/src/main/templates/example.txt
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-without-cli/build.gradle
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-without-cli/src/main/scripts/legacy-only-script.groovy
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-without-cli/src/main/templates/legacy-only.gsp
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/plugin-without-cli/src/main/templates/legacy-only.txt
 create mode 100644 grails-gradle/plugins/src/test/resources/test-projects/plugin-script-commands/settings.gradle
 rename grails-web-url-mappings/src/{main => cli}/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRenderer.groovy (86%)
 rename grails-web-url-mappings/src/{test => test-cli}/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy (100%)


(grails-core) 01/01: Merge branch '8.0.x' into 8.1.x

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 4b7c10da0fb2b962333dd30a1bcb8d1926ca40d6
Merge: 0885113a3d 3603e6919b
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Mon Aug 3 11:33:59 2026 -0400

    Merge branch '8.0.x' into 8.1.x

 .github/workflows/gradle.yml                       |   5 +
 .../GrailsDependencyValidatorPlugin.groovy         | 145 ++++++----
 .../org/apache/grails/buildsrc/SbomPlugin.groovy   |  25 +-
 .../buildsrc/ValidateDependencyVersionsTask.groovy | 100 +++++++
 .../ValidateProductionClasspathTask.groovy         | 102 +++++++
 .../grails/buildsrc/VulnerabilityScanPlugin.groovy |   5 -
 dependencies.gradle                                |   6 +-
 gradle/docs-dependencies.gradle                    |   1 -
 grails-bootstrap/build.gradle                      |  20 +-
 .../groovy/grails/build/logging/ConsoleLogger.java |   0
 .../groovy/grails/build/logging/GrailsConsole.java | 154 ++++++++---
 .../grails/build/logging/GrailsEclipseConsole.java |   0
 .../CandidateListCompletionHandler.java            |   0
 .../org/grails/build/logging/ConsoleAnsi.java      | 146 ++++++++++
 .../build/logging/GrailsConsoleAntBuilder.java     |   0
 .../build/logging/GrailsConsoleBuildListener.java  |   0
 .../logging/GrailsConsoleErrorPrintStream.java     |   0
 .../build/logging/GrailsConsolePrintStream.java    |   0
 .../logging/GrailsConsoleCompleterSpec.groovy      |   0
 .../grails/build/logging/GrailsConsoleSpec.groovy  | 298 +++++++++++++++++++++
 .../CandidateListCompletionHandlerSpec.groovy      |   0
 .../grails/build/logging/GrailsConsoleSpec.groovy  | 109 --------
 grails-console/build.gradle                        |   1 -
 grails-controllers/build.gradle                    |   1 -
 grails-core/build.gradle                           |   7 +
 .../injection/ArtefactTypeAstTransformation.java   |  25 +-
 .../core/cli/ApplicationCommandProviderSpec.groovy |   0
 .../grails/core/cli/ConfigReportCommandSpec.groovy |   0
 .../CommandFactoriesTransformationSpec.groovy      |   0
 .../resources/META-INF/grails-cli.factories        |   0
 grails-data-hibernate5/dbmigration/build.gradle    |   4 +
 .../databasemigration/DbUpdateCommandSpec.groovy   |   0
 ...ationContextDatabaseMigrationCommandSpec.groovy |   0
 .../cli/DatabaseMigrationCommandConfigSpec.groovy  |   0
 .../cli/DatabaseMigrationCommandSpec.groovy        |   0
 .../cli/DbmChangelogSyncCommandSpec.groovy         |   0
 .../cli/DbmChangelogSyncCommandSqlSpec.groovy      |   0
 .../cli/DbmClearChecksumsCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmDiffCommandSpec.groovy      |   0
 .../dbmigration/cli/DbmDropAllCommandSpec.groovy   |   0
 .../DbmFutureRollbackCountSqlCommandSpec.groovy    |   0
 .../cli/DbmFutureRollbackSqlCommandSpec.groovy     |   0
 .../cli/DbmGenerateChangelogCommandSpec.groovy     |   0
 .../cli/DbmGenerateGormChangelogCommandSpec.groovy |   0
 .../dbmigration/cli/DbmGormDiffCommandSpec.groovy  |   0
 .../dbmigration/cli/DbmListLocksCommandSpec.groovy |   0
 .../cli/DbmMarkNextChangesetRanCommandSpec.groovy  |   0
 .../DbmMarkNextChangesetRanSqlCommandSpec.groovy   |   0
 .../cli/DbmPreviousChangesetSqlCommandSpec.groovy  |   0
 .../cli/DbmReleaseLocksCommandSpec.groovy          |   0
 .../dbmigration/cli/DbmRollbackCommandSpec.groovy  |   0
 .../cli/DbmRollbackCountCommandSpec.groovy         |   0
 .../cli/DbmRollbackCountSqlCommandSpec.groovy      |   0
 .../cli/DbmRollbackSqlCommandSpec.groovy           |   0
 .../cli/DbmRollbackToDateCommandSpec.groovy        |   0
 .../cli/DbmRollbackToDateSqlCommandSpec.groovy     |   0
 .../dbmigration/cli/DbmStatusCommandSpec.groovy    |   0
 .../dbmigration/cli/DbmUpdateCommandSpec.groovy    |   0
 .../cli/DbmUpdateCountCommandSpec.groovy           |   0
 .../cli/DbmUpdateCountSqlCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmUpdateSqlCommandSpec.groovy |   0
 .../dbmigration/cli/DbmValidateCommandSpec.groovy  |   0
 .../cli/ScriptDatabaseMigrationCommandSpec.groovy  |   0
 .../liquibase/GroovyChangeLogSpec.groovy           |   0
 .../liquibase/GroovyPreconditionSpec.groovy        |   0
 .../src/test-cli/resources/logging.properties      |   2 +-
 grails-data-hibernate5/docs/build.gradle           |   1 -
 grails-data-hibernate7/dbmigration/build.gradle    |   5 +
 .../databasemigration/DbUpdateCommandSpec.groovy   |   0
 ...ationContextDatabaseMigrationCommandSpec.groovy |   0
 .../cli/DatabaseMigrationCommandConfigSpec.groovy  |   0
 .../cli/DatabaseMigrationCommandSpec.groovy        |   0
 .../cli/DbmChangelogSyncCommandSpec.groovy         |   0
 .../cli/DbmChangelogSyncCommandSqlSpec.groovy      |   0
 .../cli/DbmClearChecksumsCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmDiffCommandSpec.groovy      |   0
 .../dbmigration/cli/DbmDropAllCommandSpec.groovy   |   0
 .../DbmFutureRollbackCountSqlCommandSpec.groovy    |   0
 .../cli/DbmFutureRollbackSqlCommandSpec.groovy     |   0
 .../cli/DbmGenerateChangelogCommandSpec.groovy     |   0
 .../cli/DbmGenerateGormChangelogCommandSpec.groovy |   0
 .../dbmigration/cli/DbmGormDiffCommandSpec.groovy  |   0
 .../dbmigration/cli/DbmListLocksCommandSpec.groovy |   0
 .../cli/DbmMarkNextChangesetRanCommandSpec.groovy  |   0
 .../DbmMarkNextChangesetRanSqlCommandSpec.groovy   |   0
 .../cli/DbmPreviousChangesetSqlCommandSpec.groovy  |   0
 .../cli/DbmReleaseLocksCommandSpec.groovy          |   0
 .../dbmigration/cli/DbmRollbackCommandSpec.groovy  |   0
 .../cli/DbmRollbackCountCommandSpec.groovy         |   0
 .../cli/DbmRollbackCountSqlCommandSpec.groovy      |   0
 .../cli/DbmRollbackSqlCommandSpec.groovy           |   0
 .../cli/DbmRollbackToDateCommandSpec.groovy        |   0
 .../cli/DbmRollbackToDateSqlCommandSpec.groovy     |   0
 .../dbmigration/cli/DbmStatusCommandSpec.groovy    |   0
 .../dbmigration/cli/DbmUpdateCommandSpec.groovy    |   0
 .../cli/DbmUpdateCountCommandSpec.groovy           |   0
 .../cli/DbmUpdateCountSqlCommandSpec.groovy        |   0
 .../dbmigration/cli/DbmUpdateSqlCommandSpec.groovy |   0
 .../dbmigration/cli/DbmValidateCommandSpec.groovy  |   0
 .../cli/ScriptDatabaseMigrationCommandSpec.groovy  |   0
 .../liquibase/GroovyChangeLogSpec.groovy           |   0
 .../liquibase/GroovyPreconditionSpec.groovy        |   0
 .../src/test-cli/resources/logging.properties      |   2 +-
 grails-data-hibernate7/docs/build.gradle           |   1 -
 grails-data-mongodb/docs/build.gradle              |   1 -
 grails-data-neo4j/docs/build.gradle                |   1 -
 grails-data-neo4j/gradle.properties                |   1 -
 grails-dependencies/starter-web/build.gradle       |  12 +-
 .../guide/commandLine/creatingCustomCommands.adoc  |   9 +-
 .../gradleBuild/gradleDependencies.adoc            |   1 -
 .../en/guide/plugins/providingBasicArtefacts.adoc  |   9 +
 .../src/en/guide/upgrading/upgrading80x.adoc       | 274 ++++++++++++++++++-
 grails-forge/gradle.properties                     |   2 -
 grails-forge/grails-forge-cli/build.gradle         |   7 +-
 .../org/grails/forge/cli/InteractiveShell.java     |  32 ++-
 .../org/grails/forge/feature/view/Scaffolding.java |   5 -
 .../forge/feature/view/ScaffoldingSpec.groovy      |   4 +-
 grails-gradle/gradle/docs-config.gradle            |   1 -
 grails-gradle/model/build.gradle                   |   1 -
 .../commands/GrailsCliArtifactGradlePlugin.groovy  |  97 ++++++-
 .../gradle/plugin/core/GrailsGradlePlugin.groovy   |  33 ++-
 .../plugin/core/GrailsPluginGradlePlugin.groovy    | 116 ++++++--
 .../plugin/core/TestPhasesGradlePlugin.groovy      |   2 +-
 .../plugin/views/gsp/GroovyPagePlugin.groovy       |   4 -
 .../PluginScriptCommandPackagingSpec.groovy        | 129 +++++++++
 .../plugin/core/TestPhasesGradlePluginSpec.groovy  | 108 ++++++++
 .../gsp/GroovyPagePluginFunctionalSpec.groovy      |  65 +++++
 .../gsp-compile-classpath/build.gradle             |  37 +++
 .../compile-classpath-marker/marker.txt            |   1 +
 .../provided-compile-marker/marker.txt             |   1 +
 .../gsp-compile-classpath/settings.gradle          |   1 +
 .../plugin-script-commands/gradle.properties       |   2 +
 .../plugin-with-cli/build.gradle                   |  89 ++++++
 .../grails-app/views/sample/show.gsp               |   1 +
 .../resources/META-INF/commands/hand-authored.yml  |   1 +
 .../src/main/scripts/example-multi-step.yml        |   3 +
 .../src/main/scripts/example-script.groovy         |   5 +
 .../plugin-with-cli/src/main/templates/example.gsp |   1 +
 .../plugin-with-cli/src/main/templates/example.txt |   1 +
 .../plugin-without-cli/build.gradle                |  38 +++
 .../src/main/scripts/legacy-only-script.groovy     |   5 +
 .../src/main/templates/legacy-only.gsp             |   1 +
 .../src/main/templates/legacy-only.txt             |   1 +
 .../plugin-script-commands/settings.gradle         |   3 +
 grails-gsp/grails-web-gsp/build.gradle             |   1 +
 grails-profiles/base/profile.yml                   |   2 -
 grails-scaffolding/build.gradle                    |   4 -
 grails-shell-cli/build.gradle                      |   8 +-
 .../profile/commands/CreateAppCommandSpec.groovy   |   2 +-
 .../cas/plugin/grails-app/conf/logback.xml         |   1 -
 .../ldap/plugin/grails-app/conf/logback.xml        |   1 -
 grails-spring-security/oauth2/plugin/build.gradle  |   2 -
 grails-spring-security/plugin/build.gradle         |   2 -
 grails-spring-security/ui/plugin/build.gradle      |  12 +-
 grails-test-core/build.gradle                      |   5 +-
 .../grails/test/io/SystemOutAndErrSwapper.groovy   |  24 +-
 .../async-events-pubsub-demo/build.gradle          |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../integration-test/resources/logback-test.xml    |   1 -
 grails-test-examples/cache/build.gradle            |   1 -
 .../external-configuration/build.gradle            |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 grails-test-examples/geb-context-path/build.gradle |   1 -
 grails-test-examples/geb-gebconfig/build.gradle    |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 grails-test-examples/geb/build.gradle              |   1 -
 .../geb/grails-app/conf/logback-spring.xml         |   1 -
 grails-test-examples/gsp-layout/build.gradle       |   1 -
 .../gsp-layout/grails-app/conf/logback-spring.xml  |   1 -
 grails-test-examples/gsp-sitemesh3/build.gradle    |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../async-events-pubsub-demo/build.gradle          |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../integration-test/resources/logback-test.xml    |   1 -
 .../issue-10279/grails-app/conf/logback.xml        |   1 -
 .../issue-11767/grails-app/conf/logback.xml        |   1 -
 .../issue-15228/grails-app/conf/logback.xml        |   1 -
 grails-test-examples/jetty/build.gradle            |   1 -
 .../jetty/grails-app/conf/logback-spring.xml       |   1 -
 grails-test-examples/mail/build.gradle             |   1 -
 .../mail/grails-app/conf/logback-spring.xml        |   1 -
 grails-test-examples/mongodb/base/build.gradle     |   1 -
 .../mongodb/database-per-tenant/build.gradle       |   1 -
 .../mongodb/hibernate5/build.gradle                |   1 -
 grails-test-examples/redis/build.gradle            |   1 -
 grails-test-examples/scaffolding/build.gradle      |   1 -
 .../acl/functional-test-app/build.gradle           |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../grails-app/conf/logback.xml                    |   1 -
 .../spring-security/cas/test1/build.gradle         |   1 -
 .../cas/test1/grails-app/conf/logback.xml          |   1 -
 .../build.gradle                                   |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/functional-test-app/build.gradle          |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/retrieve-db-roles/build.gradle            |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../ldap/retrieve-group-roles/build.gradle         |   1 -
 .../grails-app/conf/logback-spring.xml             |   1 -
 .../spring-security/ui/extended/build.gradle       |   1 -
 .../ui/extended/grails-app/conf/logback.xml        |   1 -
 .../spring-security/ui/simple/build.gradle         |   1 -
 .../ui/simple/grails-app/conf/logback.xml          |   1 -
 grails-test-examples/undertow/build.gradle         |   1 -
 .../undertow/grails-app/conf/logback-spring.xml    |   1 -
 grails-test-report/build.gradle                    |   9 +-
 grails-web-url-mappings/build.gradle               |   8 +-
 .../AnsiConsoleUrlMappingsRenderer.groovy          |  28 +-
 .../AnsiConsoleUrlMappingsRendererSpec.groovy      |   0
 .../mapping/UrlMappingsWithHttpMethodSpec.groovy   |   1 -
 210 files changed, 2034 insertions(+), 395 deletions(-)