build: remove module dependency on hibernate-ehcache

Moved `hibernate-ehcache` to a runtime dependency where needed for tests, making it optional and reducing unnecessary module coupling.

As a result, applications using `hibernate-ehcache` will now need to explicitly add it as a dependency.

Author: matrei

examples/grails-hibernate/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     runtimeOnly 'org.grails:grails-plugin-services'
     runtimeOnly 'org.grails:grails-plugin-url-mappings'
     runtimeOnly 'org.grails.plugins:fields'
+    runtimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
     runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
     runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'

gradle.properties

@@ -6,7 +6,6 @@ grailsGradlePluginVersion=7.0.0-M2
 grailsVersion=7.0.0-M1
 groovyVersion=4.0.24
 hibernateVersion=5.6.15.Final
-jbossTransactionApiVersion=2.0.0.Final
 yakworksHibernateGroovyProxyVersion=1.1
 micronautPlatformVersion=4.6.3
 picocliVersion=4.7.6

grails-datastore-gorm-hibernate/build.gradle

@@ -21,19 +21,6 @@ dependencies {
         exclude group:'org.slf4j', module:'slf4j-api'
     }
 
-    compileOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", {
-        exclude group:'commons-collections', module:'commons-collections'
-        exclude group:'commons-logging', module:'commons-logging'
-        exclude group:'com.h2database', module:'h2'
-        exclude group:'net.sf.ehcache', module:'ehcache'
-        exclude group:'net.sf.ehcache', module:'ehcache-core'
-        exclude group:'org.hibernate', module:'hibernate-core'
-        exclude group:'org.slf4j', module:'jcl-over-slf4j'
-        exclude group:'org.slf4j', module:'slf4j-api'
-        exclude group:'org.slf4j', module:'slf4j-log4j12'
-        exclude group:'xml-apis', module:'xml-apis'
-    }
-
     testImplementation "org.apache.groovy:groovy-test-junit5"
     testImplementation "org.apache.groovy:groovy-sql"
     testImplementation "org.apache.groovy:groovy-json"
@@ -42,22 +29,17 @@ dependencies {
     }
     testImplementation "com.h2database:h2"
 
-    testImplementation "org.hibernate:hibernate-ehcache:$hibernateVersion", {
-        exclude group:'org.hibernate', module:'hibernate-core'
-    }
-
     // groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass
     testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", {
         exclude group: "org.codehaus.groovy", module: "groovy"
     }
 
     testImplementation "org.apache.tomcat:tomcat-jdbc"
-    testRuntimeOnly "org.springframework:spring-aop"
 
+    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
     testRuntimeOnly "org.slf4j:slf4j-simple"
     testRuntimeOnly "org.slf4j:jcl-over-slf4j"
-    // The groovydoc task needs the Hibernate 4.x jars in the classpath
-    documentation "org.hibernate:hibernate-core-jakarta:${hibernateVersion}"
+    testRuntimeOnly "org.springframework:spring-aop"
 }
 
 test {

grails-plugin/build.gradle

@@ -25,14 +25,6 @@ dependencies {
     api "org.springframework.boot:spring-boot"
     api "org.springframework:spring-orm"
     api "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
-    api "org.hibernate:hibernate-ehcache:$hibernateVersion", {
-        exclude group:'org.hibernate', module:'hibernate-core'
-    }
-    // required for org.hibernate:hibernate-ehcache to work with org.hibernate:hibernate-core-jakarta
-    api "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
-        exclude group:"jakarta.enterprise", module:"jakarta.enterprise.cdi-api"
-    }
-
     api "org.grails:grails-datastore-web"
     api "org.grails:grails-datastore-gorm-support"
     api project(":grails-datastore-gorm-hibernate5"), {
@@ -45,12 +37,15 @@ dependencies {
         exclude group:'org.grails', module:'grails-core'
         exclude group:'javax.transaction', module:'jta'
     }
-    testRuntimeOnly "org.yaml:snakeyaml"
+
     testImplementation "org.grails:grails-gorm-testing-support"
+
     testRuntimeOnly "com.h2database:h2"
     testRuntimeOnly "org.apache.tomcat:tomcat-jdbc"
+    testRuntimeOnly "org.hibernate:hibernate-ehcache:$hibernateVersion"
     testRuntimeOnly "org.springframework:spring-aop"
     testRuntimeOnly "org.springframework:spring-expression"
+    testRuntimeOnly "org.yaml:snakeyaml"
 }
 
 groovydoc.classpath += configurations.documentation