FI-2354: bump core library to 6.2.8 (#71)

inferno-framework · Jan 12, 2024 · cf9dbcc · cf9dbcc
1 parent 9637fb7
commit cf9dbcc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.validation", "6.0.21")
+    implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.validation", "6.2.8")
 
     // validator dependency needed for terminology (why can't it get this automatically?)
     implementation("com.squareup.okhttp3", "okhttp", "4.9.0")

diff --git a/src/main/java/org/mitre/inferno/FHIRPathEvaluator.java b/src/main/java/org/mitre/inferno/FHIRPathEvaluator.java
@@ -6,7 +6,7 @@
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r4.context.SimpleWorkerContext;
 import org.hl7.fhir.r4.model.Base;
-import org.hl7.fhir.r4.utils.FHIRPathEngine;
+import org.hl7.fhir.r4.fhirpath.FHIRPathEngine;
 
 public class FHIRPathEvaluator extends FHIRPathEngine {
 

diff --git a/src/main/java/org/mitre/inferno/Validator.java b/src/main/java/org/mitre/inferno/Validator.java
@@ -77,7 +77,7 @@ public Validator(String igDir, boolean displayIssuesAreWarnings) throws Exceptio
     // The two lines below turn off URL resolution checking in the validator. 
     // This eliminates the need to silence these errors elsewhere in Inferno
     // And also keeps contained resources from failing validation based solely on URL errors
-    ValidationControl vc = new BaseValidator(null, null, false)
+    ValidationControl vc = new BaseValidator(hl7Validator.getContext(), null, false)
                              .new ValidationControl(false, IssueSeverity.INFORMATION);
     hl7Validator.getValidationControl().put("Type_Specific_Checks_DT_URL_Resolve", vc);
 
@@ -106,7 +106,7 @@ public Validator(String igDir, boolean displayIssuesAreWarnings) throws Exceptio
     hl7Validator.setDisplayWarnings(displayIssuesAreWarnings);
     hl7Validator.prepare();
 
-    packageManager = new FilesystemPackageCacheManager(true);
+    packageManager = new FilesystemPackageCacheManager.Builder().build();
     loadedPackages = new HashMap<>();
   }
 

diff --git a/src/main/java/org/mitre/inferno/rest/Endpoints.java b/src/main/java/org/mitre/inferno/rest/Endpoints.java
@@ -168,7 +168,7 @@ private void createRoutes() {
   private static Map<String,String> buildVersionResponse() {
     // full package names used here only to make it more obvious what's going on
     // since the class names aren't distinct enough
-    String hl7ValidatorVersion = org.hl7.fhir.validation.cli.utils.VersionUtil.getVersion();
+    String hl7ValidatorVersion = org.hl7.fhir.utilities.VersionUtil.getVersion();
     String wrapperVersion = org.mitre.inferno.Version.getVersion();
 
     Map<String, String> versions = new HashMap<>();