Merge pull request #94 from grails/grailsupgarde

Update to Grails 5

Author: puneetbehl

examples/redis-demo/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4"
     }
 }

examples/redis-demo/src/test/groovy/com/example/MemoizeAnnotationSpec.groovy

@@ -2,23 +2,18 @@ package com.example
 
 import grails.plugins.redis.RedisService
 import grails.testing.mixin.integration.Integration
-import org.junit.Test
 import org.springframework.beans.factory.annotation.Autowired
-import spock.lang.Ignore
 import spock.lang.Specification
 
 @Integration
-@Ignore
 class MemoizeAnnotationSpec extends Specification {
 
-    @Autowired
-    RedisService redisService
+    @Autowired RedisService redisService
 
-    public void setup() {
+    void setup() {
         redisService.flushDB()
     }
 
-    @Test
     void testMemoizeAnnotationExpire() {
         given:
         // set up test class

examples/redis-demo/src/test/groovy/com/example/RedisIntegrationSpec.groovy

@@ -1,9 +1,8 @@
 package com.example
 
-
+import grails.core.support.proxy.ProxyHandler
 import grails.plugins.redis.RedisService
 import grails.testing.mixin.integration.Integration
-import org.grails.datastore.mapping.proxy.ProxyHandler
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.annotation.Rollback
 import spock.lang.Specification

gradle.properties

@@ -1,5 +1,6 @@
 projectVersion=3.0.0-SNAPSHOT
-grailsVersion=4.1.1
+grailsVersion=5.3.2
+grailsGradlePluginVersion=5.3.0
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

plugin/build.gradle

@@ -1,12 +1,9 @@
 buildscript {
-    ext {
-        grailsVersion = project.grailsVersion
-    }
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
     }
 }
 
@@ -21,11 +18,6 @@ plugins {
 apply plugin: "org.grails.grails-plugin"
 apply plugin: "org.grails.grails-gsp"
 
-
-ext {
-    grailsVersion = project.grailsVersion
-}
-
 version project.projectVersion
 group "org.grails.plugins"