Dependency cleanup

build.gradle

@@ -91,10 +91,10 @@ subprojects { subproject ->
             api "org.apache.groovy:groovy:$groovyVersion"
             api "org.slf4j:slf4j-api:$slf4jVersion"
 
-            testImplementation "org.spockframework:spock-core:$spockVersion"
-            testImplementation "org.springframework:spring-test:$springVersion"
+            testImplementation "org.spockframework:spock-core"
+            testImplementation "org.springframework:spring-test"
 
-            documentation "org.fusesource.jansi:jansi:$jansiVersion"
+            documentation "org.fusesource.jansi:jansi"
 
         }
 
@@ -107,7 +107,7 @@ subprojects { subproject ->
         groovydoc.classpath += (configurations.documentation + configurations.compileClasspath)
 
         dependencies {
-            documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
+            documentation "org.apache.groovy:groovy-dateutil"
         }
     }
 
@@ -129,13 +129,6 @@ subprojects { subproject ->
             }
         }
 
-        // FORCE UPGRADE OF SPRING BOOT IN DEPENDENCIES TO SPRING BOOT 3
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.springframework.boot') {
-                details.useTarget(group: 'org.springframework.boot', name: details.requested.name, version: springBootVersion)
-            }
-        }
-
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             if (details.requested.group == "org.spockframework") {
                 details.useVersion(spockVersion)
@@ -148,14 +141,14 @@ subprojects { subproject ->
     }
 
     dependencies {
-        compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-
-        testImplementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
-        implementation "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion"
-        testImplementation "org.apache.groovy:groovy-test-junit5:${groovyVersion}"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
-        testImplementation "org.junit.platform:junit-platform-runner:${junitPlatformVerison}"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
+        compileOnly "jakarta.servlet:jakarta.servlet-api"
+
+        testImplementation "jakarta.servlet:jakarta.servlet-api"
+        implementation "jakarta.persistence:jakarta.persistence-api"
+        testImplementation "org.apache.groovy:groovy-test-junit5"
+        testImplementation "org.junit.jupiter:junit-jupiter-api"
+        testImplementation "org.junit.platform:junit-platform-runner"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
     }
 
     tasks.withType(Test) {
@@ -177,14 +170,14 @@ subprojects { subproject ->
 
     dependencies {
         if (configurations.find { subproject.name == 'documentation' }) {
-            documentation "org.fusesource.jansi:jansi:$jansiVersion"
-            documentation "jline:jline:$jlineVersion"
-            documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
-            documentation "org.apache.groovy:groovy:${groovyVersion}"
-            documentation "org.apache.groovy:groovy-ant:$groovyVersion"
-            documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
-            documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion"
-            documentation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
+            documentation "org.fusesource.jansi:jansi"
+            documentation "jline:jline"
+            documentation "com.github.javaparser:javaparser-core"
+            documentation "org.apache.groovy:groovy"
+            documentation "org.apache.groovy:groovy-ant"
+            documentation "org.apache.groovy:groovy-dateutil"
+            documentation "org.apache.groovy:groovy-cli-picocli"
+            documentation "org.asciidoctor:asciidoctorj"
         }
     }
 
@@ -350,14 +343,14 @@ configurations {
 
 dependencies {
     if (configurations.find { it.name == 'documentation' }) {
-        documentation "info.picocli:picocli:$picocliVersion"
-        documentation "org.fusesource.jansi:jansi:$jansiVersion"
-        documentation "jline:jline:$jlineVersion"
-        documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
-        documentation "org.apache.groovy:groovy:${groovyVersion}"
-        documentation "org.apache.groovy:groovy-ant:$groovyVersion"
-        documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion"
-        documentation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
+        documentation "info.picocli:picocli"
+        documentation "org.fusesource.jansi:jansi"
+        documentation "jline:jline"
+        documentation "com.github.javaparser:javaparser-core"
+        documentation "org.apache.groovy:groovy"
+        documentation "org.apache.groovy:groovy-ant"
+        documentation "org.apache.groovy:groovy-cli-picocli"
+        documentation "org.asciidoctor:asciidoctorj"
     }
 }
 

gradle.properties

@@ -7,25 +7,15 @@ githubSlug=grails/grails-gsp
 githubBranch=7.0.x
 developers=Puneet Behl, Graeme Rocher
 
-asciidoctorjVersion=3.0.0
 commonsTextVersion=1.12.0
+elApiVersion=6.0.1
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
 groovyVersion=4.0.24-SNAPSHOT
-springVersion=6.1.14
-annotationApiVersion=3.0.0
-byteBuddyVersion=1.15.5
-elApiVersion=6.0.1
-servletApiVersion=6.0.0
-javaParserCoreVersion=3.26.2
-jakartaPersistenceVersion=3.1.0
-jansiVersion=2.4.1
-jlineVersion=2.14.6
 jspApiVersion=4.0.0
 jstlVersion=3.0.1
 junitJupiterVersion=5.11.2
 junitPlatformVerison=1.11.2
-picocliVersion=3.8.0
 sitemeshVersion=7.0.0-SNAPSHOT
 spockVersion=2.3-groovy-4.0
 slf4jVersion=2.0.16

grails-gsp/build.gradle

@@ -1,7 +1,5 @@
 dependencies {
-    api "org.grails:grails-core:$grailsVersion", {
-        exclude group:'org.grails', module:'grails-spring'
-    }
+    api "org.grails:grails-core:$grailsVersion"
     api project(":grails-taglib")
     api "org.apache.groovy:groovy-templates:$groovyVersion"
 }

grails-plugin-gsp/build.gradle

@@ -14,33 +14,27 @@ configurations.all {
     }
 }
 dependencies {
-    compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
+    compileOnly "jakarta.servlet:jakarta.servlet-api"
     api project(":grails-web-gsp-taglib")
     api "org.sitemesh:grails-plugin-sitemesh3:$sitemeshVersion"
 
     runtimeOnly(project(":grails-web-jsp"))
     api "org.apache.commons:commons-text:$commonsTextVersion"
     api "org.grails:grails-plugin-codecs:$grailsVersion"
-    astImplementation "org.grails:grails-web:$grailsVersion"
-    astImplementation "org.grails:grails-plugin-controllers:$grailsVersion"
+    astImplementation "org.grails:grails-web"
+    astImplementation "org.grails:grails-plugin-controllers"
 
-    testImplementation "org.grails:grails-web-testing-support:$testingSupportVersion", {
-        exclude module:'async'
-    }
-    testImplementation "org.grails:grails-testing-support:$testingSupportVersion", {
-        exclude module:'async'
-    }
-    testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion", {
-        exclude module:'async'
-    }
+    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails:grails-testing-support"
+    testImplementation "org.grails:grails-gorm-testing-support"
 
     testRuntimeOnly "org.grails.plugins:async"
-    testImplementation "jakarta.annotation:jakarta.annotation-api:$annotationApiVersion"
+    testImplementation "jakarta.annotation:jakarta.annotation-api"
     testImplementation "jakarta.servlet.jsp:jakarta.servlet.jsp-api:${jspApiVersion}"
     testRuntimeOnly "org.glassfish.web:jakarta.servlet.jsp.jstl:${jstlVersion}"
     testImplementation "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:${jstlVersion}"
 
-    testRuntimeOnly "org.grails:grails-plugin-url-mappings:$grailsVersion"
+    testRuntimeOnly "org.grails:grails-plugin-url-mappings"
 }
 
 test {

grails-taglib/build.gradle

@@ -1,6 +1,4 @@
 dependencies {
-    api "org.grails:grails-core:$grailsVersion", {
-        exclude group:'org.grails', module:'grails-spring'
-    }
+    api "org.grails:grails-core:$grailsVersion"
     api "org.grails:grails-encoder:$grailsVersion"
 }

grails-web-gsp-taglib/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
+    compileOnly "jakarta.servlet:jakarta.servlet-api"
     api project(':grails-web-jsp')
 }

grails-web-gsp/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-    compileOnly "org.apache.ant:ant:${antVersion}"
+    compileOnly "org.apache.ant:ant"
     api project(":grails-gsp")
     api "org.grails:grails-web-common:$grailsVersion"
     api project(":grails-web-taglib")
 
-    testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion"
-    testRuntimeOnly "org.grails:grails-spring:$grailsVersion"
+    testImplementation "net.bytebuddy:byte-buddy"
+    testRuntimeOnly "org.grails:grails-spring"
 }

grails-web-jsp/build.gradle

@@ -3,7 +3,7 @@ dependencies {
     api project(":grails-web-gsp")
 
 
-    compileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
+    compileOnly "jakarta.servlet:jakarta.servlet-api"
     // Required for JSP support
     compileOnly "jakarta.servlet.jsp:jakarta.servlet.jsp-api:$jspApiVersion"
     compileOnly "jakarta.el:jakarta.el-api:$elApiVersion"

grails-web-taglib/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
-    compileOnlyApi "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
+    compileOnlyApi "jakarta.servlet:jakarta.servlet-api"
     api "org.grails:grails-web-common:$grailsVersion"
     api project(":grails-taglib")
 
-    testRuntimeOnly "org.grails:grails-spring:$grailsVersion"
+    testRuntimeOnly "org.grails:grails-spring"
 }
 
 // TODO: Remove this after update to Grails 5.0.0.M2