Merge branch '7.1.x' into 8.0.x

Author: jdaugherty

.github/workflows/release-notes.yml

@@ -25,7 +25,7 @@ on:
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:
-  group: release-pipeline
+  group: release-pipeline-71
   cancel-in-progress: false
 jobs:
   update_release_draft:

.github/workflows/release.yml

@@ -38,7 +38,7 @@ env:
   TARGET_BRANCH: ${{ github.event.release.target_commitish }}
   VERSION: will be computed in each job
 concurrency:
-  group: release-pipeline
+  group: release-pipeline-71
   cancel-in-progress: false
 jobs:
   publish:

DEVELOPMENT.md

@@ -44,5 +44,27 @@ These can be set on the command line like so:
 * `skipMongodbTests` - does not run mongo related tests
 * `skipTests` - no tests will run
 
+## Test slicing
+
+Test classes tagged with `@spock.lang.Tag('some-tag')` can be run separately.\
+Tags are inherited from superclasses, so a test class is also included if any of its ancestors is tagged.
+
+Example:
+
+```bash
+./gradlew iT -PincludeTestTags=geb
+```
+
+Available project properties:
+
+* `includeTestTags` - comma-separated list of test tags to include
+* `excludeTestTags` - comma-separated list of test tags to exclude
+
+Example with multiple tags:
+
+```bash
+./gradlew iT -PincludeTestTags=geb,api
+```
+
 ## Start a mongo docker container (containers will start by default)
 `docker run -d  --name mongo-on-docker  -p 27017:27017 mongo`

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
             'ant.version'                   : '1.10.15',
             'asciidoctor-gradle-jvm.version': '4.0.5',
             'asciidoctorj.version'          : '3.0.0',
-            'asset-pipeline-gradle.version' : '5.0.32',
+            'asset-pipeline-gradle.version' : '5.0.34',
             'byte-buddy.version'            : '1.17.7',
             'commons-text.version'          : '1.13.1',
             'directory-watcher.version'     : '0.19.1',
@@ -67,13 +67,13 @@ ext {
     ]
 
     bomDependencyVersions = [
-            'asset-pipeline-bom.version'  : '5.0.32',
+            'asset-pipeline-bom.version'  : '5.0.34',
             'bootstrap-icons.version'     : '1.13.1',
             'bootstrap.version'           : '5.3.8',
             'commons-codec.version'       : '1.18.0',
             'commons-lang3.version'       : '3.20.0',
             'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '4.0.30',
+            'groovy.version'              : '4.0.31',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',
             'liquibase-hibernate5.version': '4.27.0',

etc/bin/verify-cli-distribution.sh

@@ -91,7 +91,7 @@ echo "Checking Shell CLI ..."
 echo "✅ Generated Shell App"
 
 echo "Checking Forge CLI ..."
-./grails-forge-cli create-app -x -g mongodb ForgeApp
+./grails-forge-cli create-app -x -g mongodb -f gradle-settings-file ForgeApp
 echo "✅ Generated Forge App"
 
 echo "✅✅✅ All cli binary distribution checks passed successfully for Apache Grails ${VERSION}."

gradle/functional-test-config.gradle

@@ -95,7 +95,20 @@ tasks.withType(Test).configureEach { Test task ->
         task.outputs.dir rootProject.layout.buildDirectory.dir('mongo-test-serialize')
     }
 
-    task.useJUnitPlatform()
+    task.useJUnitPlatform {
+        if (project.hasProperty('includeTestTags')) {
+            // Will only run tests that are tagged with specific tags
+            // e.g. @spock.lang.Tag('geb')
+            // Run with: ./gradlew iT -PincludeTestTags=geb (comma-separated list)
+            includeTags((project.property('includeTestTags') as String).split(',')*.trim() as String[])
+        }
+        if (project.hasProperty('excludeTestTags')) {
+            // Will not run tests that are tagged with specific tags
+            // e.g. @spock.lang.Tag('geb')
+            // Run with: ./gradlew iT -PincludeTestTags=geb
+            excludeTags((project.property('excludeTestTags') as String).split(',')*.trim() as String[])
+        }
+    }
     task.testLogging {
         events('passed', 'skipped', 'failed', 'standardOut', 'standardError')
         showExceptions = true

grails-geb/src/testFixtures/groovy/grails/plugin/geb/ContainerGebSpec.groovy

@@ -24,6 +24,7 @@ import geb.Page
 import geb.test.GebTestManager
 import spock.lang.Shared
 import spock.lang.Specification
+import spock.lang.Tag
 
 import grails.plugin.geb.support.ContainerSupport
 import grails.plugin.geb.support.ReportingSupport
@@ -55,6 +56,8 @@ import grails.plugin.geb.support.delegate.PageDelegate
  * @author James Daugherty
  * @since 4.1
  */
+@Tag('geb')
+@Tag('container-geb')
 @CompileStatic
 abstract class ContainerGebSpec extends Specification implements ContainerSupport, ReportingSupport, BrowserDelegate, PageDelegate, DriverDelegate, DownloadSupportDelegate {
 

grails-test-examples/app1/src/integration-test/groovy/functionaltests/AtResourceSpec.groovy

@@ -19,11 +19,13 @@
 package functionaltests
 
 import spock.lang.Specification
+import spock.lang.Tag
 
 import grails.testing.mixin.integration.Integration
 import org.apache.grails.testing.http.client.HttpClientSupport
 
 @Integration
+@Tag('http-client')
 class AtResourceSpec extends Specification implements HttpClientSupport {
 
     def "A domain class annotated with @Resources exposes an endpoint"() {

grails-test-examples/app1/src/integration-test/groovy/functionaltests/BookRestfulControllerSpec.groovy

@@ -19,11 +19,13 @@
 package functionaltests
 
 import spock.lang.Specification
+import spock.lang.Tag
 
 import grails.testing.mixin.integration.Integration
 import org.apache.grails.testing.http.client.HttpClientSupport
 
 @Integration
+@Tag('http-client')
 class BookRestfulControllerSpec extends Specification implements HttpClientSupport {
 
     def "A RestfulController exposes an index endpoint for a domain class"() {

grails-test-examples/app1/src/integration-test/groovy/functionaltests/GspInWebappDirSpec.groovy

@@ -19,11 +19,13 @@
 package functionaltests
 
 import spock.lang.Specification
+import spock.lang.Tag
 
 import grails.testing.mixin.integration.Integration
 import org.apache.grails.testing.http.client.HttpClientSupport
 
 @Integration
+@Tag('http-client')
 class GspInWebappDirSpec extends Specification implements HttpClientSupport {
 
     def 'GSP in src/main/webapp renders'() {