Feature/grails5

.travis.yml

@@ -6,7 +6,7 @@ branches:
   only:
   - master
   - dev
-  - oidc-grails4
+  - feature/grails5
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

build.gradle

@@ -6,19 +6,18 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.6"
         classpath 'org.grails.plugins:quartz:2.0.13'
     }
 }
+
 plugins {
- //   id 'org.springframework.boot' version '1.4.2.RELEASE'
-    // Add Git properties plugin.
-    id 'com.gorylenko.gradle-git-properties' version '1.4.17'
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
 }
 
 
-version "2.4"
+version "2.4.1-SNAPSHOT"
 group "au.org.ala"
 description "Dashboard application"
 
@@ -27,10 +26,31 @@ apply plugin:"idea"
 apply plugin:"war"
 apply plugin:"org.grails.grails-web"
 apply plugin:"com.github.erdi.webdriver-binaries"
-apply plugin:"org.grails.grails-gsp"
 apply plugin:"com.bertramlabs.asset-pipeline"
+apply plugin:"org.grails.grails-gsp"
+apply plugin:"maven-publish"
 
-apply from: "${project.projectDir}/gradle/publish.gradle"
+publishing {
+    repositories {
+        maven {
+            name 'Nexus'
+            url "https://nexus.ala.org.au/content/repositories/${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'releases'}"
+            credentials {
+                username = System.getenv('TRAVIS_DEPLOY_USERNAME')
+                password = System.getenv('TRAVIS_DEPLOY_PASSWORD')
+            }
+        }
+    }
+    publications {
+        mavenJar(MavenPublication) {
+            artifact bootWar
+        }
+    }
+}
+
+bootWar {
+    launchScript()
+}
 
 repositories {
     mavenLocal()
@@ -44,64 +64,63 @@ configurations {
         extendsFrom developmentOnly
     }
 }
+
 dependencies {
     developmentOnly("org.springframework.boot:spring-boot-devtools")
-    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-dependencies"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:scaffolding"
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    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-dependencies"
+    implementation "org.grails:grails-web-boot"
+    implementation "org.grails:grails-logging"
+    implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:scaffolding"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    compile "org.codehaus.groovy:groovy-dateutil"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.2.4"
-    testCompile "org.grails.plugins:geb"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
-    testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
-
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
-    testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
-    testCompile "org.grails:grails-web-testing-support"
-
-    compile 'org.grails.plugins:external-config:2.0.0'
-    runtime 'org.apache.ant:ant:1.7.1'    //you can also use runtime
-    runtime 'org.apache.ant:ant-launcher:1.7.1'
-   // compile 'net.sf.opencsv:opencsv:2.3'
-    compile 'org.grails.plugins:csv:1.0.ALA.3'
-
-    compile 'com.yahoo.platform.yui:yuicompressor:2.4.8'
-    compile group: 'org.jsoup', name: 'jsoup', version: '1.9.1'
-
-   // compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.8'
-   compile group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.1'
-
-   // compile 'org.grails.grails-plugin-rest:2.3.0.M2'
-    compile 'org.codehaus.groovy:groovy-ant:2.0.0'
-
-    compile "org.grails.plugins:ala-bootstrap3:4.1.0"
-    compile "org.grails.plugins:grails-google-visualization:2.0"
-    compile "org.grails.plugins:ala-admin-plugin:2.3.0"
-    runtime "org.grails.plugins:ala-auth:5.1.1"
-    compile 'org.grails.plugins:quartz:2.0.13'
-
-    implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.0'
+    implementation "org.codehaus.groovy:groovy-dateutil"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
+
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+    testImplementation "org.grails:grails-web-testing-support"
+
+    implementation 'dk.glasius:external-config:3.1.1'
+    runtimeOnly 'org.apache.ant:ant:1.7.1'    //you can also use runtime
+    runtimeOnly 'org.apache.ant:ant-launcher:1.7.1'
+   // implementation 'net.sf.opencsv:opencsv:2.3'
+    implementation 'org.grails.plugins:csv:1.0.ALA.3'
+
+    implementation 'com.yahoo.platform.yui:yuicompressor:2.4.8'
+    implementation group: 'org.jsoup', name: 'jsoup', version: '1.9.1'
+
+   // implementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.8'
+   implementation group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.2'
+
+   // implementation 'org.grails.grails-plugin-rest:2.3.0.M2'
+    implementation 'org.codehaus.groovy:groovy-ant:2.0.0'
+
+    implementation "org.grails.plugins:ala-bootstrap3:4.1.0"
+    implementation "org.grails.plugins:grails-google-visualization:2.0"
+    implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
+    implementation "org.grails.plugins:ala-auth:6.0.0"
+    implementation 'org.grails.plugins:quartz:2.0.13'
+    implementation 'org.quartz-scheduler:quartz:2.3.2' // Is not pulled in by default
+
+    implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
 }
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
     sourceResources sourceSets.main
-}
-
-webdriverBinaries {
-    chromedriver '2.45.0'
-    geckodriver '0.24.0'
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
 
 tasks.withType(Test) {
@@ -111,6 +130,12 @@ tasks.withType(Test) {
     systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
 }
 
+webdriverBinaries {
+    chromedriver "$chromeDriverVersion"
+    geckodriver "$geckodriverVersion"
+}
+
+
 assets {
     minifyJs = false
     minifyCss = false

gradle.properties

@@ -1,8 +1,12 @@
-grailsVersion=4.1.1
-gormVersion=7.0.9
-gradleWrapperVersion=5.0
+grailsVersion=5.2.1
+gormVersion=7.2.1
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
 gebVersion=2.3
+groovyVersion=3.0.11
 seleniumVersion=3.14.0
-webdriverBinariesVersion=2.0
-hibernateCoreVersion=5.1.5.Final
-seleniumSafariDriverVersion=3.14.0
+webdriverBinariesVersion=2.6
+chromeDriverVersion=2.45.0
+geckodriverVersion=0.24.0
+seleniumSafariDriverVersion=3.14.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists