Merge branch '7.0.x' into docs/configuration-hybrid

Author: jamesfredley

dependencies.gradle

@@ -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

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()

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

@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package functionaltests
+
+import spock.lang.Specification
+
+import grails.testing.mixin.integration.Integration
+import org.apache.grails.testing.http.client.HttpClientSupport
+
+@Integration
+class GspInWebappDirSpec extends Specification implements HttpClientSupport {
+
+    def 'GSP in src/main/webapp renders'() {
+        when:
+        def response = http('/gsp-in-webapp-dir.gsp')
+
+        then:
+        response.assertContains(200, 'Hello from GSP in src/main/webapp')
+    }
+}

grails-test-examples/app1/src/main/webapp/gsp-in-webapp-dir.gsp

@@ -0,0 +1,28 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<html>
+<head>
+    <title>Testing GSP in src/main/webapp directory</title>
+</head>
+
+<body>
+<h1>Hello from GSP in src/main/webapp</h1>
+</body>
+</html>