From 3078e722ced4e631402c60616e427faa447ee8b3 Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Tue, 20 Aug 2024 09:58:08 -0700
Subject: [PATCH 1/7] AB2D-6270 Ab2d,libs -Analyze level of effort and address
 critical Snyk security vulnerabilities

---
 api/pom.xml      |  4 ++--
 e2e-test/pom.xml |  6 +++---
 pom.xml          | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index c0774f7ea..2011dcc8d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.root>${basedir}/..</project.root>
         <springfox.version>3.0.0</springfox.version>
-        <okta-jwt.version>0.5.7</okta-jwt.version>
+        <okta-jwt.version>0.5.9</okta-jwt.version>
         <sonar.coverage.exclusions>**/JobClient.java</sonar.coverage.exclusions>
         <!-- 
             - AB2D-6099 -
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>dev.akkinoc.spring.boot</groupId>
             <artifactId>logback-access-spring-boot-starter</artifactId>
-            <version>3.4.3</version>
+            <version>4.2.2</version>
         </dependency>
 
         <dependency>
diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index f8876f669..720e00956 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -36,18 +36,18 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
-            <version>0.11.5</version>
+            <version>0.12.6</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-impl</artifactId>
-            <version>0.11.5</version>
+            <version>0.12.6</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
-            <version>0.11.5</version>
+            <version>0.12.6</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index e2e8d6f58..99e775744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,14 +28,14 @@
     <properties>
         <project.root>${basedir}</project.root>
         <java.version>17</java.version>
-        <hapi.version>6.6.2</hapi.version>
+        <hapi.version>7.2.2</hapi.version>
         <mockito.inline.version>5.2.0</mockito.inline.version>
         <okhttp3.version>4.10.0</okhttp3.version>
         <checkstyle.config>${project.root}/src/main/resources/checkstyle.xml</checkstyle.config>
         <logback-encoder.version>7.3</logback-encoder.version>
         <testcontainers.version>1.18.3</testcontainers.version>
         <newrelic.version>8.4.0</newrelic.version>
-        <postgres.version>42.6.0</postgres.version>
+        <postgres.version>42.7.3</postgres.version>
         <spring-cloud-aws.version>2.4.4</spring-cloud-aws.version>
 
         <!-- Maven plugin versions -->
@@ -44,11 +44,11 @@
         <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
 
         <!-- AB2D lib versions -->
-        <events-client.version>1.12.8</events-client.version>
-        <bfd-lib.version>2.2.3</bfd-lib.version>
-        <fhir-lib.version>1.2.7</fhir-lib.version>
+        <events-client.version>1.12.9</events-client.version>
+        <bfd-lib.version>2.2.4</bfd-lib.version>
+        <fhir-lib.version>1.2.8</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
-        <filters-lib.version>1.9.4</filters-lib.version>
+        <filters-lib.version>1.9.5</filters-lib.version>
         <properties-client.version>1.2.5</properties-client.version>
         <contract-client.version>1.2.4</contract-client.version>
     </properties>

From 4af2e7e7d72f75f2ac1a9798cf8044330706245a Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Fri, 23 Aug 2024 10:50:48 -0700
Subject: [PATCH 2/7] wip

---
 api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 2011dcc8d..c0774f7ea 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.root>${basedir}/..</project.root>
         <springfox.version>3.0.0</springfox.version>
-        <okta-jwt.version>0.5.9</okta-jwt.version>
+        <okta-jwt.version>0.5.7</okta-jwt.version>
         <sonar.coverage.exclusions>**/JobClient.java</sonar.coverage.exclusions>
         <!-- 
             - AB2D-6099 -
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>dev.akkinoc.spring.boot</groupId>
             <artifactId>logback-access-spring-boot-starter</artifactId>
-            <version>4.2.2</version>
+            <version>3.4.3</version>
         </dependency>
 
         <dependency>

From 0de5f88edd6d01559930edd63378d250af83b651 Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Mon, 26 Aug 2024 12:10:09 -0700
Subject: [PATCH 3/7] wip

---
 api/pom.xml      |  2 +-
 e2e-test/pom.xml |  6 +++---
 pom.xml          | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index c0774f7ea..9e6280846 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.root>${basedir}/..</project.root>
         <springfox.version>3.0.0</springfox.version>
-        <okta-jwt.version>0.5.7</okta-jwt.version>
+        <okta-jwt.version>0.5.8</okta-jwt.version>
         <sonar.coverage.exclusions>**/JobClient.java</sonar.coverage.exclusions>
         <!-- 
             - AB2D-6099 -
diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index 720e00956..f8876f669 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -36,18 +36,18 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
-            <version>0.12.6</version>
+            <version>0.11.5</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-impl</artifactId>
-            <version>0.12.6</version>
+            <version>0.11.5</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
-            <version>0.12.6</version>
+            <version>0.11.5</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 99e775744..37e48c08c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <properties>
         <project.root>${basedir}</project.root>
         <java.version>17</java.version>
