Fix inheritance tests from grails 7 upgrade

.github/workflows/gradle.yml

@@ -31,7 +31,6 @@ jobs:
           DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         run: >
           ./gradlew
-          -Dgeb.env=chromeHeadless
           check
   build_project:
     runs-on: ubuntu-latest
@@ -54,7 +53,6 @@ jobs:
           DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         run: >
           ./gradlew
-          -Dgeb.env=chromeHeadless
           build
       - name: "📤 Publish Snapshot Artifacts to Artifactory (repo.grails.org)"
         if: success()

.github/workflows/groovy-joint-workflow.yml

@@ -141,6 +141,5 @@ jobs:
         run: >
           ./gradlew
           build
-          -Dgeb.env=chromeHeadless
           -PgroovyVersion=${{needs.build_groovy.outputs.groovyVersion}}
           -x groovydoc

.sdkmanrc

@@ -0,0 +1,2 @@
+# Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env
+java=17.0.12-librca

examples/functional-tests-plugin/src/main/groovy/functional/tests/plugin/ExamplesFunctionalTestsPluginGrailsPlugin.groovy

@@ -5,7 +5,7 @@ import grails.plugins.*
 class ExamplesFunctionalTestsPluginGrailsPlugin extends Plugin {
 
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "4.0.0.BUILD-SNAPSHOT > *"
+    def grailsVersion = "7.0.0-SNAPSHOT > *"
     // resources that are excluded from plugin packaging
     def pluginExcludes = [
         "grails-app/views/error.gsp"

examples/functional-tests/grails-app/domain/functional/tests/Garage.groovy

@@ -4,7 +4,6 @@ class Garage {
 
     String owner
 
-    // GORM Inheritance not working in Groovy 4
-    //static hasMany = [vehicles: Vehicle]
+    static hasMany = [vehicles: Vehicle]
 
 }

examples/functional-tests/grails-app/init/BootStrap.groovy

@@ -36,15 +36,10 @@ class BootStrap {
 
         new Proxy(name: "Sally").save(flush: true, failOnError: true)
 
-        // GORM inheritance not working in Groovy 4
-        // See https://issues.apache.org/jira/browse/GROOVY-5106,
-        // https://github.com/grails/grails-views/pull/589
-        /*
         new Garage(owner: "Jay Leno")
                 .addToVehicles(new Bus(maxPassengers: 30, route: "around town"))
                 .addToVehicles(new Car(maxPassengers: 4, make: "Subaru", model: "WRX", year: 2016))
                 .save(flush: true, failOnError: true)
-         */
 
         new Customer(name: "Nokia")
                 .addToSites(new Site(name: "Salo"))

examples/functional-tests/src/integration-test/groovy/functional/tests/VehicleSpec.groovy

@@ -17,19 +17,17 @@ class VehicleSpec extends HttpClientSpec {
         super.init()
     }
 
-    @PendingFeature(reason = 'GORM inheritance not working in Groovy 4')
     void "Test that domain subclasses render their properties"() {
         when:
         HttpRequest request = HttpRequest.GET('/vehicle/list')
         HttpResponse<String> resp = client.toBlocking().exchange(request, String)
 
         then:"The correct response is returned"
         resp.status == HttpStatus.OK
-        resp.body() == '[{"id":1,"route":"around town","maxPassengers":30},{"id":2,"make":"Subaru","year":2016,"model":"WRX","maxPassengers":4}]'
+        resp.body() == '[{"id":1,"route":"around town","maxPassengers":30},{"id":2,"make":"Subaru","model":"WRX","year":2016,"maxPassengers":4}]'
 
     }
 
-    @PendingFeature(reason = 'GORM inheritance not working in Groovy 4')
     void "Test that domain association subclasses render their properties"() {
         when:
         HttpRequest request = HttpRequest.GET('/vehicle/garage')

gradle/libs.versions.toml

@@ -3,11 +3,11 @@ assetpipeline = '5.0.1'
 caffeine = '2.9.3'
 gorm = '9.0.0-SNAPSHOT'
 gorm-hibernate5 = '9.0.0-SNAPSHOT'
-gorm-mongodb = '8.2.0'
+gorm-mongodb = '9.0.0-SNAPSHOT'
 grails = '7.0.0-SNAPSHOT'
 grails-gradle-plugin = '7.0.0-SNAPSHOT'
 grails-testing-support = '4.0.0-SNAPSHOT'
-groovy = '4.0.22'
+groovy = '4.0.24'
 java-baseline = '17'
 jackson-databind = '2.18.0'
 jakarta-annotation-api = '3.0.0'

json/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     testImplementation libs.grails.datastore.gorm.hibernate5
     testImplementation libs.spock.core
     testImplementation libs.jackson.databind
+    testImplementation libs.jakarta.servlet.api
 
     testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task
 }

json/src/main/groovy/grails/plugin/json/view/JsonViewGrailsPlugin.groovy

@@ -10,7 +10,7 @@ import grails.views.resolve.PluginAwareTemplateResolver
 class JsonViewGrailsPlugin extends Plugin {
 
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "6.0.0 > *"
+    def grailsVersion = "7.0.0 > *"
 
     def title = "JSON Views" // Headline display name of the plugin
     def author = "Graeme Rocher"

markup/build.gradle

@@ -24,6 +24,7 @@ dependencies {
 
     testImplementation libs.grails.web.urlmappings
     testImplementation libs.spock.core
+    testImplementation libs.jakarta.servlet.api
     testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task
 }
 

markup/src/main/groovy/grails/plugin/markup/view/MarkupViewGrailsPlugin.groovy

@@ -14,7 +14,7 @@ import grails.views.resolve.PluginAwareTemplateResolver
 class MarkupViewGrailsPlugin extends Plugin {
 
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "6.0.0 > *"
+    def grailsVersion = "7.0.0 > *"
 
     def title = "Markup Views" // Headline display name of the plugin
     def author = "Graeme Rocher"