Merge branch '9.0.x' into 9.0.x-6

grails · Nov 2, 2024 · 2b7a7d7 · 2b7a7d7
2 parents 2ce7d93 + be02fa9
commit 2b7a7d7
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 79 deletions.
diff --git a/boot-plugin/build.gradle b/boot-plugin/build.gradle
@@ -3,7 +3,7 @@ dependencies {
         exclude group:'org.apache.groovy', module:'groovy'
     }
     api "org.apache.groovy:groovy:$groovyVersion"
-    api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
+    api "org.springframework.boot:spring-boot-autoconfigure"
     api project(":grails-datastore-gorm-hibernate6")
 
     testImplementation "org.grails:grails-shell:$grailsShellVersion", {

diff --git a/build.gradle b/build.gradle
@@ -94,38 +94,16 @@ subprojects { Project subproject ->
             }
         }
 
-        configurations.all { Configuration configuration->
-            configuration.resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-                if(details.requested.group == 'org.apache.groovy' && details.requested.name.startsWith('groovy')) {
-                    details.useVersion(groovyVersion)
-                }
-                if(details.requested.group == 'org.springframework') {
-                    details.useVersion(springVersion)
-                }
-                if (details.requested.group == "org.springframework.boot") {
-                    details.useVersion(springBootVersion)
-                }
-                if (details.requested.group == "org.grails" && details.requested.name.contains("testing-support")) {
-                    details.useVersion(testingSupportVersion)
-                }
-                if(details.requested.group == 'org.grails' &&
-                        details.requested.name.startsWith('grails-datastore') &&
-                        details.requested.name != 'grails-datastore-gorm-hibernate6') {
-                    details.useVersion(gormVersion)
-                }
-            }
-        }
-
         dependencies {
             implementation platform("org.grails:grails-bom:$grailsVersion")
-            testImplementation "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
+            testImplementation "jakarta.annotation:jakarta.annotation-api"
             testImplementation "io.micrometer:micrometer-core:latest.integration"
-            testImplementation "io.projectreactor:reactor-test:$projectReactorVersion"
-            testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
-            testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}
-            testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-            testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
-            testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+            testImplementation "io.projectreactor:reactor-test"
+            testImplementation "org.apache.groovy:groovy-test-junit5"
+            testImplementation "org.spockframework:spock-core"
+            testImplementation "org.junit.jupiter:junit-jupiter-api"
+            testImplementation "org.junit.platform:junit-platform-runner"
+            testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
         }
 
         apply from: "${rootProject.projectDir}/gradle/testVerbose.gradle"
@@ -223,17 +201,18 @@ subprojects { Project subproject ->
     }
 
     dependencies {
-        documentation "org.fusesource.jansi:jansi:$jansiVersion"
-        documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
-        documentation "info.picocli:picocli:$picocliVersion"
-        documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion"
-
-        implementation "org.apache.groovy:groovy:$groovyVersion"
-        testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"
-        testImplementation("org.spockframework:spock-core:$spockVersion") { transitive = false}
-        testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-        testImplementation "org.junit.platform:junit-platform-runner:$junitJupiterPlatformVersion"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+        documentation platform("org.grails:grails-bom:$grailsVersion")
+        documentation "org.fusesource.jansi:jansi"
+        documentation "org.apache.groovy:groovy-dateutil"
+        documentation "info.picocli:picocli"
+        documentation "com.github.javaparser:javaparser-core"
+
+        implementation "org.apache.groovy:groovy"
+        testImplementation "org.apache.groovy:groovy-test-junit5"
+        testImplementation "org.spockframework:spock-core"
+        testImplementation "org.junit.jupiter:junit-jupiter-api"
+        testImplementation "org.junit.platform:junit-platform-runner"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
     }
 
     apply from: "${rootProject.projectDir}/gradle/testVerbose.gradle"

