Merge pull request #371 from AtlasOfLivingAustralia/develop

PR for release 2.0.0

.travis.yml

@@ -8,7 +8,7 @@ branches:
   - develop
   - hotfix
   - 1.4.2.1
-  - feature/oidcIntegration2
+  - feature/grails5
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

build.gradle

@@ -1,17 +1,17 @@
 buildscript {
     repositories {
         mavenLocal()
-        maven { url "http://nexus.ala.org.au/content/groups/public/" }
+        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 "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"
     }
 }
 
-version "1.8.2"
+version "1.10-SNAPSHOT"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -36,27 +36,18 @@ publishing {
     }
     publications {
         mavenJar(MavenPublication) {
-            pom.withXml {
-                def pomNode = asNode()
-                pomNode.dependencyManagement.replaceNode {}
-
-                // simply remove dependencies without a version
-                // version-less dependencies are handled with dependencyManagement
-                // see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/8 for more complete solutions
-                pomNode.dependencies.dependency.findAll {
-                    it.version.text().isEmpty()
-                }.each {
-                    it.replaceNode {}
-                }
-            }
-            from components.web
+            artifact bootWar
         }
     }
 }
 
+bootWar {
+    launchScript()
+}
+
 repositories {
     mavenLocal()
-    maven { url "http://nexus.ala.org.au/content/groups/public/" }
+    maven { url "https://nexus.ala.org.au/content/groups/public/" }
     maven { url "https://repo.grails.org/grails/core" }
 }
 configurations {
@@ -68,69 +59,69 @@ configurations {
 
 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: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.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:gsp"
+    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: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.plugins:cache"
+    implementation "org.grails.plugins:async"
+    implementation "org.grails.plugins:events"
+    implementation "org.grails.plugins:gsp"
     compileOnly "io.micronaut:micronaut-inject-groovy"
     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 "javax.xml.bind:jaxb-api:2.3.1"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.2.4"
-    testCompile "io.micronaut:micronaut-inject-groovy"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.mockito:mockito-core"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
-    testCompile 'org.springframework:spring-messaging:5.3.22'
-
-    compile 'com.github.davidmoten:rxjava-file:0.4'
-    compile 'io.reactivex:rxgroovy:1.0.3'
-    compile ('org.jasig.cas.client:cas-client-core:3.4.1') {
+    runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
+    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"
+    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"
+    testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
+    testImplementation  'org.springframework:spring-messaging:5.3.22'
+
+    implementation 'com.github.davidmoten:rxjava-file:0.4'
+    implementation 'io.reactivex:rxgroovy:1.0.3'
+    implementation ('org.jasig.cas.client:cas-client-core:3.4.1') {
         exclude group: 'javax.servlet', module: 'servlet-api'
     }
 
-    compile "org.grails.plugins:grails-spring-websocket:2.3.0"
-    compile group: "au.org.ala", name: "ala-name-matching-model", version:"4.2"
-    compile "org.jsoup:jsoup:1.8.3"
-    compile 'net.sf.opencsv:opencsv:2.3'
-    compile "org.apache.solr:solr-solrj:8.1.0"
-    compile("org.gbif:dwca-io:1.24") {
+    implementation "org.grails.plugins:grails-spring-websocket:2.3.0"
+    implementation group: "au.org.ala", name: "ala-name-matching-model", version:"4.2"
+    implementation "org.jsoup:jsoup:1.15.4"
+    implementation 'net.sf.opencsv:opencsv:2.3'
+    implementation "org.apache.solr:solr-solrj:8.1.0"
+    implementation("org.gbif:dwca-io:1.24") {
         exclude group: 'com.google.guava', module: 'guava'
     }
-    compile "com.google.guava:guava:19.0"
-    compile 'org.grails.plugins:external-config:2.0.0'
-    runtime "org.grails.plugins:ala-bootstrap3:4.1.0"
-    compile "org.grails.plugins:ala-ws-security-plugin:4.1.1"
-    compile "org.grails.plugins:ala-ws-plugin:3.1.1"
-    compile "org.grails.plugins:ala-auth:5.1.1"
+    implementation "com.google.guava:guava:19.0"
+    implementation 'dk.glasius:external-config:3.1.1'
+    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.1.0"
+    implementation "org.grails.plugins:ala-ws-security-plugin:${alaSecurityLibsVersion}"
+    implementation "org.grails.plugins:ala-ws-plugin:${alaSecurityLibsVersion}"
+    implementation "org.grails.plugins:ala-auth:${alaSecurityLibsVersion}"
 
-    compile group: 'org.grails.plugins', name: 'ala-admin-plugin', version: '2.3.0'
+    implementation group: 'org.grails.plugins', name: 'ala-admin-plugin', version: '2.3.0'
 
-    testCompile 'com.github.tomakehurst:wiremock:2.19.0'
-    testCompile 'com.github.tomjankes:wiremock-groovy:0.2.0'
+    testImplementation  'com.github.tomakehurst:wiremock:2.19.0'
+    testImplementation  'com.github.tomjankes:wiremock-groovy:0.2.0'
 
-    compile 'au.org.ala.plugins:openapi:1.0.0'
+    implementation 'au.org.ala.plugins:openapi:1.0.0'
 }
 
 bootRun {
@@ -152,8 +143,8 @@ tasks.withType(GroovyCompile) {
 }
 
 webdriverBinaries {
-    chromedriver '2.45.0'
-    geckodriver '0.24.0'
+    chromedriver "$chromeDriverVersion"
+    geckodriver "$geckodriverVersion"
 }
 
 tasks.withType(Test) {

gradle.properties

@@ -1,5 +1,13 @@
-grailsVersion=4.1.1
-gorm.version=7.0.8.RELEASE
+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.6
+chromeDriverVersion=2.45.0
+geckodriverVersion=0.24.0
+seleniumSafariDriverVersion=3.14.0
+alaSecurityLibsVersion=6.0.4

gradle/wrapper/gradle-wrapper.properties

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