Merge pull request #32 from AtlasOfLivingAustralia/develop

PR for release 2.2.0
AtlasOfLivingAustralia · May 2, 2023 · 8b8fea5 · 8b8fea5
2 parents 2f47d56 + 6bf17f5
commit 8b8fea5
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 188 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,8 @@ branches:
   only:
   - master
   - develop
-  - feature/oidc-auth
+  - /^hotfix\/.*$/
+  - /^feature\/.*$/
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

diff --git a/build.gradle b/build.gradle
@@ -6,13 +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"
     }
 }
 
+plugins {
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+}
+
 
-version "2.1.1"
+
+version "2.2.0-SNAPSHOT"
 
 group "au.org.ala"
 
@@ -28,7 +33,7 @@ apply plugin:"maven-publish"
 
 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" }
 }
 
@@ -41,50 +46,50 @@ 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-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", { exclude group: "org.codehaus.groovy", module: "groovy-all" }
-    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-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", { exclude group: "org.codehaus.groovy", module: "groovy-all" }
+    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 "javax.xml.bind:jaxb-api:2.3.1"
-    runtime "xml-apis:xml-apis:1.4.01"
-    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.1.2-b03"
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly "xml-apis:xml-apis:1.4.01"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.6"
+    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:$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"
 
     // External config
-    compile 'org.grails.plugins:external-config:2.0.0'
+    implementation 'dk.glasius:external-config:3.1.1'
 
     // Javascript libraries
-    compile 'org.webjars:knockout:3.5.1'
+    implementation 'org.webjars:knockout:3.5.1'
 
     // ALA Plugins
-     compile "org.grails.plugins:ala-auth:5.1.1"
-     compile "org.grails.plugins:ala-admin-plugin:2.3.0"
-     runtime "org.grails.plugins:ala-bootstrap3:4.1.0"
-     compile "au.org.ala.plugins.grails:images-client-plugin:1.4"
+     implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
+     implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
+     runtimeOnly "org.grails.plugins:ala-bootstrap3:4.1.0"
+     implementation "au.org.ala.plugins.grails:images-client-plugin:1.4"
 
 }
 
@@ -107,8 +112,8 @@ tasks.withType(GroovyCompile) {
 }
 
 webdriverBinaries {
-    chromedriver '2.45.0'
-    geckodriver '0.24.0'
+    chromedriver "$chromeDriverVersion"
+    geckodriver "$geckodriverVersion"
 }
 
 tasks.withType(Test) {
@@ -123,12 +128,12 @@ assets {
     minifyCss = true
 }
 
-// Standard ALA import doesn't work with this version
 publishing {
+    targetCompatibility = 1.11
     repositories {
         maven {
             name 'Nexus'
-            url "https://nexus.ala.org.au/content/repositories/${project.version.endsWith('-SNAPSHOT') ? 'snapshots' : 'releases' }"
+            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')
@@ -137,20 +142,7 @@ 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
         }
     }
 }
diff --git a/gradle.properties b/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
+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.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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