diff --git a/docs/build.gradle b/docs/build.gradle
@@ -17,20 +17,6 @@ version rootProject.version
 apply plugin: 'groovy'
 apply plugin: 'org.asciidoctor.jvm.convert'
 
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'org.apache.groovy' && details.requested.name.startsWith('groovy')) {
-            details.useVersion(groovyVersion)
-        }
-        if (details.requested.group == 'org.springframework') {
-            details.useVersion(springVersion)
-        }
-        if (details.requested.group == "org.springframework.boot") {
-            details.useVersion(springBootVersion)
-        }
-    }
-}
-
 dependencies {
     documentation "org.grails:grails-core:$grailsVersion"
     documentation "org.grails:grails-bootstrap:$grailsVersion"

diff --git a/examples/grails-database-per-tenant/build.gradle b/examples/grails-database-per-tenant/build.gradle
@@ -2,9 +2,6 @@ group "examples"
 
 configurations.all {
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == "org.springframework.boot") {
-            details.useVersion(springBootVersion)
-        }
     }
 }
 

diff --git a/examples/spring-boot-hibernate/build.gradle b/examples/spring-boot-hibernate/build.gradle
@@ -4,23 +4,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.3.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
-apply plugin:"groovy"
+apply plugin: "groovy"
 
 group 'examples'
 
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if(details.requested.group == 'org.apache.groovy' && details.requested.name.startsWith('groovy')) {
-            details.useVersion(groovyVersion)   
-        }
-    }
-}  
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/gradle.properties b/gradle.properties
@@ -31,8 +31,6 @@ servletApiVersion=6.0.0
 snakeYamlVersion=2.3
 slf4jVersion=2.0.16
 spockVersion=2.3-groovy-4.0
-springBootVersion=3.3.5
-springVersion=6.1.13
 testingSupportVersion=4.0.0-SNAPSHOT
 tomcatLog4jVersion=8.5.2
 tomcatVersion=10.1.31

diff --git a/grails-datastore-gorm-hibernate6/build.gradle b/grails-datastore-gorm-hibernate6/build.gradle
@@ -2,8 +2,8 @@ dependencies {
     api "org.slf4j:slf4j-api:$slf4jVersion"
 
     api "org.apache.groovy:groovy:$groovyVersion"
-    api("org.grails:grails-datastore-gorm:$gormVersion")
-    api "org.springframework:spring-orm:$springVersion"
+    api "org.grails:grails-datastore-gorm"
+    api "org.springframework:spring-orm"
     api("org.hibernate:hibernate-core-jakarta:$hibernateVersion") {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'com.h2database', module:'h2'
@@ -46,7 +46,7 @@ dependencies {
     testImplementation "org.yakworks:hibernate-groovy-proxy:$hibernateGroovyProxy"
 
     testImplementation "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    testRuntimeOnly "org.springframework:spring-aop:$springVersion"
+    testRuntimeOnly "org.springframework:spring-aop"
     testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
 
     testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"

diff --git a/grails-plugin/build.gradle b/grails-plugin/build.gradle
@@ -5,9 +5,6 @@ configurations.all {
                 details.requested.name != 'grails-datastore-gorm-hibernate6') {
             details.useVersion(gormVersion)
         }
-        if(details.requested.group == 'org.springframework') {
-            details.useVersion(springVersion)
-        }
     }
 }
 
@@ -25,8 +22,8 @@ dependencies {
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
 
-    api "org.springframework.boot:spring-boot:$springBootVersion"
-    api "org.springframework:spring-orm:$springVersion"
+    api "org.springframework.boot:spring-boot"
+    api "org.springframework:spring-orm"
     api "org.hibernate:hibernate-core-jakarta:${hibernateVersion}"
     api "org.hibernate:hibernate-ehcache:$hibernateVersion"
     api "org.grails:grails-datastore-web:$gormVersion"
@@ -46,8 +43,8 @@ dependencies {
     testRuntimeOnly "com.h2database:h2"
     testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
     testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
-    testRuntimeOnly "org.springframework:spring-aop:$springVersion"
-    testRuntimeOnly "org.springframework:spring-expression:$springVersion"
+    testRuntimeOnly "org.springframework:spring-aop"
+    testRuntimeOnly "org.springframework:spring-expression"
 }
 
 groovydoc.classpath += configurations.documentation