Merge branch '7.1.x' into 8.0.x

# Conflicts:
#	dependencies.gradle

Author: jamesfredley

.github/scripts/releaseDistributions.sh

@@ -58,15 +58,19 @@ svn_exists() {
   svn ls "${svn_flags[@]}" --depth=empty "${url}" >/dev/null 2>&1
 }
 
-old_release_folder="$(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}" | awk -F/ 'NF{print $1; exit}')"
-if [[ -n "${old_release_folder}" ]]; then
-  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${old_release_folder}"
-  echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
-  svn rm "${svn_flags[@]}" -m "Remove previous release ${old_release_folder}" "${PRIOR_RELEASE_URL}"
-  echo "✅ Deleted old release folder"
-else
-  echo "ℹ️ No existing release subfolder found under ${RELEASE_ROOT}"
-fi
+for folder in $(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}"); do
+  folder=$(echo "$folder" | sed 's|/$||')
+  [[ "${folder}" == "${RELEASE_VERSION}" ]] && continue
+  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${folder}"
+  read -r -p "Remove old release folder '${folder}' at ${PRIOR_RELEASE_URL}? [y/N] " confirm < /dev/tty
+  if [[ "${confirm}" =~ ^[Yy](es)?$ ]]; then
+    echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
+    svn rm "${svn_flags[@]}" -m "Remove previous release ${folder}" "${PRIOR_RELEASE_URL}"
+    echo "✅ Deleted old release folder"
+  else
+    echo "⏭️ Skipping removal of old release folder: ${PRIOR_RELEASE_URL}"
+  fi
+done
 
 DEV_VERSION_URL="$DEV_ROOT/${RELEASE_VERSION}"
 RELEASE_VERSION_URL="$RELEASE_ROOT/${RELEASE_VERSION}"

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

@@ -44,6 +44,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.boot:spring-boot-web-server'
     api 'org.springframework:spring-core'
@@ -99,4 +100,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')
-}
+}