Grails 6.1.0 java 11

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: groovy
 jdk:
-- openjdk8
+- openjdk11
 before_script:
 - rm -rf target
 script: "./travis-build.sh"

README.md

@@ -15,4 +15,4 @@ See https://grails.org/plugin/cache-ehcache and [Documentation](http://grails-pl
 
 ## Branches
 
-The current master branch is for 3.x versions of the plugin compatible with Grails 3. There is a 1.x branch for on-going maintenance of 1.x versions of the plugin compatible with Grails 2. Please submit any pull requests to the appropriate branch. Changes to the 1.x branch will be merged into the master branch if appropriate.
+The current master branch is for 4.x versions of the plugin compatible with Grails 5. There is a 1.x branch for on-going maintenance of 1.x versions of the plugin compatible with Grails 2. Please submit any pull requests to the appropriate branch. Changes to the 1.x branch will be merged into the master branch if appropriate.

build.gradle

@@ -4,31 +4,29 @@ buildscript {
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
     }
 }
 
 plugins {
     id 'org.asciidoctor.convert' version '1.5.3'
 }
 
-//version "3.0.1"
-version "3.0.1.BUILD-SNAPSHOT"
+//version "4.0.0"
+version "4.0.0.BUILD-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin: "eclipse"
 apply plugin: "idea"
 apply plugin: "org.grails.grails-plugin"
-apply plugin: "org.grails.grails-plugin-publish"
+apply plugin: "maven-publish"
+apply plugin:"org.grails.internal.grails-plugin-publish"
 
 repositories {
     mavenLocal()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 dependencyManagement {
     imports {
         mavenBom "org.grails:grails-bom:$grailsVersion"
@@ -41,32 +39,32 @@ configurations {
 }
 
 dependencies {
-    provided 'org.springframework.boot:spring-boot-starter-logging'
-    provided "org.springframework.boot:spring-boot-starter-actuator"
-    provided "org.springframework.boot:spring-boot-autoconfigure"
-    provided "org.springframework.boot:spring-boot-starter-tomcat"
-
-    provided "org.grails:grails-web-boot"
-    provided "org.grails:grails-dependencies"
-    provided 'javax.servlet:javax.servlet-api:3.1.0'
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-validation"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.springframework.boot:spring-boot-starter-tomcat"
+
+    implementation "org.grails:grails-web-boot"
+    implementation 'javax.servlet:javax.servlet-api:3.1.0'
     profile "org.grails.profiles:plugin"
 
-    testCompile "org.grails:grails-plugin-testing"
+    testImplementation "org.grails:grails-gorm-testing-support"
 
     console "org.grails:grails-console"
 
-    compile "org.grails.plugins:cache:4.0.3"
-    compile 'org.ehcache:ehcache:3.4.0'
+    implementation "org.grails.plugins:cache:5.0.1"
+    implementation 'org.ehcache:ehcache:3.4.0'
 
-    documentation "org.codehaus.groovy:groovy-all:2.4.10"
+    documentation "org.codehaus.groovy:groovy-all"
 
 }
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
 }
 // enable if you wish to package this plugin as a standalone application
-bootRepackage.enabled = false
+bootJar.enabled = false
 
 grailsPublish {
     userOrg = "grails"
@@ -110,3 +108,10 @@ task docs(type:Copy, dependsOn:[apidocs, asciidoctor])  {
     from "$buildDir/asciidoc/html5"
     into "$buildDir/docs"
 }
+
+tasks.withType(Test) {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat 'full'
+    }
+}

gradle.properties

@@ -1,3 +1,3 @@
-grailsVersion=3.2.8
-gradleWrapperVersion=3.0
+grailsVersion=6.1.0
+grailsGradlePluginVersion=6.1.0
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip

grails-app/conf/logback.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

src/main/groovy/grails/plugin/cache/ehcache/CacheEhcacheGrailsPlugin.groovy

@@ -7,7 +7,7 @@ import grails.plugins.Plugin
 class CacheEhcacheGrailsPlugin extends Plugin {
 
    // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "3.0.0 > *"
+    def grailsVersion = "5.0.0 > *"
 
 
     def title = "Cache Ehcache" // Headline display name of the plugin

src/main/groovy/grails/plugin/cache/ehcache/GrailsEhcacheCache.groovy

@@ -89,7 +89,7 @@ class GrailsEhcacheCache<K, V> implements GrailsCache {
 	}
 
 	@SuppressWarnings("unchecked")
-	Collection<Object> getAllKeys() {
+	Collection<K> getAllKeys() {
 		Set<K> keys = []
 		getNativeCache().each {
 			keys.add(it.key)