Merge pull request #285 from AtlasOfLivingAustralia/dev

Preparing v8.0.0

Author: chrisala

.github/workflows/build.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Install nodejs

build.gradle

@@ -17,7 +17,7 @@ plugins {
     id 'jacoco'
 }
 
-version "7.2.1"
+version "8.0-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"
@@ -49,6 +49,8 @@ configurations {
         extendsFrom developmentOnly
     }
 }
+sourceCompatibility = '11'
+targetCompatibility = '17'
 
 dependencies {
     developmentOnly("org.springframework.boot:spring-boot-devtools")
@@ -69,10 +71,16 @@ dependencies {
     implementation "org.grails.plugins:async"
     implementation "org.grails.plugins:scaffolding"
     implementation "org.grails.plugins:gsp"
-    implementation 'commons-io:commons-io:2.6'
+    implementation 'commons-io:commons-io:2.14.0'
     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.apache.httpcomponents:httpcore:4.4.13"
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    implementation "org.apache.httpcomponents:httpmime:4.2.1"
+    implementation 'com.opencsv:opencsv:5.7.0'
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
     console "org.grails:grails-console"
     profile "org.grails.profiles:web-plugin"

gradle.properties

@@ -1,4 +1,4 @@
-grailsVersion=6.2.0
+grailsVersion=6.2.3
 gorm.version=8.1.2
 grailsGradlePluginVersion=6.1.2
 org.gradle.daemon=true
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xss2048k -Xmx1024M
 exploded=true
 enableClover=false
 enableJacoco=true
-alaSecurityLibsVersion=6.2.0
+alaSecurityLibsVersion=7.0.0

grails-app/conf/application.yml

@@ -29,12 +29,13 @@ spring:
 
 disableCAS: true
 
-security:
-    cas:
-        appServerName: 'n/a'
+
 management:
     endpoints:
         enabled-by-default: false
+
+lists.baseURL : https://lists-ws.test.ala.org.au/
+
 ---
 grails:
     mime:
@@ -94,8 +95,26 @@ userProfile:
 ---
 environments:
     test:
+        security:
+            cas:
+                appServerName: 'n/a'
+            oidc:
+                enabled: true
+                discoveryUri: 'http://localhost:8080'
+            jwt:
+                enabled: false
+
+        grails:
+            serverURL: "http://localhost:8080"
+
         server:
             port: "8087"
         spring:
             autoconfigure:
-                exclude: "au.org.ala.ws.security.AlaWsSecurityConfiguration"
+                exclude: "au.org.ala.ws.security.AlaWsSecurityConfiguration"
+
+---
+listsFieldMappingV2:
+        matchedName: "classification.scientificName"
+        commonName: "classification.vernacularName"
+        rawScientificName: "scientificName"

grails-app/conf/logback.xml

@@ -15,6 +15,10 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
+    <logger name="org.pac4j" level="INFO">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
     <root level="error">
         <appender-ref ref="STDOUT" />
     </root>

grails-app/services/au/org/ala/ecodata/forms/ActivityFormService.groovy

@@ -1,7 +1,6 @@
 package au.org.ala.ecodata.forms
 
 import org.grails.web.json.JSONArray
-import org.grails.web.json.JSONElement
 import org.grails.web.json.JSONObject
 
 /**
@@ -11,7 +10,7 @@ class ActivityFormService {
 
     static final String ACTIVITY_FORM_PATH = '/activityForm'
     static final String ACTIVITY_FORM_SEARCH_PATH = '/activityForm/search'
-    def webService
+    def ecpWebService
     def grailsApplication
 
     /**
@@ -33,7 +32,7 @@ class ActivityFormService {
         if (includeScoreInformation) {
             url += '&includeScoreInformation='+Boolean.toString(includeScoreInformation)
         }
-        Map result = webService.getJson(url)
+        Map result = ecpWebService.getJson(url)
         if (!result || result.error) {
             result = null
         }
@@ -74,7 +73,7 @@ class ActivityFormService {
     Map searchActivityForms(Map criteria) {
         String url = grailsApplication.config.getProperty('ecodata.service.url') +
                 ACTIVITY_FORM_SEARCH_PATH
-        Map result = webService.doPost(url, criteria)
+        Map result = ecpWebService.doPost(url, criteria)
         if (!result || result.error) {
             result = null
         }