Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	build.gradle

Author: Adam Collins

.travis.yml

@@ -6,7 +6,6 @@ branches:
   only:
     - master
     - develop
-    - feature/grails5
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -16,8 +15,11 @@ cache:
 #    - $HOME/.m2
 #    - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-#install:
-#  - ./gradlew assemble --refresh-dependencies
+
+install:
+  - 'travis_wait 30 ./gradlew clean'
+  - './gradlew assemble'
+
 after_success:
   - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish'
 env:

build.gradle

@@ -10,39 +10,26 @@
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
  */
-
 buildscript {
-    repositories {
-        mavenLocal()
-        maven { url "https://nexus.ala.org.au/content/groups/public/" }
-        maven { url "https://repo.grails.org/grails/core" }
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.6"
-        classpath "org.grails.plugins:hibernate5:7.0.5"
-        classpath 'org.grails.plugins:quartz:2.0.13'
-        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.6"
-    }
+    version "4.0.0-SNAPSHOT"
+    group "au.org.ala"
 }
 
 plugins {
-    id "com.gorylenko.gradle-git-properties" version "2.4.1"
-}
-
+    id "groovy"
+    id "org.grails.grails-gsp"
+    id "org.grails.grails-web"
+    id "com.github.erdi.webdriver-binaries" version "3.0"
+    id "war"
+    id "idea"
+    id "com.bertramlabs.asset-pipeline"
+    id "application"
+    id "eclipse"
 
-version "3.0.0"
-group "au.org.ala"
-
-apply plugin:"eclipse"
-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:"maven-publish"
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
 
