From 585e3f504af083f96c2ab705ea6a7caf5ae67b23 Mon Sep 17 00:00:00 2001
From: c-schuler <hoofschu@gmail.com>
Date: Mon, 7 Oct 2024 12:13:21 -0600
Subject: [PATCH] Update to clinical-reasoning 3.12 and HAPI 7.4

---
 Java/measureeval/pom.xml                               |  5 +++++
 .../measureeval/controllers/ExceptionHandlers.java     |  2 +-
 Java/pom.xml                                           | 10 ++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Java/measureeval/pom.xml b/Java/measureeval/pom.xml
index f95f81b0e..7bd885569 100644
--- a/Java/measureeval/pom.xml
+++ b/Java/measureeval/pom.xml
@@ -74,6 +74,11 @@
             <artifactId>spring-kafka</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
diff --git a/Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/ExceptionHandlers.java b/Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/ExceptionHandlers.java
index 600dea45f..b91000e37 100644
--- a/Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/ExceptionHandlers.java
+++ b/Java/measureeval/src/main/java/com/lantanagroup/link/measureeval/controllers/ExceptionHandlers.java
@@ -4,7 +4,7 @@
 import com.lantanagroup.link.measureeval.exceptions.ValidationException;
 import io.jsonwebtoken.security.SignatureException;
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
diff --git a/Java/pom.xml b/Java/pom.xml
index bce8f87d6..ab8e16d8f 100644
--- a/Java/pom.xml
+++ b/Java/pom.xml
@@ -20,8 +20,8 @@
     <description>Project/folder of Java modules/services for Link</description>
 
     <properties>
-        <cqf-fhir.version>3.0.0</cqf-fhir.version>
-        <hapi-fhir.version>7.0.0</hapi-fhir.version>
+        <cqf-fhir.version>3.12.0</cqf-fhir.version>
+        <hapi-fhir.version>7.4.0</hapi-fhir.version>
         <janino.version>2.6.1</janino.version>
     </properties>
 
@@ -111,6 +111,12 @@
                 <version>1.4.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>4.4</version>
+            </dependency>
+
             <dependency>
                 <groupId>ca.uhn.hapi.fhir</groupId>
                 <artifactId>hapi-fhir-bom</artifactId>