Merge pull request #1652 from AtlasOfLivingAustralia/develop

release 7.1

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install nodejs
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
 
@@ -88,17 +88,26 @@ jobs:
 
       - name: Run BioCollect functional tests
         run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata dev
+        continue-on-error: true
         env:
           GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
+      - name: Archive log directory
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
+        with:
+          path: ./logs
+
       - name: Clean to remove clover instrumentation
         uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
         uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: publish
         env:

build.gradle

@@ -18,6 +18,10 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+}
+
 
 version "$biocollectVersion"
 group "au.org.ala"
@@ -111,6 +115,8 @@ dependencies {
     implementation('org.grails.plugins:http-builder-helper:1.1.0') {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+
+    implementation 'com.opencsv:opencsv:5.7.0'
     implementation "org.apache.httpcomponents:httpclient:4.5.7"
     runtimeOnly 'org.webjars:jquery:1.12.4'
     implementation 'dk.glasius:external-config:3.0.0'
@@ -151,10 +157,13 @@ dependencies {
     runtimeOnly 'com.bertramlabs.plugins:less-asset-pipeline:3.3.1'
     implementation 'com.bertramlabs.plugins:sass-asset-pipeline:3.2.5'
     implementation 'org.codehaus.groovy:groovy-dateutil:2.5.0'
-
+    implementation "com.nimbusds:nimbus-jose-jwt:9.25.6"
+    implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     if (!Boolean.valueOf(inplace)) {
         implementation "org.grails.plugins:ala-map-plugin:3.0.1"
-        implementation "org.grails.plugins:ecodata-client-plugin:7.0"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.1"
     }
 
     testCompileOnly "org.grails:grails-test-mixins:3.3.0"
@@ -200,7 +209,8 @@ assets {
     maxThreads = 6
     minifyOptions = [
             languageMode  : 'ES6', //languageIn
-            targetLanguage: 'ES5', // languageOut
+//            targetLanguage: 'ES5', // languageOut
+            excludes: ['sw.js', '**/*.min.js']
     ]
 
     includes = []
@@ -261,6 +271,7 @@ tasks.withType(Test) {
 wiremock {
     dir "${project.projectDir}/src/integration-test/resources/wiremock/"
     params "--port=8018 --global-response-templating --local-response-templating"
+//    params "--port=8018 --global-response-templating --local-response-templating --verbose --print-all-network-traffic --record-mappings"
 }
 
 assets {