From b2ab4ca12d9504b4ac1b9dc34d6e7d94cade0e9b Mon Sep 17 00:00:00 2001
From: Henry Avetisyan <havetisy@yahoo.com>
Date: Mon, 17 Jul 2023 14:25:17 -0700
Subject: [PATCH] update deps and move from sun.jakarta.mail to angus-mail
 (#2240)

Signed-off-by: Henry Avetisyan <hga@yahooinc.com>
Co-authored-by: Henry Avetisyan <hga@yahooinc.com>
---
 libs/java/server_common/pom.xml     | 14 ++++++++++----
 pom.xml                             | 14 +++++++-------
 syncers/auth_history_syncer/pom.xml |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml
index b53e09fcc1e..77cff2894a0 100644
--- a/libs/java/server_common/pom.xml
+++ b/libs/java/server_common/pom.xml
@@ -30,12 +30,13 @@
     <code.coverage.min>0.9271</code.coverage.min>
     <commons.dbcp2.version>2.9.0</commons.dbcp2.version>
     <commons.pool2.version>2.11.1</commons.pool2.version>
-    <jakarta.mail.version>2.0.1</jakarta.mail.version>
+    <jakarta.mail.version>2.1.2</jakarta.mail.version>
+    <angus.mail.version>2.0.2</angus.mail.version>
     <protobuf.java.version>3.21.12</protobuf.java.version>
     <pulsar.client.version>2.11.1</pulsar.client.version>
     <aws.secretmanager.version>1.0.12</aws.secretmanager.version>
     <uuid.version>4.2.0</uuid.version>
-    <hamcrest.json.version>0.2</hamcrest.json.version>
+    <hamcrest.json.version>0.3</hamcrest.json.version>
   </properties>
 
   <dependencies>
@@ -268,10 +269,15 @@
       <version>${aws2.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>jakarta.mail</artifactId>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
       <version>${jakarta.mail.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.angus</groupId>
+      <artifactId>angus-mail</artifactId>
+      <version>${angus.mail.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.athenz</groupId>
       <artifactId>athenz-zms-core</artifactId>
diff --git a/pom.xml b/pom.xml
index cbef7503c07..b60963b2b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,13 +72,13 @@
 
   <properties>
     <apache.httpclient.version>4.5.14</apache.httpclient.version>
-    <aws.version>1.12.497</aws.version>
-    <aws2.version>2.20.94</aws2.version>
-    <gcp.bom.version>26.17.0</gcp.bom.version>
+    <aws.version>1.12.506</aws.version>
+    <aws2.version>2.20.103</aws2.version>
+    <gcp.bom.version>26.18.0</gcp.bom.version>
     <gcp.api-client.version>2.2.0</gcp.api-client.version>
     <bouncycastle.version>1.75</bouncycastle.version>
     <commons.daemon.version>1.3.4</commons.daemon.version>
-    <guava.version>32.0.1-jre</guava.version>
+    <guava.version>32.1.1-jre</guava.version>
     <hamcrest.version>2.2</hamcrest.version>
     <jackson-core.version>2.15.2</jackson-core.version>
     <jackson-databind.version>2.15.2</jackson-databind.version>
@@ -86,8 +86,8 @@
     <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
     <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
     <jakarta.ws.version>3.1.0</jakarta.ws.version>
-    <jaxb.api.version>3.0.1</jaxb.api.version>
-    <jaxb.impl.version>3.0.2</jaxb.impl.version>
+    <jaxb.api.version>4.0.0</jaxb.api.version>
+    <jaxb.impl.version>4.0.3</jaxb.impl.version>
     <jersey.version>3.1.2</jersey.version>
     <jetty.version>11.0.15</jetty.version>
     <jjwt.version>0.11.5</jjwt.version>
@@ -116,7 +116,7 @@
     <slf4j.client.version>1.7.36</slf4j.client.version>
     <slf4j.server.version>2.0.7</slf4j.server.version>
     <testng.version>7.8.0</testng.version>
-    <swagger.version>2.2.14</swagger.version>
+    <swagger.version>2.2.15</swagger.version>
     <commons.logging.version>1.2</commons.logging.version>
 
     <code.coverage.min>0.95</code.coverage.min>
diff --git a/syncers/auth_history_syncer/pom.xml b/syncers/auth_history_syncer/pom.xml
index 26bba1baf63..871d692dd6c 100644
--- a/syncers/auth_history_syncer/pom.xml
+++ b/syncers/auth_history_syncer/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <code.coverage.min>0.7738</code.coverage.min>
-        <aws.dynamodb.local.version>1.22.0</aws.dynamodb.local.version>
+        <aws.dynamodb.local.version>2.0.0</aws.dynamodb.local.version>
         <sqlite4java.version>1.0.392</sqlite4java.version>
         <junit.version>4.13.2</junit.version>
     </properties>