Merge pull request #3495 from AtlasOfLivingAustralia/dev

Preparing v4.3

Author: chrisala

.github/workflows/build.yml

@@ -20,10 +20,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

@@ -21,6 +21,8 @@ plugins {
     id 'jacoco'
     id 'com.williamhill.wiremock' version '0.4.1'
 }
+sourceCompatibility = '11'
+targetCompatibility = '17'
 
 version "$meritVersion"
 group "au.org.ala"
@@ -152,6 +154,17 @@ dependencies {
     implementation "org.commonmark:commonmark:0.24.0"
     implementation "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1"
 
+    // Used to get a token that can be used to access the BDR API hosted in Azure
+    implementation platform('com.azure:azure-sdk-bom:1.2.28')
+
+    implementation 'com.azure:azure-identity'
+    implementation 'com.azure:azure-storage-blob'
+
+    // Used to access the Cognito Identity Pool as tokens from the user pool
+    // don't have an audience claim which is required by Azure
+    implementation(platform("software.amazon.awssdk:bom:2.27.21"))
+    implementation 'software.amazon.awssdk:cognitoidentity'
+
     compileOnly "io.micronaut:micronaut-inject-groovy"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
@@ -188,7 +201,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:7.2.1"
+        implementation "org.grails.plugins:ecodata-client-plugin:8.0-SNAPSHOT"
     }
 }