Merge branch '7.0.x' into renovate/jackson.version

Author: codeconsole

.github/workflows/gradle.yml

@@ -35,7 +35,7 @@ jobs:
         env:
           DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
-        run: ./gradlew build groovydoc
+        run: ./gradlew build assemble groovydoc
   publish:
     if: github.event_name == 'push'
     needs: build

build.gradle

@@ -102,12 +102,6 @@ allprojects {
         maven { url = 'https://repo.grails.org/grails/core' }
         maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' }
         // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
-        if(groovyVersion.endsWith('-SNAPSHOT')) {
-            maven {
-                name = 'ASF Snapshot repo'
-                url = 'https://repository.apache.org/content/repositories/snapshots'
-            }
-        }
     }
 
     configurations {
@@ -296,7 +290,7 @@ subprojects { subproject ->
     if (subproject.name in ['grails-dependencies', 'grails-bom']) return
 
     dependencies {
-        implementation platform(project(':grails-bom'))
+        api platform(project(':grails-bom'))
     }
 
     if (subproject.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) {

gradle.properties

@@ -75,6 +75,6 @@ profiles-web.version=7.0.1-SNAPSHOT
 profiles-web-plugin.version=7.0.1-SNAPSHOT
 spock.version=2.3-groovy-4.0
 spotbugs-annotations.version=4.8.6
-spring-boot.version=3.3.5
+spring-boot.version=3.4.0-RC1
 springloaded.version=1.2.8.RELEASE
 views-json-testing-support.version=4.0.0-SNAPSHOT

grails-core/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     api project(":grails-bootstrap")
     api project(":grails-spring")
 
-    api "org.grails:grails-datastore-core"
+    api "org.grails:grails-datastore-core:${project['grails-datastore.version']}"
 
     testImplementation "org.springframework:spring-jdbc"
 

grails-web-common/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     }
     api project(":grails-databinding")
     api project(":grails-encoder")
-    api "org.grails:grails-gsp"
+    compileOnly "org.grails:grails-gsp"
 
     api "org.apache.groovy:groovy-templates"
     compileOnly "jakarta.servlet:jakarta.servlet-api"

grails-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java

@@ -69,8 +69,6 @@ private void renderWithinGrailsWebRequest(Map<String, Object> model, HttpServlet
             } else {
                 webRequest = (GrailsWebRequest)requestAttributes;
             }
-            // Update response holder to latest response. Necessary for sitemesh to trigger buffering.
-            WrappedResponseHolder.setWrappedResponse(response);
             renderTemplate(model, webRequest, request, response);
         } finally {
             if(attributesChanged) {

grails-web-databinding/build.gradle

@@ -1,4 +1,5 @@
 dependencies {
     api project(":grails-databinding")
     api project(":grails-web-common")
+    testRuntimeOnly "org.grails:grails-gsp"
 }

grails-web-url-mappings/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
     api project(":grails-web-common")
+    compileOnly "org.grails:grails-gsp"
 
     api("org.grails:grails-datastore-gorm-validation")