+    id "maven-publish"
+}
 
 publishing {
     repositories {
@@ -67,16 +54,28 @@ bootWar {
 }
 
 repositories {
-    mavenLocal()
-    maven { url "https://nexus.ala.org.au/content/groups/public/" }
-    maven { url "https://repo.grails.org/grails/core" }
+    repositories {
+        mavenLocal()
+        maven { url "https://nexus.ala.org.au/content/groups/public/" }
+        mavenCentral()
+        maven { url "https://repo.grails.org/grails/core/" }
+    }
+    mavenCentral()
 }
 
 configurations {
     developmentOnly
     runtimeClasspath {
         extendsFrom developmentOnly
     }
+    all {
+        resolutionStrategy.force 'org.codehaus.groovy:groovy-xml:3.0.13'
+        resolutionStrategy.eachDependency { DependencyResolveDetails details->
+            if (details.requested.group == 'org.seleniumhq.selenium') {
+                details.useVersion('4.10.0')
+            }
+        }
+    }
 }
 
 dependencies {
@@ -88,8 +87,10 @@ dependencies {
     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")
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
+    implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation "org.grails:grails-web-boot"
     implementation "org.grails:grails-logging"
     implementation "org.grails:grails-plugin-rest"
@@ -102,88 +103,112 @@ dependencies {
     implementation "org.grails.plugins:scaffolding"
     implementation "org.grails.plugins:events"
     implementation "org.grails.plugins:hibernate5"
+    implementation("org.hibernate:hibernate-core:5.6.15.Final")
     implementation "org.hibernate:hibernate-jcache"
+    compileOnly("io.micronaut:micronaut-inject-groovy")
 
     implementation "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
     runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:4.3.0"
 
     testImplementation "org.grails:grails-gorm-testing-support"
     testImplementation "org.grails.plugins:geb"
     testImplementation "org.grails:grails-web-testing-support"
     testImplementation "org.grails:grails-test-mixins:3.3.0"
 
     // Grails plugin dependencies
-    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.1.0", noCache
+    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.4.0", noCache
     implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
     implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
-    
+
+    // for ContentType
+    implementation "org.apache.httpcomponents:httpcore:4.4.16"
+
     implementation 'dk.glasius:external-config:3.1.1'
     implementation 'org.grails.plugins:mail:3.0.0'
-    implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
+
     implementation 'org.grails.plugins:schwartz-monitor:2.0.1.ALA-SNAPSHOT'
     implementation 'org.grails.plugins:quartz:2.0.13'
     implementation 'org.quartz-scheduler:quartz:2.3.2' // Is not pulled in by default https://stackoverflow.com/questions/61144025/quartz-not-working-in-grails4-issue-in-dependency-not-able-to-compile
-    implementation 'org.grails.plugins:cache:4.0.2'
+    implementation 'org.grails.plugins:cache'
     implementation 'org.grails.plugins:cache-ehcache:3.0.0'
-    
+
     // regular JAR dependencies
-    runtimeOnly 'mysql:mysql-connector-java:8.0.25'
+    runtimeOnly 'mysql:mysql-connector-java:8.0.33'
     testRuntimeOnly "com.h2database:h2"
-    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testImplementation "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testImplementation "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.10.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.10.0"
+    testImplementation "org.seleniumhq.selenium:selenium-support:4.10.0"
+    testRuntimeOnly("org.seleniumhq.selenium:selenium-chrome-driver:4.10.0")
+    testRuntimeOnly("org.seleniumhq.selenium:selenium-firefox-driver:4.10.0")
+    testRuntimeOnly("org.seleniumhq.selenium:selenium-safari-driver:4.10.0")
     runtimeOnly 'commons-lang:commons-lang:2.6'
-    implementation 'commons-io:commons-io:2.5'
-    runtimeOnly 'org.hamcrest:hamcrest-core:1.3'
-    runtimeOnly 'org.hamcrest:hamcrest-library:1.3'
-    runtimeOnly 'xalan:xalan:2.7.2'
-    implementation 'com.jayway.jsonpath:json-path:0.5.6'
-    implementation 'com.jayway.jsonpath:json-path-assert:0.5.6'
+    implementation 'commons-io:commons-io:2.11.0'
+    runtimeOnly 'org.hamcrest:hamcrest-core:2.2'
+    runtimeOnly 'org.hamcrest:hamcrest-library:2.2'
+    runtimeOnly 'xalan:xalan:2.7.3'
+    implementation 'com.jayway.jsonpath:json-path:2.7.0'
+    implementation 'com.jayway.jsonpath:json-path-assert:2.7.0'
     implementation 'au.org.ala.plugins:openapi:1.1.0'
 }
+//
+//bootRun {
+//    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)
+//}
+//
+//tasks.withType(GroovyCompile) {
+//    configure(groovyOptions) {
+//        forkOptions.jvmArgs = ['-Xmx1024m']
+//    }
+//}
+//
 
-bootRun {
-    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)
+tasks.withType(Test) {
+    useJUnitPlatform()
+    systemProperty "geb.env", System.getProperty('geb.env')
+    systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
+    systemProperty 'webdriver.chrome.driver', "${System.getenv('CHROMEWEBDRIVER')}/chromedriver"
+    systemProperty 'webdriver.gecko.driver', "${System.getenv('GECKOWEBDRIVER')}/geckodriver"
 }
-
-tasks.withType(GroovyCompile) {
-    configure(groovyOptions) {
-        forkOptions.jvmArgs = ['-Xmx1024m']
-    }
+tasks.withType(War).configureEach { War war ->
+    war.dependsOn compileGroovyPages
 }
-
-
 webdriverBinaries {
-    chromedriver '2.45.0'
-    geckodriver '0.24.0'
+    chromedriver '110.0.5481.77'
+    geckodriver '0.32.2'
+    edgedriver '110.0.1587.57'
+}
+assets {
+    minifyJs = true
+    minifyCss = true
 }
 
-tasks.withType(Test) {
-    systemProperty "geb.env", System.getProperty('geb.env')
-    systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
-    systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
-    systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
+
+
+bootWar {
+    dependsOn(compileGroovyPages)
 }
 
+war {
+    dependsOn(compileGroovyPages)
+}
 
-assets {
-    minifyJs = true
-    minifyCss = true
+java {
+    sourceCompatibility = JavaVersion.toVersion("11")
 }
+

gradle.properties

@@ -1,13 +1,10 @@
-grailsVersion=5.2.1
+grailsVersion=6.0.0
+grailsGradlePluginVersion=6.0.0
 gormVersion=7.2.1
+org.gradle.caching=true
 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.6
-chromeDriverVersion=2.45.0
-geckodriverVersion=0.24.0
-seleniumSafariDriverVersion=3.14.0
-alaSecurityLibsVersion=6.0.4
+alaSecurityLibsVersion=6.2.0

gradle/wrapper/gradle-wrapper.properties

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

grails-app/conf/application.yml

@@ -17,9 +17,9 @@ grails:
         transactionManagement:
             proxies: false
     gorm:
-        # Whether to autowire entities. 
+        # Whether to autowire entities.
         # Disabled by default for performance reasons.
-        autowire: false         
+        autowire: false
         reactor:
             # Whether to translate GORM events into Reactor events
             # Disabled by default for performance reasons
@@ -135,7 +135,8 @@ spatial:
     baseURL: "https://spatial.ala.org.au"
 collectory:
     baseURL: "https://collections.ala.org.au"
-
+lists:
+    baseURL: "https://lists.ala.org.au"
 speciesPages:
     searchURL: "https://bie.ala.org.au/species/Tiliqua+rugosa"
     searchTitle: Shingle-back
@@ -154,19 +155,37 @@ useSpatialAlerts: true
 useBlogsAlerts: true
 useCitizenScienceAlerts: true
 biosecurity:
+    cronExpression: '0 30 9 ? * WED'
     moreinfo:
         link: https://www.ala.org.au/blogs-news/ala-helps-to-stop-pests-in-their-tracks/
+    dir: /data/alerts/emails
+    legacy:
+        aus: cl927:*
+        act: cl927:"Australian Capital Territory" OR cl927:"Jervis Bay Territory"
+        sa: cl927:"South Australia (including Coastal Waters)"
+        vic: cl927:"Victoria (including Coastal Waters)"
+        wa: cl927:"Western Australia (including Coastal Waters)"
+        nt: cl927:"Northern Territory (including Coastal Waters)"
+        qld: cl927:"Queensland (including Coastal Waters)"
+        tas: cl927:"Tasmania (including Coastal Waters)"
+        nsw: cl927:"New South Wales (including Coastal Waters)"
+        lgaField: cl10923
+        shape: cl11033:"Namadgi" OR cl11033:"Tidbinbilla" OR cl11033:"Bimberi"
+        #shape: spatialObject:9223660
+        eventDateAge: 29
+        firstLoadedDateAge: 8
+
 environments:
     development:
         grails:
-            serverURL: "http://dev.ala.org.au:8080"
+            serverURL: "http://localhost:8080"
             mail:
                 host: "localhost"
                 port: 1025
                 username: postie.emailSender
         security:
             cas:
-                appServerName: "http://dev.ala.org.au:8080"
+                appServerName: "http://localhost:8080"
     test:
         grails:
             serverURL: "http://dev.ala.org.au:8080"
@@ -239,7 +258,7 @@ environments:
             driverClassName: org.h2.Driver
             username: sa
             password:
-            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     production:
         dataSource:
             dbCreate: none
@@ -286,4 +305,4 @@ openapi:
         name: Mozilla Public License 1.1
         url: https://www.mozilla.org/en-US/MPL/1.1/
     version: '@info.app.version@'
-    cachetimeoutms: 0
+    cachetimeoutms: 0

grails-app/conf/logback.xml

@@ -11,6 +11,9 @@
         </encoder>
     </appender>
 
+    <logger name="org.hibernate.orm" level="ERROR" />
+    <logger name="org.grails.config.NavigableMap" level="ERROR" />
+<!--    <logger name="au.org.ala" level="DEBUG" />-->
 
     <logger name="au.org.ala.cas.client" level="WARN">
         <appender-ref ref="STDOUT" />
@@ -19,4 +22,4 @@
     <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+</configuration>