Merge branch '7.0.x' into fix/docs-title-sequence

Author: sanjana2505006

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',
@@ -37,7 +37,7 @@ ext {
             'jna.version'                   : '5.17.0',
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
-            'spring-boot.version'           : '3.5.11',
+            'spring-boot.version'           : '3.5.13',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -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.properties

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-projectVersion=7.0.10-SNAPSHOT
+projectVersion=7.0.11-SNAPSHOT
 
 javaVersion=17
 

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-core/src/test/groovy/grails/util/GrailsUtilTests.java

@@ -33,7 +33,7 @@ public class GrailsUtilTests {
 
     @Test
     public void testGrailsVersion() {
-        assertEquals("7.0.10-SNAPSHOT", GrailsUtil.getGrailsVersion());
+        assertEquals("7.0.11-SNAPSHOT", GrailsUtil.getGrailsVersion());
     }
 
     @AfterEach

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-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -734,9 +734,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
                 it.dependsOn(project.tasks.named('compileGroovy', GroovyCompile), project.tasks.named('classes'))
                 it.mustRunAfter(project.tasks.named('classes'))
                 it.mainClassCacheFile.set(mainClassFileContainer)
-                it.outputs.upToDateWhen {
-                    mainClassFileContainer.orNull?.asFile?.exists()
-                }
             }
 
             project.afterEvaluate {

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy

@@ -55,6 +55,7 @@ class GroovyPagePlugin implements Plugin<Project> {
         SourceSetOutput output = mainSourceSet?.output
         FileCollection classesDirs = resolveClassesDirs(output, project)
         Provider<Directory> destDir = project.layout.buildDirectory.dir('gsp-classes/main')
+        Provider<Directory> webappDestDir = project.layout.buildDirectory.dir('gsp-classes/webapp')
         output?.dir('gsp-classes')
 
         FileCollection allClasspath = project.getObjects().fileCollection().from(
@@ -75,7 +76,7 @@ class GroovyPagePlugin implements Plugin<Project> {
         }
 
         def compileWebappGroovyPages = tasks.register('compileWebappGroovyPages', GroovyPageForkCompileTask) {
-            it.destinationDirectory.set(destDir)
+            it.destinationDirectory.set(webappDestDir)
             it.source = project.layout.projectDirectory.dir('src/main/webapp')
             it.tmpDirPath = getTmpDirPath(project)
             it.serverpath.set('/')
@@ -96,14 +97,18 @@ class GroovyPagePlugin implements Plugin<Project> {
                 war.from(destDir) { CopySpec it ->
                     it.into('WEB-INF/classes')
                 }
+                war.from(webappDestDir) { CopySpec it ->
+                    it.into('WEB-INF/classes')
+                }
             } else if (war.name == 'war') {
                 war.from(destDir)
+                war.from(webappDestDir)
             }
 
             if (war.classpath) {
-                war.classpath = war.classpath + project.files(destDir)
+                war.classpath = war.classpath + project.files(destDir, webappDestDir)
             } else {
-                war.classpath = project.files(destDir)
+                war.classpath = project.files(destDir, webappDestDir)
             }
         }
 
@@ -115,8 +120,12 @@ class GroovyPagePlugin implements Plugin<Project> {
                     jar.from(destDir) { CopySpec it ->
                         it.into('BOOT-INF/classes')
                     }
+                    jar.from(webappDestDir) { CopySpec it ->
+                        it.into('BOOT-INF/classes')
+                    }
                 } else if (jar.name == 'jar') {
                     jar.from(destDir)
+                    jar.from(webappDestDir)
                 }
             }
         }

grails-gradle/tasks/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy

@@ -93,11 +93,6 @@ abstract class FindMainClassTask extends DefaultTask {
     @TaskAction
     void setMainClassProperty() {
         File cacheFile = mainClassCacheFile.get().asFile
-        if (cacheFile.exists()) {
-            // the only time this task should invoke is when gradle has deemed it necessary to run, always remove the
-            // the cache file to prevent invalid states when running tasks other than bootRun, bootJar, or bootWar
-            cacheFile.delete()
-        }
 
         if (mainClassName.isPresent()) {
             def overrideClassName = mainClassName.get()