Merge branch 'release/6.1.4'

Author: Chris Dunstall

.travis.yml

@@ -7,7 +7,7 @@ branches:
   only:
   - master
   - develop
-  - feature/6.1.0-fixes
+  - feature/grails33upgrade
 services:
   - postgresql
 addons:

build.gradle

@@ -25,7 +25,7 @@ plugins {
     id "com.virgo47.ClasspathJar" version "1.0.0"
 }
 
-version "6.1.3"
+version "6.1.4"
 group "au.org.ala"
 description "Digivol application"
 
@@ -122,37 +122,61 @@ repositories {
 //}
 
 dependencies {
-    // Grails 3.2.11
+    // Grails 3.3.15
     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.plugins:cache"
+    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:4.0.3"
+    compile "org.grails.plugins:async"
     compile "org.grails.plugins:scaffolding"
+    compile "org.grails.plugins:events"
     compile "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
-    compile "org.hibernate:hibernate-core:5.1.3.Final"
-    compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
+    compile "org.hibernate:hibernate-core:$hibernateVersion"
+    compile "org.grails.plugins:gsp"
     console "org.grails:grails-console"
-    compile "com.drewnoakes:metadata-extractor:2.11.0"
     profile "org.grails.profiles:web"
-    compile "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    assets "com.bertramlabs.plugins:sass-asset-pipeline:$assetPipelineVersion"
-    testCompile "org.grails:grails-plugin-testing"
-    testCompile "org.grails.plugins:geb"
+    runtime "org.glassfish.web:el-impl:2.1.2-b03"
+
+    testCompile "org.grails:grails-gorm-testing-support"
+    testCompile "org.grails.plugins:geb:1.1.2"
+    testCompile "org.grails:grails-web-testing-support"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
+    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:2.47.1"
+
+    // Extra official Grails plugins
+    compile "org.grails.plugins:converters"
+    compile "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    assets "com.bertramlabs.plugins:sass-asset-pipeline:$assetPipelineVersion"
+    //testCompile "org.grails:grails-plugin-testing" // Moved in upgrade to Grails 3.3.11
+    testCompile "org.grails:grails-test-mixins:3.3.0" // For legacy @TestMixin and @TestFor
 
+    compile "org.grails:grails-async-gpars"
+    compile "org.grails:grails-events-rxjava2"
     compile "org.grails.plugins:grails-java8"
     compile "org.grails.plugins:rxjava2:2.0.0"
-    compile "org.hibernate:hibernate-java8:5.1.3.Final"
+    compile "org.codehaus.gpars:gpars:1.2.1" // Added for the GPars dependencies.
+    compile "io.reactivex.rxjava2:rxjava:2.1.3"
+    compile "org.grails:grails-datastore-gorm-async:${gormVersion}"
+
+    // Extra Hibernate
+    compile "org.hibernate:hibernate-ehcache:$hibernateVersion"
+    compile "org.hibernate:hibernate-java8:$hibernateVersion"
 
     // Additional Plugins
     compile 'org.grails.plugins:cache-headers:2.0.2'
     compile 'org.grails.plugins:csv:1.0.ALA.3'
-    compile 'org.grails.plugins:postgresql-extensions:5.2.0'
+    compile 'org.grails.plugins:postgresql-extensions:6.1.0'
     compile 'org.grails.plugins:mail:2.0.1'
     compile 'org.grails.plugins:grails-executor:0.4' // used in TaskLoadService.backgroundProcessQueue
     compile 'org.grails.plugins:grails-markdown:3.0.0' // may need modifications?
@@ -161,22 +185,20 @@ dependencies {
     compile 'org.grails.plugins:grails-google-visualization:2.2'
     compile 'org.grails.plugins:external-config:1.1.2'
     // TODO ALA Plugins: image service (is it used anywhere?)
-    compile 'org.grails.plugins:ala-auth:3.0.5'
-    compile 'au.org.ala:userdetails-service-client:1.4.0' // override this to for external properties changes
-    compile 'org.grails.plugins:cache-ehcache:2.0.0.ALA'
-    //compile 'org.grails.plugins:cache-ehcache:3.0.0.M1'
+    compile 'org.grails.plugins:ala-auth:3.2.3'
+    compile 'au.org.ala:userdetails-service-client:1.5.0' // override this to for external properties changes
+    compile 'org.grails.plugins:cache-ehcache:3.0.0'
+    compile 'org.ehcache:ehcache:3.4.0' // Prevent cache-ehcache dependent version being overridden
+    //compile 'org.grails.plugins:cache-ehcache:2.0.0.ALA'
     // TODO Collection Event Controller?
 
-    // BOOTSTRAP, FONT-AWESOME?  NPM?  Yarn? webjars ?
-//    compile 'org.webjars:bootstrap:3.3.7-1'
-//    compile 'org.webjars:angularjs:1.6.1'
-//    compile 'org.webjars:font-awesome:4.7.0'
-
     // Dependencies
     runtime "org.postgresql:postgresql:$postgresVersion"
+    runtime "com.zaxxer:HikariCP:4.0.3"
+    compile "com.drewnoakes:metadata-extractor:2.11.0"
     compile 'org.imgscalr:imgscalr-lib:4.2'
-    compile 'com.squareup.retrofit2:retrofit:2.2.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+    compile 'com.squareup.retrofit2:retrofit:2.4.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.4.0'
     compile 'com.google.guava:guava:19.0'
     compile 'com.github.ben-manes.caffeine:caffeine:2.8.0'
     compile 'org.apache.commons:commons-compress:1.11'
@@ -196,8 +218,7 @@ dependencies {
     compile "org.flywaydb:flyway-core:4.2.0"
 
     // For logback filter
-    compile 'org.codehaus.janino:janino:3.0.6'
-
+    compile 'org.codehaus.janino:janino:3.1.7'
 }
 
 bootRun {
@@ -207,6 +228,7 @@ bootRun {
 
 springBoot {
     layout = WAR
+    mainClass = 'au.org.ala.volunteer.Application'
 }
 
 bootRepackage {
@@ -280,33 +302,3 @@ publish {
     dependsOn assemble
 }
 
-
-//node {
-//    // Version of node to use.
-//    version = '6.9.4'
-//
-//    // Version of npm to use.
-//    npmVersion = '3.10.10'
-//
-//    // Version of Yarn to use.
-//    yarnVersion = '0.16.1'
-//
-//    // Base URL for fetching node distributions (change if you have a mirror).
-//    distBaseUrl = 'https://nodejs.org/dist'
-//
-//    // If true, it will download node using above parameters.
-//    // If false, it will try to use globally installed node.
-//    download = false
-//
-//    // Set the work directory for unpacking node
-//    workDir = file("${project.buildDir}/nodejs")
-//
-//    // Set the work directory for NPM
-//    npmWorkDir = file("${project.buildDir}/npm")
-//
-//    // Set the work directory for Yarn
-//    yarnWorkDir = file("${project.buildDir}/yarn")
-//
-//    // Set the work directory where node_modules should be located
-//    nodeModulesDir = file("${project.projectDir}/grails-app/assets")
-//}

gradle.properties

@@ -1,7 +1,8 @@
 #Sat Jan 21 22:08:45 AEDT 2017
-grailsVersion=3.2.11
-gormVersion=6.0.12.RELEASE
+grailsVersion=3.3.15
+gormVersion=6.1.12.RELEASE
 grailsWrapperVersion=1.0.0
-gradleWrapperVersion=3.4.1
-assetPipelineVersion=2.14.7
+gradleWrapperVersion=3.5
+assetPipelineVersion=2.15.1
 postgresVersion=42.2.11
+hibernateVersion=5.2.17.Final

grails-app/assets/javascripts/digivol-notifications.js

@@ -57,20 +57,22 @@ function digivolNotify(config, self) {
   var alertNotify = null;
 
   function alertMessage(data) {
+    var isClosed = amplify.store.sessionStorage("bvp_notify_close");
     if (alertNotify != null) {
       if (data) {
         alertNotify.update('message', data);
       } else {
         alertNotify.close();
       }
-    } else if (data) {
+    } else if (data && (!isClosed)) {
       alertNotify = $.notify({
         icon: config.alertIconClass,
         message: data
       },{
         type: config.alertType,
         onClose: function() {
           alertNotify = null;
+          amplify.store.sessionStorage("bvp_notify_close", true);
         }
       });
     }

grails-app/assets/javascripts/digivol.js

@@ -4,4 +4,5 @@
 //= require qtip
 //= require bootbox
 //= require digivol-notifications
-//= require bvp-common
+//= require bvp-common
+//= require amplify

grails-app/conf/application.groovy

@@ -101,6 +101,13 @@ grails {
         }
 
     }
+    gorm {
+        'default' {
+            mapping = {
+                autowire: true
+            }
+        }
+    }
 //    gorm {
 //        'default' {
 //            mapping = {

grails-app/conf/application.yml

@@ -147,8 +147,47 @@ security:
     cas:
         adminRole: "ROLE_VP_ADMIN"
         validatorRole: "ROLE_VP_VALIDATOR"
-        uriFilterPattern: '/validate/save.*,/validate/.*,/user/.*,/project/((?!index).)*,/task/((?!summary).)*,/newsItem/.*,/picklist/.*,/admin,/admin/.*,/frontPage/.*,/ajax/userReport,/ws/userReport,/transcribe/.*,/taskComment/((?!getCommentsAjax).)*,/locality/.*,/collectionEvent/.*,/ajax/keepSessionAlive.*,/ws/keepSessionAlive.*,/forum/.*,/template/.*,/monitoring,/metrics,/metrics/.*,/ws/acceptAchievements,/ajax/acceptAchievements,/project/createNewProject.*,/message/.*'
-        authenticateOnlyIfLoggedInPattern: '/,/;jsessionid=.*,/project/index/.*,/task/summary/.*,/tutorials/.*,/institution/.*,/buildInfo,/events/.*,/es,/eventSource.*,/wildlife-spotter,/message/.*'
+        uriFilterPattern:
+            - "/validate/save*"
+            - "/validate/*"
+            - "/user/*"
+            - "/project/*"
+            - "/task/*"
+            - "/newsItem/*"
+            - "/picklist/*"
+            - "/admin"
+            - "/admin/*"
+            - "/frontPage/*"
+            - "/ajax/userReport"
+            - "/ws/userReport"
+            - "/transcribe/*"
+            - "/taskComment/*"
+            - "/locality/*"
+            - "/collectionEvent/*"
+            - "/ajax/keepSessionAlive*"
+            - "/ws/keepSessionAlive*"
+            - "/forum/*"
+            - "/template/*"
+            - "/monitoring"
+            - "/metrics"
+            - "/metrics/*"
+            - "/ws/acceptAchievements"
+            - "/ajax/acceptAchievements"
+            - "/project/createNewProject*"
+            - "/message/*"
+        authenticateOnlyIfLoggedInPattern:
+            - "/"
+            - "/;jsessionid=*"
+            - "/project/index/*"
+            - "/task/summary/*"
+            - "/tutorials/*"
+            - "/institution/*"
+            - "/buildInfo"
+            - "/events/*"
+            - "/es"
+            - "/eventSource*"
+            - "/wildlife-spotter"
+            - "/message/*"
         uriExclusionFilterPattern: '/assets/.*,/static/.*,/fonts/.*,/images/.*,/css/.*,/js/.*,/less/.*,/image/.*'
 
 bvp:
@@ -274,10 +313,16 @@ hibernate:
         region.factory_class: org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
     #SQL="trace,stdout"
     #type="trace,stdout"
+    jdbc:
+        lob:
+            non_contextual_creation: true
+        temp:
+            use_jdbc_metadata_defaults: false
 
 dataSource:
     dbCreate: validate
     pooled: true
+    poolName: 'grails-hikari'
     jmxExport: true
     driverClassName: org.postgresql.Driver
 #    username: root

grails-app/conf/logback.groovy

@@ -102,19 +102,19 @@ logger('au.org.ala.volunteer.BVPSessionListener', DEBUG, [ACCESS], false)
 logger('au.org.ala.cas', DEBUG, [CAS], false)
 logger('org.jasig.cas', DEBUG, [CAS], false)
 
-//logger('grails.app.services.au.org.ala.volunteer.TaskService', DEBUG, [DEBUG_LOG], false)
 final debug_logger = [
-        'grails.app.domain.au.org.ala.volunteer.Task',
-        'grails.app.services.au.org.ala.volunteer.TaskService',
-        'grails.app.services.au.org.ala.volunteer.ValidationService',
-        'grails.app.controllers.au.org.ala.volunteer.TranscribeController',
-        'grails.app.controllers.au.org.ala.volunteer.ValidateController'
+        'au.org.ala.volunteer.Task',
+        'au.org.ala.volunteer.TaskService',
+        'au.org.ala.volunteer.ValidationService',
+        'au.org.ala.volunteer.TranscribeController',
+        'au.org.ala.volunteer.ValidateController'
 ]
 for (String name: debug_logger) logger(name, DEBUG, [DEBUG_LOG], false)
 
 logger('org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport', INFO, [SLOW_QUERIES], false)
 
 final error = [
+        'org.hibernate.orm.deprecation'
 ]
 
 final warn = [