Grails 5 Upgrade

README.md

@@ -123,4 +123,10 @@ Also you must provide values for:
 
 Environment Variables - `S3_BUCKET` and `S3_REGION`
 
-An example of a value for `S3_REGION` could be `eu-west-1` for Ireland buckets.
+An example of a value for `S3_REGION` could be `eu-west-1` for Ireland buckets.
+
+# Dependencies 
+
+- [Webdriver Binaries Gradle Plugin](https://github.com/erdi/webdriver-binaries-gradle-plugin/blob/master/README.md) [Gradle Portal](https://plugins.gradle.org/plugin/com.github.erdi.webdriver-binaries) - A plugin that downloads and caches WebDriver binaries specific to the OS the build runs on.
+
+- [Grails AWS SDK S3 Plugin](https://github.com/agorapulse/grails-aws-sdk/tree/master/grails-aws-sdk-s3)

build.gradle

@@ -1,17 +1,11 @@
 buildscript {
     repositories {
-        mavenLocal()
-        maven {
-            url "https://repo.grails.org/grails/core"
-        }
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
+        maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesGradleVersion"
-        classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesGradleVersion"
+        classpath "org.grails.plugins:hibernate5:7.1.0.RC3"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
         classpath "org.grails.plugins:views-gradle:$jsonViewsVersion"
         classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
@@ -25,17 +19,15 @@ apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"war"
 apply plugin:"org.grails.grails-web"
-apply plugin:"com.energizedwork.webdriver-binaries"
+apply plugin: "com.github.erdi.webdriver-binaries"
 apply plugin:"asset-pipeline"
 apply plugin:"org.grails.grails-gsp"
 apply plugin: "org.grails.plugins.views-json"
 apply plugin: "com.moowork.node"
 
 repositories {
-    mavenLocal()
+    maven { url 'https://jitpack.io' }
     maven { url "https://repo.grails.org/grails/core" }
-    jcenter()
-    maven { url 'http://dl.bintray.com/agorapulse/libs' }
 }
 
 node {
@@ -81,39 +73,65 @@ task bowerInstall(type: NodeTask) {
 
 
 dependencies {
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.1.5.Final"
-    compile "org.grails.plugins:gsp"
+    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-validation"
+    implementation "org.grails.plugins:views-json"
+
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+
+    implementation "org.grails:grails-core"
+
+
+
+    implementation "org.grails.plugins:cache"
+
+    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:async"
+    implementation "org.grails.plugins:scaffolding"
+    implementation "org.grails.plugins:events"
+
+    implementation "org.grails.plugins:hibernate5"
+    implementation "org.hibernate:hibernate-core:5.5.7.Final"
+    implementation "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "org.glassfish.web:el-impl:2.1.2-b03"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
+
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+
+    testImplementation "io.micronaut:micronaut-inject-groovy"
+    testImplementation "io.micronaut:micronaut-http-client"
+
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "org.grails:grails-web-testing-support"
+
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
+
 
     runtime "mysql:mysql-connector-java:$mysqlVersion"
 
@@ -142,18 +160,27 @@ dependencies {
 
     compile "com.github.mpkorstanje:simmetrics-core:$simmetricsVersion"
 
-    compile "org.grails.plugins:aws-sdk-s3:$awsSdkS3Version"
+    compile 'com.github.agorapulse.grails-aws-sdk:aws-sdk-s3:2.4.14'
 }
 
 bootRun {
     systemProperties System.properties
-    jvmArgs('-Dspring.output.ansi.enabled=always')
-    addResources = true
+    ignoreExitValue true
+    jvmArgs(
+            '-Dspring.output.ansi.enabled=always',
+            '-noverify',
+            '-XX:TieredStopAtLevel=1',
+            '-Xmx1024m')
+    sourceResources sourceSets.main
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
 
-webdriverBinaries {
-    chromedriver "${chromedriverVersion}"
-    geckodriver "${geckodriverVersion}"
+if (System.getProperty('geb.env')) {
+    webdriverBinaries {
+        chromedriver "${chromedriverVersion}"
+        geckodriver "${geckodriverVersion}"
+    }
 }
 
 test {
@@ -164,6 +191,17 @@ integrationTest {
     systemProperties System.properties
 }
 
+tasks.withType(GroovyCompile) {
+    configure(groovyOptions) {
+        forkOptions.jvmArgs = ['-Xmx1024m']
+    }
+}
+
+tasks.withType(Test) {
+    useJUnitPlatform()
+}
+
+
 tasks.withType(Test) {
     systemProperties System.properties
     systemProperty "grails.env", 'test'

gradle.properties

@@ -1,22 +1,25 @@
 #Tue Jun 26 14:44:22 BST 2018
-jsonViewsVersion=1.2.7
-webdriverBinariesGradleVersion=1.4
-grailsWrapperVersion=1.0.0
-grailsVersion=3.3.6
-hamcrestVersion=1.3
-seleniumVersion=3.6.0
-gradleWrapperVersion=3.5
-gormVersion=6.1.10.RELEASE
+jsonViewsVersion=2.0.4
+webdriverBinariesGradleVersion=2.4
+grailsVersion=5.0.0-RC3
+groovyVersion=3.0.7
+hamcrestVersion=2.2
+seleniumVersion=3.141.59
+gorm.version=7.1.0.RC3
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
+
 mysqlVersion=5.1.46
 ersatzVersion=1.6.2
-assetPipelineVersion=2.14.8
+assetPipelineVersion=3.3.4
 okHttpVersion=3.9.1
 moshiVersion=1.5.0
 droolsVersion=7.5.0.Final
 chromedriverVersion=2.40
 geckodriverVersion=0.21.0
 spreadsheetBuilderVersion=1.0.5
-springSecurityCoreVersion=3.2.3
+springSecurityCoreVersion=4.0.3
 simmetricsVersion=4.1.1
-awsSdkS3Version=2.2.4
+awsSdkS3Version=2.4.8
 poiVersion=3.16

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Feb 07 16:55:23 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip