From d4fdce91a9f880c50e4371c18e5ef820eb37235a Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 25 Nov 2024 15:41:57 +0000
Subject: [PATCH 1/2] fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-8344146
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-8344149
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-7924769
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-7924772
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-8366323
- https://snyk.io/vuln/SNYK-JAVA-CAUHNHAPIFHIR-8366327
- https://snyk.io/vuln/SNYK-JAVA-COMMONSIO-8161190
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-5710356
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cb66423..e65f949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<junit-jupiter.version>5.9.3</junit-jupiter.version>
 		<slf4j.version>2.0.7</slf4j.version>
-		<hapi.fhir.r4.version>6.6.1</hapi.fhir.r4.version>
+		<hapi.fhir.r4.version>7.6.0</hapi.fhir.r4.version>
 		<slf4j.version>2.0.7</slf4j.version>
 	</properties>
 

From 3753a7fa20ce1be609afcc97e15a0b06c573e101 Mon Sep 17 00:00:00 2001
From: Joseph Kotanchik <joseph.kotanchik@semanticbits.com>
Date: Tue, 17 Dec 2024 16:21:58 -0500
Subject: [PATCH 2/2] MAT-7837: HAPI dependencies and other non-breaking
 dependency version bumps.

---
 pom.xml | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e65f949..aa439c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 		<junit-jupiter.version>5.9.3</junit-jupiter.version>
-		<slf4j.version>2.0.7</slf4j.version>
+		<slf4j.version>2.0.12</slf4j.version>
 		<hapi.fhir.r4.version>7.6.0</hapi.fhir.r4.version>
 		<slf4j.version>2.0.7</slf4j.version>
 	</properties>
@@ -33,6 +33,11 @@
 			<url>
 				https://maven.pkg.github.com/measureauthoringtool/madie-java-models</url>
 		</repository>
+		<repository>
+			<id>maven_central</id>
+			<name>Maven Central</name>
+			<url>https://repo.maven.apache.org/maven2/</url>
+		</repository>
 	</repositories>
 	<distributionManagement>
 		<repository>
@@ -46,7 +51,7 @@
 		<dependency>
 			<groupId>gov.cms.madie</groupId>
 			<artifactId>madie-java-models</artifactId>
-			<version>0.5.1</version>
+			<version>0.6.72-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -58,10 +63,22 @@
 			<artifactId>hapi-fhir-structures-r4</artifactId>
 			<version>${hapi.fhir.r4.version}</version>
 		</dependency>
+		<!-- In-memory caching - required in HAPI FHIR v7.4.3+ -->
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-caching-caffeine</artifactId>
+			<version>${hapi.fhir.r4.version}</version>
+		</dependency>
+		<!-- Needed to fix class not found errors when using v2.15.4 - required in HAPI FHIR v7.4.3+ -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.17.2</version>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.34</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -72,7 +89,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
-			<version>2.0.7</version>
+			<version>2.0.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -96,19 +113,19 @@
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest</artifactId>
-			<version>2.2</version>
+			<version>3.0-rc1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>5.3.1</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>
-			<version>5.3.1</version>
+			<version>5.12.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>