From f3dc9d60588ef67937854523fb26a6397eeb101b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= <soeren@glasius.dk>
Date: Wed, 18 Jun 2025 13:18:26 +0200
Subject: [PATCH 1/2] Post review fixes

---
 gradle.properties                             |  7 +----
 gradle/buildsrc.libs.versions.toml            |  6 ++---
 gradle/grails-plugin-config.gradle            |  1 -
 gradle/publishing.gradle                      |  4 ---
 .../plugin/cache/redis/GrailsRedisCache.java  | 26 +++++++++----------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a8a4216..dd4cd26 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,5 @@
 projectVersion=6.0.0-SNAPSHOT
-grailsVersion=6.2.3
-javaVersion=17
-asciidoctorGradlePluginVersion=4.0.4
-
-grailsGradlePluginVersion=6.2.4
-version=0.1
+javaVersion=11
 
 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
 # https://github.com/grails/grails-gradle-plugin/issues/222
diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml
index 924ced8..c85139f 100644
--- a/gradle/buildsrc.libs.versions.toml
+++ b/gradle/buildsrc.libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-grails-gradle-plugin = '6.2.0'
-nexus-publish-gradle-plugin = '1.3.0'
-asciidoctor-gradle-plugin = '4.0.2'
+grails-gradle-plugin = '6.2.4'
+nexus-publish-gradle-plugin = '2.0.0'
+asciidoctor-gradle-plugin = '4.0.4'
 
 [libraries]
 grails-gradle-plugin = { module = 'org.grails:grails-gradle-plugin', version.ref = 'grails-gradle-plugin' }
diff --git a/gradle/grails-plugin-config.gradle b/gradle/grails-plugin-config.gradle
index e516cd9..da07410 100644
--- a/gradle/grails-plugin-config.gradle
+++ b/gradle/grails-plugin-config.gradle
@@ -4,5 +4,4 @@ tasks.named('bootJar') {
 tasks.named('jar', Jar) {
     enabled = true // Enable the jar task again, as the bootJar task has been disabled
     archiveClassifier = '' // Remove '-plain' suffix from jar file name
-    exclude('_testemails', 'messages*.properties')
 }
\ No newline at end of file
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 6ad2854..bc0611a 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -8,10 +8,6 @@ publishing {
     publications {
         register('grailsPlugin', MavenPublication) {
             from javaComponent.get()
-            versionMapping {
-                usage('java-api') { fromResolutionOf('runtimeClasspath') }
-                usage('java-runtime') { fromResolutionResult() }
-            }
             pom {
                 name = 'Grails Cache Redis plugin'
                 description = 'Provides setup for Redis caching'
diff --git a/src/main/groovy/grails/plugin/cache/redis/GrailsRedisCache.java b/src/main/groovy/grails/plugin/cache/redis/GrailsRedisCache.java
index fba154e..439c748 100644
--- a/src/main/groovy/grails/plugin/cache/redis/GrailsRedisCache.java
+++ b/src/main/groovy/grails/plugin/cache/redis/GrailsRedisCache.java
@@ -55,10 +55,10 @@ public class GrailsRedisCache implements GrailsCache {
     /**
      * Constructor.
      *
-     * @param name        cache name
-     * @param prefix prefix to use
+     * @param name     cache name
+     * @param prefix   prefix to use
      * @param template Spring template
-     * @param ttl time to live for cache
+     * @param ttl      time to live for cache
      */
     public GrailsRedisCache(String name, CacheKeyPrefix prefix, RedisTemplate<? extends Object, ? extends Object> template, Long ttl) {
         Assert.hasText(name, "non-empty cache name is required");
@@ -114,16 +114,16 @@ public T doInRedis(RedisConnection connection) throws DataAccessException {
         }, true);
     }
 
-	@Override
-	public <T> T get(final Object key, Callable<T> valueLoader) {
-		/*
-		 * FIXME: I had to add this method override in order to satisfy
-		 * the Spring Cache interface. It looks like this method signature
-		 * including the Callable parameter was added sometime after the
-		 * original cache-redis plugin was developed (?).
-		 */
-		return (T) this.get(key);
-	}
+    @Override
+    public <T> T get(final Object key, Callable<T> valueLoader) {
+        /*
+         * FIXME: I had to add this method override in order to satisfy
+         * the Spring Cache interface. It looks like this method signature
+         * including the Callable parameter was added sometime after the
+         * original cache-redis plugin was developed (?).
+         */
+        return (T) this.get(key);
+    }
 
     @SuppressWarnings("unchecked")
     @Override

From 245fd5e28a563e71b2e9fa7a884c639a6337a210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= <soeren@glasius.dk>
Date: Wed, 18 Jun 2025 14:33:47 +0200
Subject: [PATCH 2/2] Fix to use JavaVersion from gradle.properties

---
 functional-tests/build.gradle | 2 +-
 gradle/java-config.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functional-tests/build.gradle b/functional-tests/build.gradle
index e28cd4b..3cc8c55 100644
--- a/functional-tests/build.gradle
+++ b/functional-tests/build.gradle
@@ -52,7 +52,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
 }
 tasks.withType(Test).configureEach {
     useJUnitPlatform()
diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle
index f536319..b076345 100644
--- a/gradle/java-config.gradle
+++ b/gradle/java-config.gradle
@@ -1,5 +1,5 @@
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
     withSourcesJar()
     withJavadocJar()
 }
\ No newline at end of file

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/grails-plugins/grails-cache-redis/pull/13.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/grails-plugins/grails-cache-redis/pull/13.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/grails-plugins/grails-cache-redis/pull/13.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/grails-plugins/grails-cache-redis/pull/13.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>