Merge pull request #1192 from jdaugherty/7.0.x

#1191 - use the jakarta version of ehcache

Author: jdaugherty

plugin-acl/plugin/build.gradle

@@ -61,7 +61,11 @@ dependencies {
     testImplementation "org.apache.grails:grails-testing-support-datamapping"
     testImplementation "org.apache.grails:grails-testing-support-web"
 
-    implementation 'org.ehcache:ehcache'
+    implementation 'org.ehcache:ehcache', {
+        capabilities {
+            requireCapability('org.ehcache:ehcache-jakarta')
+        }
+    }
 
     api project(':core-plugin')
     api 'org.springframework.security:spring-security-acl'

plugin-core/plugin/build.gradle

@@ -59,7 +59,11 @@ dependencies {
 	api 'org.springframework:spring-web'
 
 	implementation 'org.apache.commons:commons-text'
-	implementation "org.ehcache:ehcache"
+	implementation "org.ehcache:ehcache", {
+        capabilities {
+            requireCapability('org.ehcache:ehcache-jakarta')
+        }
+    }
 	implementation 'org.apache.grails.bootstrap:grails-bootstrap'
 	implementation 'org.apache.grails:grails-rest-transforms'
 	implementation 'org.apache.grails:grails-converters'