-        <hapi.version>7.2.2</hapi.version>
+        <hapi.version>6.8.0</hapi.version>
         <mockito.inline.version>5.2.0</mockito.inline.version>
         <okhttp3.version>4.10.0</okhttp3.version>
         <checkstyle.config>${project.root}/src/main/resources/checkstyle.xml</checkstyle.config>
@@ -44,11 +44,11 @@
         <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
 
         <!-- AB2D lib versions -->
-        <events-client.version>1.12.9</events-client.version>
-        <bfd-lib.version>2.2.4</bfd-lib.version>
-        <fhir-lib.version>1.2.8</fhir-lib.version>
+        <events-client.version>1.12.8</events-client.version>
+        <bfd-lib.version>2.2.0</bfd-lib.version>
+        <fhir-lib.version>1.2.7</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
-        <filters-lib.version>1.9.5</filters-lib.version>
+        <filters-lib.version>1.9.4</filters-lib.version>
         <properties-client.version>1.2.5</properties-client.version>
         <contract-client.version>1.2.4</contract-client.version>
     </properties>

From e8bd52e53ae1d3c13c8061c4b54583a84f4ca69e Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Mon, 26 Aug 2024 13:30:01 -0700
Subject: [PATCH 4/7] wip

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

diff --git a/pom.xml b/pom.xml
index 37e48c08c..2e6df7125 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
         <!-- AB2D lib versions -->
         <events-client.version>1.12.8</events-client.version>
-        <bfd-lib.version>2.2.0</bfd-lib.version>
+        <bfd-lib.version>2.2.3</bfd-lib.version>
         <fhir-lib.version>1.2.7</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
         <filters-lib.version>1.9.4</filters-lib.version>

From d9395482fc54760c804d162d04e6b900ac4a3eb5 Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Mon, 26 Aug 2024 14:45:58 -0700
Subject: [PATCH 5/7] wip

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e6df7125..9502f91d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,11 +44,11 @@
         <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
 
         <!-- AB2D lib versions -->
-        <events-client.version>1.12.8</events-client.version>
-        <bfd-lib.version>2.2.3</bfd-lib.version>
-        <fhir-lib.version>1.2.7</fhir-lib.version>
+        <events-client.version>1.12.10</events-client.version>
+        <bfd-lib.version>2.2.4</bfd-lib.version>
+        <fhir-lib.version>1.2.8</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
-        <filters-lib.version>1.9.4</filters-lib.version>
+        <filters-lib.version>1.9.5</filters-lib.version>
         <properties-client.version>1.2.5</properties-client.version>
         <contract-client.version>1.2.4</contract-client.version>
     </properties>

From 3bef0a887010884a8e1a10bebdd52e9a7606d16a Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Tue, 27 Aug 2024 11:08:18 -0700
Subject: [PATCH 6/7] AB2D-6106/address vulnerabilities

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9502f91d7..d1781f1fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <properties>
         <project.root>${basedir}</project.root>
         <java.version>17</java.version>
-        <hapi.version>6.8.0</hapi.version>
+        <hapi.version>6.6.2</hapi.version>
         <mockito.inline.version>5.2.0</mockito.inline.version>
         <okhttp3.version>4.10.0</okhttp3.version>
         <checkstyle.config>${project.root}/src/main/resources/checkstyle.xml</checkstyle.config>
@@ -45,10 +45,10 @@
 
         <!-- AB2D lib versions -->
         <events-client.version>1.12.10</events-client.version>
-        <bfd-lib.version>2.2.4</bfd-lib.version>
-        <fhir-lib.version>1.2.8</fhir-lib.version>
+        <bfd-lib.version>2.2.5</bfd-lib.version>
+        <fhir-lib.version>1.2.9</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
-        <filters-lib.version>1.9.5</filters-lib.version>
+        <filters-lib.version>1.9.6</filters-lib.version>
         <properties-client.version>1.2.5</properties-client.version>
         <contract-client.version>1.2.4</contract-client.version>
     </properties>

From 90abcc36da2563c7b8b80379e0897e21c2d19280 Mon Sep 17 00:00:00 2001
From: smirnovaae <annasmirnova@navapbc.com>
Date: Tue, 27 Aug 2024 11:44:57 -0700
Subject: [PATCH 7/7] fix tests

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1781f1fc..9d1404960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,10 +45,10 @@
 
         <!-- AB2D lib versions -->
         <events-client.version>1.12.10</events-client.version>
-        <bfd-lib.version>2.2.5</bfd-lib.version>
+        <bfd-lib.version>2.2.3</bfd-lib.version>
         <fhir-lib.version>1.2.9</fhir-lib.version>
         <aggregator-lib.version>1.3.4</aggregator-lib.version>
-        <filters-lib.version>1.9.6</filters-lib.version>
+        <filters-lib.version>1.9.4</filters-lib.version>
         <properties-client.version>1.2.5</properties-client.version>
         <contract-client.version>1.2.4</contract-client.version>
     </properties>