From 0aad86a3fca536e583fdebaecb300f20027fd0bd Mon Sep 17 00:00:00 2001
From: Daniel Bernstein <dabylon@gmail.com>
Date: Fri, 15 Nov 2024 11:33:19 -0800
Subject: [PATCH 1/2] Upgrade Duracloud version to 8.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68755933..f5700acd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
     <log.level.default>INFO</log.level.default>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <duracloud.version>8.0.0</duracloud.version>
+    <duracloud.version>8.1.0</duracloud.version>
     <duracloud.db.version>8.0.0</duracloud.db.version>
     <duraspace-codestyle.version>1.1.0</duraspace-codestyle.version>
     <aws.sdk.version>1.12.548</aws.sdk.version>

From c7e9e420caa014288fad6083de4ee8271ec971e3 Mon Sep 17 00:00:00 2001
From: Daniel Bernstein <dabylon@gmail.com>
Date: Wed, 11 Dec 2024 15:53:32 -0800
Subject: [PATCH 2/2] Fix dependency issues.

---
 auditlog-generator/pom.xml |  6 ++++++
 pom.xml                    | 22 +++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/auditlog-generator/pom.xml b/auditlog-generator/pom.xml
index b3934ef7..72b5c152 100644
--- a/auditlog-generator/pom.xml
+++ b/auditlog-generator/pom.xml
@@ -80,6 +80,12 @@
       <groupId>org.duracloud</groupId>
       <artifactId>synctool</artifactId>
       <version>${duracloud.version}</version>
+      <exclusions>
+      <exclusion>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+      </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index f5700acd..3c1cbacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,16 +173,16 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <duracloud.version>8.1.0</duracloud.version>
-    <duracloud.db.version>8.0.0</duracloud.db.version>
+    <duracloud.db.version>8.0.2</duracloud.db.version>
     <duraspace-codestyle.version>1.1.0</duraspace-codestyle.version>
-    <aws.sdk.version>1.12.548</aws.sdk.version>
+    <aws.sdk.version>1.12.723</aws.sdk.version>
     <spring.framework.version>5.3.29</spring.framework.version>
     <powermock.version>1.5.4</powermock.version>
     <spring.framework.data.jpa.version>2.7.15</spring.framework.data.jpa.version>
     <hibernate.version>5.4.33.Final</hibernate.version>
     <hibernate.validator.version>5.4.3.Final</hibernate.validator.version>
     <mysql.driver.version>8.0.33</mysql.driver.version>
-    <jackson.version>2.12.3</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
     <jaxb.api.version>2.3.1</jaxb.api.version>
     <jaxb.runtime.version>2.3.3</jaxb.runtime.version>
     <skipUTs>false</skipUTs>
@@ -552,6 +552,22 @@
         <version>2.1</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.amazonaws</groupId>
+        <artifactId>aws-java-sdk-core</artifactId>
+        <version>${aws.sdk.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-s3</artifactId>