Update project to Grails 5.3.3

Author: matrei

build.gradle

@@ -34,44 +34,36 @@ configurations {
 }
 
 dependencies {
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
+
     compileOnly "io.micronaut:micronaut-inject-groovy"
-    console "org.grails:grails-console"
-    implementation "org.springframework.boot:spring-boot-starter-logging"
-    implementation "org.springframework.boot:spring-boot-starter-validation"
-    implementation "org.springframework.boot:spring-boot-autoconfigure"
-    implementation "org.grails:grails-core"
-    implementation "org.springframework.boot:spring-boot-starter-actuator"
-    implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    implementation "org.grails:grails-web-boot"
+
     implementation "org.grails:grails-logging"
     implementation "org.grails:grails-plugin-rest"
     implementation "org.grails:grails-plugin-databinding"
     implementation "org.grails:grails-plugin-i18n"
     implementation "org.grails:grails-plugin-services"
-    implementation "org.grails:grails-plugin-url-mappings"
-    implementation "org.grails:grails-plugin-interceptors"
-    implementation "org.grails.plugins:cache"
     implementation "org.grails.plugins:async"
     implementation "org.grails.plugins:scaffolding"
     implementation "org.grails.plugins:hibernate5"
-    implementation "org.hibernate:hibernate-core:5.6.3.Final"
+    implementation "org.hibernate:hibernate-core:5.6.15.Final"
     implementation "org.grails.plugins:gsp"
     implementation "org.grails.plugins:mail:3.0.0"
     // This is needed for the quartz-plugin on grails >= 4.0.x, https://github.com/grails-plugins/grails-quartz/issues/107#issuecomment-575951471
-    implementation("org.quartz-scheduler:quartz:2.2.3") {
+    implementation("org.quartz-scheduler:quartz:2.3.2") {
         exclude group: 'slf4j-api', module: 'c3p0'
     }
-    implementation ('org.grails.plugins:quartz:2.0.13')
+    implementation "org.grails.plugins:quartz:2.0.13"
+
     profile "org.grails.profiles:web-plugin"
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.3.4"
-    runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
+
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
-    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+
+    testImplementation "org.springframework.boot:spring-boot-starter-tomcat"
+    testImplementation "ch.qos.logback:logback-classic:1.2.12"
+    testImplementation "ch.qos.logback:logback-core:1.2.12"
     testImplementation "io.micronaut:micronaut-inject-groovy"
     testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.mockito:mockito-core"
     testImplementation "org.grails:grails-web-testing-support"
 }
 
@@ -88,13 +80,13 @@ bootRun {
 }
 
 
-tasks.withType(GroovyCompile) {
+tasks.withType(GroovyCompile).configureEach {
     configure(groovyOptions) {
         forkOptions.jvmArgs = ['-Xmx1024m']
     }
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
 
@@ -211,7 +203,7 @@ afterEvaluate {
     }
 }
 
-tasks.withType(Sign) {
+tasks.withType(Sign).configureEach {
     onlyIf { isReleaseVersion }
 }
 
@@ -231,9 +223,9 @@ nexusPublishing {
     }
 }
 
-task snapshotVersion {
+tasks.register('snapshotVersion') {
     doLast {
-        if(!project.version.endsWith('-SNAPSHOT')) {
+        if (!project.version.endsWith('-SNAPSHOT')) {
             ant.propertyfile(file: "gradle.properties") {
                 entry(key: "version", value: "${project.version}-SNAPSHOT")
             }

gradle.properties

@@ -1,8 +1,8 @@
 version=3.1.2-SNAPSHOT
-grailsVersion=5.1.1
-grailsGradlePluginVersion=5.1.0
-groovyVersion=3.0.7
-gorm.version=7.1.2
+grailsVersion=5.3.3
+grailsGradlePluginVersion=5.3.0
+groovyVersion=3.0.14
+gorm.version=7.3.3
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

grails-app/conf/application.yml

@@ -1,106 +1,4 @@
----
 grails:
     profile: web-plugin
     codegen:
-        defaultPackage: grails.plugin.asyncmail
-    gorm:
-        reactor:
-            # Whether to translate GORM events into Reactor events
-            # Disabled by default for performance reasons
-            events: false
-info:
-    app:
-        name: '@info.app.name@'
-        version: '@info.app.version@'
-        grailsVersion: '@info.app.grailsVersion@'
-spring:
-    jmx:
-        unique-names: true
-    main:
-        banner-mode: "off"
-    groovy:
-        template:
-            check-template-location: false
-    devtools:
-        restart:
-            additional-exclude:
-                - '*.gsp'
-                - '**/*.gsp'
-                - '*.gson'
-                - '**/*.gson'
-                - 'logback.groovy'
-                - '*.properties'
-management:
-    endpoints:
-        enabled-by-default: false
-
----
-grails:
-    mime:
-        disable:
-            accept:
-                header:
-                    userAgents:
-                        - Gecko
-                        - WebKit
-                        - Presto
-                        - Trident
-        types:
-            all: '*/*'
-            atom: application/atom+xml
-            css: text/css
-            csv: text/csv
-            form: application/x-www-form-urlencoded
-            html:
-                - text/html
-                - application/xhtml+xml
-            js: text/javascript
-            json:
-                - application/json
-                - text/json
-            multipartForm: multipart/form-data
-            pdf: application/pdf
-            rss: application/rss+xml
-            text: text/plain
-            hal:
-                - application/hal+json
-                - application/hal+xml
-            xml:
-                - text/xml
-                - application/xml
-    urlmapping:
-        cache:
-            maxsize: 1000
-    controllers:
-        defaultScope: singleton
-    converters:
-        encoding: UTF-8
-    views:
-        default:
-            codec: html
-        gsp:
-            encoding: UTF-8
-            htmlcodec: xml
-            codecs:
-                expression: html
-                scriptlet: html
-                taglib: none
-                staticparts: none
----
-environments:
-    test:
-        quartz:
-            jdbcStore: false
-        hibernate:
-            cache:
-                queries: false
-                use_second_level_cache: false
-                use_query_cache: false
-        dataSource:
-            pooled: true
-            jmxExport: true
-            driverClassName: org.h2.Driver
-            username: sa
-            password: ''
-            dbCreate: update
-            url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+        defaultPackage: grails.plugin.asyncmail

grails-app/conf/logback.groovy

@@ -1,5 +1,6 @@
 package grails.plugin.asyncmail
 
+import grails.async.Promise
 import grails.async.Promises
 import grails.gorm.transactions.Transactional
 import grails.plugin.asyncmail.enums.MessageStatus
@@ -34,7 +35,7 @@ class AsynchronousMailProcessService {
             Queue<Long> idsQueue = new ArrayBlockingQueue<Long>(messageCount, false, messagesIds)
 
             // Create some parallel tasks
-            def promises = []
+            def promises = [] as List<Promise>
             int taskCount = Math.min(asynchronousMailConfigService.taskPoolSize, messageCount)
 
             log.debug("Starts $taskCount send tasks.")

grails-app/services/grails/plugin/asyncmail/AsynchronousMailProcessService.groovy

@@ -0,0 +1,15 @@
+quartz:
+  jdbcStore: false
+hibernate:
+  cache:
+    queries: false
+    use_second_level_cache: false
+    use_query_cache: false
+dataSource:
+  pooled: true
+  jmxExport: true
+  driverClassName: org.h2.Driver
+  username: sa
+  password: ''
+  dbCreate: update
+  url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE

src/test/resources/application-test.yml

@@ -0,0 +1,23 @@
+<?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="ERROR"><appender-ref ref="STDOUT"/></root>
+
+    <!-- Enable Asynchronous Mail plugin logging -->
+    <logger name="grails.app.jobs.grails.plugin.asyncmail" level="TRACE" additivity="false"><appender-ref ref="STDOUT"/></logger>
+    <logger name="grails.app.services.grails.plugin.asyncmail" level="TRACE" additivity="false"><appender-ref ref="STDOUT"/></logger>
+    <logger name="grails.plugin.asyncmail" level="TRACE" additivity="false"><appender-ref ref="STDOUT"/></logger>
+
+    <!-- Enable Quartz plugin logging -->
+    <logger name="grails.plugins.quartz" level="DEBUG" additivity="false"><appender-ref ref="STDOUT"/></logger>
+</configuration>