Merge pull request #13975 from jdaugherty/7.0.x

 #13552 Integrate `grails-testing-support` from grails/grails-testing-support into grails-core

Author: jdaugherty

build.gradle

@@ -210,7 +210,7 @@ subprojects { subproject ->
 
     ext.pomInfo = {
         delegate.name 'Grails® framework'
-        delegate.description 'Grails Web Application Framework'
+        delegate.description subproject.name == 'grails-testing-support' ? 'Support for writing concise expressive tests for Grails artifacts' : 'Grails Web Application Framework'
         delegate.url 'https://grails.org/'
 
         delegate.licenses {
@@ -227,11 +227,25 @@ subprojects { subproject ->
             delegate.developerConnection 'scm:[email protected]:grails/grails-core.git'
         }
 
-        delegate.developers {
-            delegate.developer {
-                delegate.id 'graemerocher'
-                delegate.name 'Graeme Rocher'
-                delegate.email '[email protected]'
+        if(subproject.name == 'grails-testing-support') {
+            delegate.developers {
+                delegate.developer {
+                    delegate.id 'jeffscottbrown'
+                    delegate.name 'Jeff Brown'
+                }
+                delegate.developer {
+                    delegate.id 'jameskleeh'
+                    delegate.name 'James Kleeh'
+                }
+            }
+        }
+        else {
+            delegate.developers {
+                delegate.developer {
+                    delegate.id 'graemerocher'
+                    delegate.name 'Graeme Rocher'
+                    delegate.email '[email protected]'
+                }
             }
         }
     }
@@ -391,8 +405,6 @@ subprojects { subproject ->
         testImplementation "org.junit.platform:junit-platform-runner"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
-        compileOnly "com.github.spotbugs:spotbugs-annotations"
-
         if (subproject.name != "grails-docs") {
             // Logging
             api "org.slf4j:slf4j-api"

dependabot/build.gradle

@@ -12,7 +12,6 @@ dependencies {
     api "net.bytebuddy:byte-buddy:${project['byte-buddy.version']}"
     api "commons-codec:commons-codec:${project['commons-codec.version']}"
     api "org.apache.commons:commons-text:${project['commons-text.version']}"
-    api "org.grails.plugins:converters:${project['converters.version']}"
     api "io.methvin:directory-watcher:${project['directory-watcher.version']}"
     api "org.xhtmlrenderer:flying-saucer-pdf-openpdf:${project['flying-saucer-pdf-openpdf.version']}"
     api "org.webjars.npm:bootstrap:${project['bootstrap.version']}"
@@ -34,7 +33,6 @@ dependencies {
     api "org.grails:grails-gdoc-engine:${project['grails-gdoc-engine.version']}"
     api "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
     api "org.grails:grails-gorm-testing-support:${project['grails-testing-support.version']}"
-    api "org.grails:grails-testing-support:${project['grails-testing-support.version']}"
     api "org.grails:grails-web-testing-support:${project['grails-testing-support.version']}"
     api "org.apache.groovy:groovy-bom:${project['groovy.version']}"
     api "org.grails:grails-gsp:${project['gsp.version']}"
@@ -78,7 +76,6 @@ dependencies {
     api "org.grails.profiles:web:${project['profiles-web.version']}"
     api "org.spockframework:spock-core:${project['spock.version']}"
     api "org.spockframework:spock-spring:${project['spock.version']}"
-    api "com.github.spotbugs:spotbugs-annotations:${project['spotbugs-annotations.version']}"
     api "org.springframework.boot:spring-boot-cli:${project['spring-boot.version']}"
     api "org.springframework.boot:spring-boot-gradle-plugin:${project['spring-boot.version']}"
     api "org.springframework:springloaded:${project['springloaded.version']}"

gradle.properties

@@ -15,9 +15,6 @@ plexusComponentApiVersion=1.0-alpha-33
 plexusSecDispatcherVersion=1.4
 plexusSisuInjectVersion=2.6.0
 slf4jVersion=2.0.16
-rxJava1Version=1.3.8
-rxJava2Version=2.2.21
-rxJava3Version=3.1.10
 gparsVersion=1.2.1
 
 org.gradle.caching=true
@@ -33,8 +30,8 @@ preventSnapshotPublish=false
 # https://github.com/grails/grails-gradle-plugin/issues/222
 slf4jPreventExclusion=true
 
-# Generated on Tue Jan 07 15:14:48 EST 2025 by: ./gradlew :grails-bom:syncProps
-# Only version value modifications allowed after this point. Do not insert or change version names.
+# Generated on Thu Jan 16 10:23:54 EST 2025 by: ./gradlew :grails-bom:syncProps
+# Only version value modifications allowed after this point. Do not insert or change version names. 
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
 asset-pipeline-gradle.version=5.0.5
@@ -44,7 +41,6 @@ bootstrap-icons.version=1.11.3
 byte-buddy.version=1.15.5
 commons-codec.version=1.17.1
 commons-text.version=1.12.0
-converters.version=6.0.0-SNAPSHOT
 directory-watcher.version=0.18.0
 flying-saucer-pdf-openpdf.version=9.4.0
 geb-spock.version=7.0
@@ -53,7 +49,6 @@ grails-datastore-gorm-hibernate5.version=9.0.0-SNAPSHOT
 grails-datastore-gorm-mongodb.version=9.0.0-SNAPSHOT
 grails-gdoc-engine.version=1.0.1
 grails-gradle-plugin.version=7.0.0-SNAPSHOT
-grails-testing-support.version=4.0.0-SNAPSHOT
 groovy.version=4.0.24
 gsp.version=7.0.0-SNAPSHOT
 h2.version=2.3.232
@@ -73,8 +68,6 @@ plugins-geb.version=5.0.0-SNAPSHOT
 plugins-hibernate5.version=9.0.0-SNAPSHOT
 plugins-mongodb.version=9.0.0-SNAPSHOT
 plugins-neo4j.version=8.1.0
-plugins-rxjava.version=1.1.1
-plugins-rxjava2.version=2.0.0
 plugins-scaffolding.version=6.0.0-SNAPSHOT
 plugins-views-gradle.version=4.0.0-SNAPSHOT
 plugins-views-json.version=4.0.0-SNAPSHOT
@@ -90,8 +83,10 @@ profiles-rest-api-plugin.version=7.0.1
 profiles-vue.version=7.0.1
 profiles-web.version=7.0.1
 profiles-web-plugin.version=7.0.1
+rxjava.version=1.3.8
+rxjava2.version=2.2.21
+rxjava3.version=3.1.10
 spock.version=2.3-groovy-4.0
-spotbugs-annotations.version=4.8.6
 spring-boot.version=3.4.1
 springloaded.version=1.2.8.RELEASE
 views-json-testing-support.version=4.0.0-SNAPSHOT

grails-async/rxjava/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-async-core')
-    api "io.reactivex:rxjava:$rxJava1Version"
+    api "io.reactivex:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-async/rxjava2/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-async-core')
-    api "io.reactivex.rxjava2:rxjava:$rxJava2Version"
+    api "io.reactivex.rxjava2:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-async/rxjava3/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-async-core')
-    api "io.reactivex.rxjava3:rxjava:$rxJava3Version"
+    api "io.reactivex.rxjava3:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-bom/build.gradle

@@ -31,25 +31,25 @@ ext {
         com.h2database:h2::
         commons-codec:commons-codec::
         io.methvin:directory-watcher::
+        io.reactivex:rxjava:::rxjava
+        io.reactivex.rxjava2:rxjava:::rxjava2
+        io.reactivex.rxjava3:rxjava:::rxjava3
         jline:jline::
         net.bytebuddy:byte-buddy::
         net.java.dev.jna:jna::
         org.apache.ant:ant:,junit:
         org.apache.commons:commons-text::
-        org.apache.groovy:groovy:bom:$groovyVersion
+        org.apache.groovy:groovy:bom:::
         org.asciidoctor:asciidoctorj::
         org.fusesource.jansi:jansi::
         org.gebish:geb-spock::
-        com.github.spotbugs:spotbugs-annotations::
-        org.grails.plugins:converters::
         org.grails.plugins:gsp::
         org.grails:grails-datastore-gorm-hibernate5::
         org.grails:grails-datastore-gorm-mongodb::
-        org.grails:grails-datastore:async,core,gorm,gorm-async,gorm-support,gorm-rx,gorm-test,gorm-validation,web,gorm-tck:
+        org.grails:grails-datastore-async,grails-datastore-core,grails-datastore-gorm,grails-datastore-gorm-async,grails-datastore-gorm-support,grails-datastore-gorm-rx,grails-datastore-gorm-test,grails-datastore-gorm-validation,grails-datastore-web,grails-datastore-gorm-tck,grails-gorm-testing-support:::grails-datastore
         org.grails:grails-gdoc-engine::
         org.grails:grails-gradle-plugin::
-        org.grails:grails-testing-support,grails-gorm-testing-support,grails-web-testing-support::
-        org.grails:grails:gsp,web-gsp,web-taglib::gsp
+        org.grails:grails:gsp,web-gsp,web-taglib,web-testing-support::gsp
         org.grails:views-json-testing-support::
         org.jsoup:jsoup::
         org.mongodb:bson:,record-codec::mongodb

grails-bom/plugins.properties

@@ -6,8 +6,6 @@ hibernate5=9.0.0-SNAPSHOT
 mongodb=9.0.0-SNAPSHOT
 views-json-templates=9.0.0-SNAPSHOT
 neo4j=8.1.0
-rxjava=1.1.1
-rxjava2=2.0.0
 scaffolding=6.0.0-SNAPSHOT
 views-gradle=4.0.0-SNAPSHOT
 views-json=4.0.0-SNAPSHOT

grails-core/build.gradle

@@ -18,6 +18,8 @@ dependencies {
     api project(":grails-bootstrap")
     api project(":grails-spring")
 
+    // This only needs the datastore version property because of how source jars are being created.
+    // Build will succeed, but assemble will fail without this because of task ordering in gradle.
     api "org.grails:grails-datastore-core:${project['grails-datastore.version']}"
 
     testImplementation "org.springframework:spring-jdbc"

grails-events/rxjava/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-events-core')
-    api "io.reactivex:rxjava:$rxJava1Version"
+    api "io.reactivex:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-events/rxjava2/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-events-core')
-    api "io.reactivex.rxjava2:rxjava:$rxJava2Version"
+    api "io.reactivex.rxjava2:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-events/rxjava3/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api project(':grails-events-core')
-    api "io.reactivex.rxjava3:rxjava:$rxJava3Version"
+    api "io.reactivex.rxjava3:rxjava"
 
     implementation 'org.apache.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'

grails-plugin-databinding/build.gradle

@@ -12,7 +12,9 @@
         exclude module:'grails-core'
         exclude module:'async'
         exclude module:'gsp'
+        exclude module:'grails-testing-support'
     }
+    testImplementation project(':grails-testing-support')
 }
 
 tasks.named('compileTestGroovy').configure {

grails-plugin-rest/build.gradle

@@ -6,7 +6,7 @@ dependencies {
             project(":grails-plugin-controllers"),
             project(":grails-plugin-datasource")
 
-    api "org.grails.plugins:converters"
+    api project(":grails-plugin-converters")
 
     implementation "com.github.ben-manes.caffeine:caffeine"
     testImplementation project(":grails-plugin-url-mappings"),

grails-test-suite-base/build.gradle

@@ -6,5 +6,5 @@ dependencies {
         project(':grails-test'),
         project(':grails-plugin-domain-class')
 
-    api "org.grails.plugins:converters"
+    api project(":grails-plugin-converters")
 }

grails-test-suite-persistence/build.gradle

@@ -29,7 +29,10 @@ dependencies {
     testRuntimeOnly "org.aspectj:aspectjrt", "org.aspectj:aspectjweaver"
 
     testImplementation project(':grails-async-plugin')
-    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails:grails-gorm-testing-support", {
+        exclude module:'grails-testing-support'
+    }
+    testImplementation project(':grails-testing-support')
 }
 
 test {

grails-test-suite-uber/build.gradle

@@ -28,7 +28,10 @@ dependencies {
     testImplementation project(':grails-async-plugin')
     testImplementation "org.grails.plugins:gsp"
     testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails:grails-web-testing-support", {
+        exclude module:'grails-testing-support'
+    }
+    testImplementation project(':grails-testing-support')
 
     testImplementation "com.fasterxml.jackson.core:jackson-databind"
 }

grails-test-suite-web/build.gradle

@@ -25,9 +25,12 @@ dependencies {
                 project(':grails-web-databinding'),
                 project(':grails-spring')
 
-    testImplementation "org.grails.plugins:converters"
+    testImplementation project(":grails-plugin-converters")
     testImplementation "org.grails:grails-datastore-gorm-hibernate5"
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails:grails-web-testing-support", {
+        exclude module:'grails-testing-support'
+    }
+    testImplementation project(':grails-testing-support')
     testImplementation "org.grails.plugins:gsp"
     testImplementation project(':grails-async-plugin')
     testImplementation "org.grails:grails-gorm-testing-support"

grails-test/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 
     api project(":grails-plugin-mimetypes")
     api project(":grails-web")
-    api "org.grails.plugins:converters"
+    api project(":grails-plugin-converters")
 
     // command line requirements
     api  "jline:jline"

grails-testing-support/README.md

@@ -0,0 +1,3 @@
+## grails-testing-support
+
+Contains the core testing libraries used by any of the various testing support libraries in Grails.

grails-testing-support/build.gradle

@@ -0,0 +1,19 @@
+dependencies {
+    implementation platform(project(':grails-bom'))
+
+    api "org.springframework:spring-test"
+    api project(":grails-plugin-codecs"), {
+        exclude module: 'grails-plugin-mimetypes'
+        exclude module: 'grails-plugin-converters'
+        exclude module: 'grails-web'
+    }
+
+    api project(":grails-plugin-databinding")
+    api "org.grails:grails-datastore-gorm"
+    api project(":grails-test")
+    api "org.springframework.boot:spring-boot-test"
+    api("org.spockframework:spock-spring") { transitive = false }
+    api "org.junit.jupiter:junit-jupiter-api"
+    api "org.junit.platform:junit-platform-runner"
+    runtimeOnly "org.junit.jupiter:junit-jupiter-engine"
+}

grails-testing-support/src/main/groovy/grails/testing/mixin/integration/Integration.groovy

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed 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.
+ */
+
+package grails.testing.mixin.integration
+
+import org.codehaus.groovy.transform.GroovyASTTransformationClass
+
+import java.lang.annotation.ElementType
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+/**
+ * Transformation to apply to integration tests
+ *
+ * @author Graeme Rocher
+ * @since 2.3
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target([ElementType.TYPE])
+@GroovyASTTransformationClass("org.grails.compiler.injection.testing.IntegrationTestMixinTransformation")
+public @interface Integration {
+
+    /**
+     *
+     * Specify the Application class which should be used for
+     * this functional test.  If unspecified the test runtime
+     * environment will attempt to locate a class in the project
+     * which extends grails.boot.config.GrailsAutoConfiguration
+     * which can be problematic in multi project builds where
+     * multiple Application classes may exist.
+     */
+    Class applicationClass() default {}
+}