From 3f420d0854cb963e3a1c9f5c4cc801acebf57a14 Mon Sep 17 00:00:00 2001
From: sharon2719 <otiennosharon@gmail.com>
Date: Thu, 17 Oct 2024 17:27:17 +0300
Subject: [PATCH] Update current fhir version to fix failing CI

---
 efsity/build.gradle.kts                                  | 1 -
 efsity/libs.versions.toml                                | 9 +++------
 .../org/smartregister/util/FctStructureMapUtilities.java | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/efsity/build.gradle.kts b/efsity/build.gradle.kts
index b6793cd7..bf5976fb 100644
--- a/efsity/build.gradle.kts
+++ b/efsity/build.gradle.kts
@@ -77,7 +77,6 @@ dependencies {
   implementation(deps.commons.compress)
   implementation(deps.gson)
   implementation(deps.hapi.fhir.structures.r4)
-  implementation(deps.hapi.fhir.utilities)
   implementation(deps.json)
   implementation(deps.jsonschemafriend)
   implementation(deps.picocli)
diff --git a/efsity/libs.versions.toml b/efsity/libs.versions.toml
index c437a9e4..d5a42d95 100644
--- a/efsity/libs.versions.toml
+++ b/efsity/libs.versions.toml
@@ -4,9 +4,8 @@ caffeine-version="2.9.3"
 common-compress-version="1.22"
 cql-version="3.3.2"
 gson-version="2.10.1"
-hapi-fhir-core-version="5.6.106"
-hapi-fhir-utilities-version="3.8.0"
-hapi-fhir-version="6.0.1"
+hapi-fhir-core-version="6.0.22"
+hapi-fhir-version="6.8.0"
 info-picocli-version="4.7.4"
 jackson-version="2.15.2"
 javafaker-version="1.0.2"
@@ -34,9 +33,7 @@ evaluator-dagger = { module = "org.opencds.cqf.cql:evaluator.dagger", version.re
 evaluator-plandefinition = { module = "org.opencds.cqf.cql:evaluator.plandefinition", version.ref = "opencds-cql-version" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson-version" }
 hapi-fhir-structures-r4 = { module = "ca.uhn.hapi.fhir:hapi-fhir-structures-r4", version.ref = "hapi-fhir-version" }
-hapi-fhir-utilities = { module = "ca.uhn.hapi.fhir:hapi-fhir-utilities", version.ref = "hapi-fhir-utilities-version" }
 org-hl7-fhir-r4 = { module = "ca.uhn.hapi.fhir:org.hl7.fhir.r4", version.ref = "hapi-fhir-core-version" }
-org-hl7-fhir-utilities = { module = "ca.uhn.hapi.fhir:org.hl7.fhir.utilities", version.ref = "hapi-fhir-core-version" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-stdlib" }
 model = { module = "info.cqframework:model", version.ref = "cql-version" }
 model-jackson = { module = "info.cqframework:model-jackson", version.ref = "cql-version" }
@@ -53,7 +50,7 @@ icu4j = { module="com.ibm.icu:icu4j", version.ref = "icu4j-version" }
 
 [bundles]
 cqf-cql = ["cql-to-elm","elm","elm-jackson","model","model-jackson"]
-hapi-fhir-core = ["org-hl7-fhir-r4","org-hl7-fhir-utilities"]
+hapi-fhir-core = ["org-hl7-fhir-r4"]
 jackson = ["jackson-annotations","jackson-core", "jackson-databind"]
 opencds = ["engine","engine-jackson","evaluator","evaluator-builder","evaluator-dagger","evaluator-plandefinition"]
 
diff --git a/efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java b/efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
index e2b4c759..d78a272a 100644
--- a/efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
+++ b/efsity/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
@@ -22,7 +22,7 @@ public class FctStructureMapUtilities {
   public FctStructureMapUtilities() throws IOException {
 
     FilesystemPackageCacheManager pcm =
-        new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
+        new FilesystemPackageCacheManager(true);
 
     // Package name manually checked from
     // https://simplifier.net/packages?Text=hl7.fhir.core&fhirVersion=All+FHIR+Versions