Merge pull request #13 from grails-plugins/chore/post-review-fixes

Post review fixes

Author: sbglasius

functional-tests/build.gradle

@@ -52,7 +52,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
 }
 tasks.withType(Test).configureEach {
     useJUnitPlatform()

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

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' }

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')
 }

gradle/java-config.gradle

@@ -1,5 +1,5 @@
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
     withSourcesJar()
     withJavadocJar()
 }

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'

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