Merge pull request #910 from grails/restore-domain-inheritance

Use grails-bom, grails-bom h2 version, fix h2 tests & restore domain inheritance tests

Author: jamesfredley

boot-plugin/build.gradle

@@ -13,5 +13,5 @@ dependencies {
 
     testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
     testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
-    testRuntimeOnly "com.h2database:h2:$h2Version"
+    testRuntimeOnly "com.h2database:h2"
 }

build.gradle

@@ -83,7 +83,6 @@ subprojects { Project subproject ->
     if(isExample) {
         apply plugin: "groovy"
 
-        ext['h2.version'] = h2Version
         ext['gorm.version'] = gormVersion
 
         if(subproject.name.startsWith("examples-grails")) {
@@ -117,9 +116,8 @@ subprojects { Project subproject ->
             }
         }
 
-
-
         dependencies {
+            implementation platform("org.grails:grails-bom:$grailsVersion")
             testImplementation "jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationApiVersion"
             testImplementation "io.micrometer:micrometer-core:latest.integration"
             testImplementation "io.projectreactor:reactor-test:$projectReactorVersion"
@@ -184,6 +182,10 @@ subprojects { Project subproject ->
 
     apply plugin: 'groovy'
 
+    dependencies {
+        implementation platform("org.grails:grails-bom:$grailsVersion")
+    }
+
     configurations {
         documentation.extendsFrom(compileClasspath)
     }

examples/grails3-hibernate5/grails-app/domain/functional/tests/Employee.groovy

@@ -1,7 +1,6 @@
 package functional.tests
 
-// TODO domain inheritance
-class Employee /*extends Person*/ {
+class Employee extends Person {
 
     static belongsTo = [
             business: Business

examples/spring-boot-hibernate5/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
     implementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
 
-    runtimeOnly "com.h2database:h2:$h2Version"
+    runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
     runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
     runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"

examples/standalone-hibernate5/build.gradle

@@ -4,7 +4,7 @@ apply plugin:"groovy"
 
 dependencies {
     implementation project(":grails-datastore-gorm-hibernate5")
-    runtimeOnly "com.h2database:h2:$h2Version"
+    runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
     runtimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
     runtimeOnly "org.slf4j:slf4j-api:$slf4jVersion"

gradle.properties

@@ -13,9 +13,7 @@ grailsShellVersion=7.0.0-SNAPSHOT
 grailsSpringSecurityRestVersion=6.0.0-SNAPSHOT
 grailsVersion=7.0.0-SNAPSHOT
 groovydocGradlePluginVersion=1.0.1
-groovyVersion=4.0.23
-# Tests are built for 1.4.200, so stick with older version
-h2Version=1.4.200
+groovyVersion=4.0.24-SNAPSHOT
 hibernate5Version=5.6.15.Final
 hibernateValidatorVersion=8.0.1.Final
 hibernateGroovyProxy=1.1

grails-datastore-gorm-hibernate5/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     testImplementation "org.grails:grails-datastore-gorm-tck:$gormVersion", {
         exclude group: "org.spockframework"
     }
-    testImplementation "com.h2database:h2:$h2Version"
+    testImplementation "com.h2database:h2"
 
     testImplementation "org.hibernate:hibernate-ehcache:$hibernate5Version"
 

grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy

@@ -47,8 +47,7 @@ class Iteration {
 //    static mappedBy = [products: 'iteration', otherProducts: 'none']
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Product extends SuperProduct {
 
     static belongsTo = [iteration: Iteration]

grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy

@@ -73,8 +73,7 @@ class Company {
         tablePerSubclass  true
     }
 }
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Vendor extends Company {
 
     static constraints = {

grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/events/UpdatePropertyInEventListenerSpec.groovy

@@ -69,6 +69,11 @@ class UpdatePropertyInEventListenerSpec extends Specification {
 class User {
     String username
     String password
+
+    static mapping = {
+        table '`user`'
+        password column: '`password`'
+    }
 }
 
 class PasswordEncodingListener extends AbstractPersistenceEventListener {