PR for 6.0.1 release

.travis.yml

@@ -9,7 +9,7 @@ branches:
   - develop
   - EYA-enhancements
   - feature/data-quality
-  - epic/grails4/oidc-auth
+  - /^epic\/.*\/develop$/
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

build.gradle

@@ -1,13 +1,15 @@
+
 buildscript {
     repositories {
         mavenLocal()
         maven { url "https://nexus.ala.org.au/content/groups/public/" }
+        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.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4"
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.6"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.4.7"
     }
 }
 
@@ -24,8 +26,8 @@ ext {
 }
 
 
-version "5.0.2"
 
+version "6.0.1-SNAPSHOT"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -58,12 +60,21 @@ if (inplace) {
         exploded = true
         plugins {
             // When not inplace used, the dependencies below are managed by biocache-hubs plugin
-            compile project(':biocache-hubs')
-            compile project(':downloads-plugin')
-//            compile project(':ala-charts-plugin')
-//            compile project(':images-client-plugin')
-            compile project(':ala-bootstrap3')
-            compile project(':ala-ws-plugin')
+            implementation project(':biocache-hubs')
+            implementation project(':downloads-plugin')
+////            implementation project(':ala-charts-plugin')
+////            implementation project(':images-client-plugin')
+//            implementation project(':ala-bootstrap3')
+//            implementation project(':ala-ws-plugin')
+
+//            implementation "au.org.ala.plugins.grails:downloads-plugin:3.0", {
+//                exclude group: 'org.grails.plugins', module: 'cache'
+//                exclude group: 'org.ehcache', module: 'ehcache'
+//                exclude group: 'org.grails.plugins', module: 'cache-ehcache'
+//            }
+            implementation "org.grails.plugins:ala-bootstrap3:4.1.0", {
+                exclude group: 'au.org.ala', module: 'ala-cas-client'
+            }
         }
     }
 }
@@ -76,58 +87,62 @@ 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-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    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:5.0.0-ALA:ALA"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    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-web-boot"
+    implementation "org.grails:grails-logging"
+    implementation "org.grails:grails-plugin-rest"
+    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:cache:5.0.0-ALA:ALA"
+//    implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:cache:5.0.1-ALA"
+    implementation "org.grails.plugins:async"
+    implementation "org.grails.plugins:scaffolding"
+    implementation "org.grails.plugins:events"
+    implementation "org.grails.plugins:gsp"
+    implementation 'dk.glasius:external-config:3.1.1'
+
     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 "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "javax.xml.bind:jaxb-api:2.3.1"
-    runtime 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
-//    runtime 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.2.4"
-    testCompile "io.micronaut:micronaut-inject-groovy"
-    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"
+    runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly 'org.ehcache:ehcache'
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
+//    runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.7"
+    testImplementation "io.micronaut:micronaut-inject-groovy"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.0.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.0.0"
+    testImplementation "org.seleniumhq.selenium:selenium-support:4.0.0"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.0.0"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.0.0"
 
     // Jars
-    compile "org.apache.httpcomponents:httpclient:4.5.6"
-    compile 'xml-apis:xml-apis:1.4.01'
+    implementation "org.apache.httpcomponents:httpclient:4.5.6"
+    implementation 'xml-apis:xml-apis:1.4.01'
 
     // ALA Plugins
-//    compile "org.grails.plugins:ala-auth:3.2.3"
-    compile "org.grails.plugins:ala-bootstrap3:4.1.0", {
+//    implementation "org.grails.plugins:ala-auth:3.2.3"
+    implementation "org.grails.plugins:ala-bootstrap3:4.1.0", {
         exclude group: 'au.org.ala', module: 'ala-cas-client'
     }
-    //compile "org.grails.plugins:ala-admin-plugin:2.2", noCache
+    //implementation "org.grails.plugins:ala-admin-plugin:2.2", noCache
     if (!inplace) {
-        compile "au.org.ala.plugins.grails:biocache-hubs:5.0", noCache
-        compile "au.org.ala.plugins.grails:downloads-plugin:3.1", noCache
-        compile "org.grails.plugins:ala-bootstrap3:4.1.0", {
+        implementation "au.org.ala.plugins.grails:biocache-hubs:6.0.1", noCache
+        implementation "au.org.ala.plugins.grails:downloads-plugin:4.0.0", noCache
+        implementation "org.grails.plugins:ala-bootstrap3:4.1.0", {
             exclude group: 'au.org.ala', module: 'ala-cas-client'
         }
     }
@@ -207,28 +222,26 @@ publishing {
         }
     }
 
-    war {
-        enabled=true
-    }
-
-
-    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 {}
+    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')
                 }
             }
-            from components.web
         }
+        publications {
+            mavenJar(MavenPublication) {
+                artifact bootWar
+            }
+        }
+    }
+
+    bootWar {
+        launchScript()
     }
 }
 

gradle.properties

@@ -1,5 +1,7 @@
-grailsVersion=4.1.1
-#gorm.version=7.0.8.RELEASE
-#org.gradle.daemon=true
-#org.gradle.parallel=true
+grailsVersion=5.3.2
+grailsGradlePluginVersion=5.3.0
+groovyVersion=3.0.11
+#gorm.version=7.3.3
+org.gradle.daemon=true
+org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

gradle/wrapper/gradle-wrapper.properties

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