Merge branch 'jamesfredley/fix-use-gradle-groovy-version' of https://…

…github.com/grails/grails-gradle-plugin into jamesfredley/fix-use-gradle-groovy-version
grails · Sep 20, 2024 · e9330b1 · e9330b1
2 parents f801917 + e384def
commit e9330b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,7 +75,7 @@ java {
 }
 
 // resolve conflict from Gradle's version of Groovy. Not needed if Gradle switches to 4.0
-configurations.configureEach { exclude group: 'org.apache.groovy' }
+configurations.configureEach { exclude group: 'org.apache.groovy', module: 'groovy-xml' }
 
 dependencies {
     // compile grails-gradle-plugin with the Groovy version provided by Gradle

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 projectVersion=7.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
 grailsShellVersion=7.0.0-SNAPSHOT
-springBootVersion=3.3.3
+springBootVersion=3.3.4
 org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M