From 7bc95ade0921129b70acad025c3a1e7247de7cf3 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 21 Dec 2019 07:07:27 +1100 Subject: [PATCH] fix to compile --- .../java/org/hl7/fhir/r5/context/SimpleWorkerContext.java | 7 ++++++- release.bat | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java index bdd3cf812..0350be3ea 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java @@ -79,6 +79,7 @@ import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; import org.hl7.fhir.utilities.validation.ValidationMessage.Source; +import ca.uhn.fhir.fluentpath.IFluentPath; import ca.uhn.fhir.parser.DataFormatException; /* @@ -165,10 +166,14 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon } public static SimpleWorkerContext fromPackage(NpmPackage pi, IContextResourceLoader loader) throws FileNotFoundException, IOException, FHIRException { + return fromPackage(pi, loader, null); + } + + public static SimpleWorkerContext fromPackage(NpmPackage pi, IContextResourceLoader loader, ILoadFilter filter) throws FileNotFoundException, IOException, FHIRException { SimpleWorkerContext res = new SimpleWorkerContext(); res.setAllowLoadingDuplicates(true); res.version = pi.getNpm().get("version").getAsString(); - res.loadFromPackage(pi, loader); + res.loadFromPackage(pi, loader, filter); return res; } diff --git a/release.bat b/release.bat index 7fc39c844..7c313bf5d 100644 --- a/release.bat +++ b/release.bat @@ -28,8 +28,6 @@ call git commit -a -m "Release new version %newver%-SNAPSHOT" call git push origin master cd ..\org.hl7.fhir.core -call mvn eclipse:eclipse - call python c:\tools\zulip-api\zulip\zulip\send.py --stream committers/notification --subject "java core" -m "New Java Core v%newver%-SNAPSHOT released. New Validator at https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=ca.uhn.hapi.fhir&a=org.hl7.fhir.validation.cli&v=%newver%-SNAPSHOT&e=jar, and also deployed at https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar" --config-file zuliprc call python c:\tools\zulip-api\zulip\zulip\send.py --stream tooling/releases --subject "Validator" -m "New Validator @ https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar (v%newver%)" --config-file zuliprc