Merge branch '7.0.x' into 7.1.x

# Conflicts:
#	settings.gradle

Author: jamesfredley

grails-cache/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,46 @@
+{
+    "groups": [
+        {
+            "name": "grails.cache",
+            "description": "Cache Plugin"
+        }
+    ],
+    "properties": [
+        {
+            "name": "grails.cache.enabled",
+            "type": "java.lang.Boolean",
+            "description": "Whether the cache plugin is enabled.",
+            "defaultValue": true
+        },
+        {
+            "name": "grails.cache.clearAtStartup",
+            "type": "java.lang.Boolean",
+            "description": "Whether to clear all caches when the application starts.",
+            "defaultValue": false
+        },
+        {
+            "name": "grails.cache.cacheManager",
+            "type": "java.lang.String",
+            "description": "The cache manager implementation class name. Use `GrailsConcurrentLinkedMapCacheManager` for bounded caches with maxCapacity support.",
+            "defaultValue": "GrailsConcurrentMapCacheManager"
+        },
+        {
+            "name": "grails.cache.caches",
+            "type": "java.util.Map",
+            "description": "Map of cache-specific configurations keyed by cache name, each supporting a `maxCapacity` setting (used by GrailsConcurrentLinkedMapCacheManager).",
+            "defaultValue": {}
+        },
+        {
+            "name": "grails.cache.ehcache.ehcacheXmlLocation",
+            "type": "java.lang.String",
+            "description": "Location of the Ehcache XML configuration file on the classpath.",
+            "defaultValue": "classpath:ehcache.xml"
+        },
+        {
+            "name": "grails.cache.ehcache.lockTimeout",
+            "type": "java.lang.Integer",
+            "description": "The timeout in milliseconds for acquiring a lock on a cache element.",
+            "defaultValue": 200
+        }
+    ]
+}

grails-core/build.gradle

@@ -43,6 +43,7 @@ dependencies {
 
     implementation 'com.github.ben-manes.caffeine:caffeine'
     api 'org.apache.groovy:groovy'
+    implementation 'org.apache.groovy:groovy-json'
     api 'org.springframework.boot:spring-boot'
     api 'org.springframework:spring-core'
     api 'org.springframework:spring-tx'
@@ -97,4 +98,4 @@ tasks.named('processResources', ProcessResources).configure { ProcessResources i
 apply {
     from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-}
+}