Upgrade core library dependency version

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ValidateTest.java

@@ -625,7 +625,7 @@ public class FhirResourceDaoR4ValidateTest extends BaseJpaR4Test {
 			"  },\n" +
 			"  \"text\": {\n" +
 			"    \"status\": \"generated\",\n" +
-			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"></div>\"\n" +
+			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\">HELLO</div>\"\n" +
 			"  },\n" +
 			"  \"url\": \"https://foo/bb\",\n" +
 			"  \"name\": \"BBBehaviourType\",\n" +

hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java

@@ -33,6 +33,7 @@ import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent;
 import org.hl7.fhir.r5.terminologies.ValueSetExpander;
 import org.hl7.fhir.r5.utils.IResourceValidator;
 import org.hl7.fhir.utilities.TranslationServices;
+import org.hl7.fhir.utilities.cache.BasePackageCacheManager;
 import org.hl7.fhir.utilities.cache.NpmPackage;
 import org.hl7.fhir.utilities.i18n.I18nBase;
 import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
@@ -171,6 +172,11 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext
 		return validateCode(theOptions, system, code, display, theVs);
 	}
 
+	@Override
+	public void validateCodeBatch(ValidationOptions options, List<? extends CodingValidationRequest> codes, ValueSet vs) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public ValidationResult validateCode(ValidationOptions theOptions, String theSystem, String theCode, String theDisplay) {
 		IValidationSupport.CodeValidationResult result = myValidationSupport.validateCode(new ValidationSupportContext(myValidationSupport), convertConceptValidationOptions(theOptions), theSystem, theCode, theDisplay, null);
@@ -406,7 +412,17 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext
 	}
 
 	@Override
-	public void loadFromPackage(NpmPackage pi, IContextResourceLoader loader, String[] types) throws FHIRException {
+	public int loadFromPackage(NpmPackage pi, IContextResourceLoader loader) throws FHIRException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int loadFromPackage(NpmPackage pi, IContextResourceLoader loader, String[] types) throws FHIRException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int loadFromPackageAndDependencies(NpmPackage pi, IContextResourceLoader loader, BasePackageCacheManager pcm) throws FHIRException {
 		throw new UnsupportedOperationException();
 	}
 

hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java

@@ -29,6 +29,7 @@ import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.terminologies.ValueSetExpander;
 import org.hl7.fhir.r5.utils.IResourceValidator;
 import org.hl7.fhir.utilities.TranslationServices;
+import org.hl7.fhir.utilities.cache.BasePackageCacheManager;
 import org.hl7.fhir.utilities.cache.NpmPackage;
 import org.hl7.fhir.utilities.i18n.I18nBase;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
@@ -56,8 +57,8 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
 	private static final FhirContext ourR5Context = FhirContext.forR5();
 	private final ValidationSupportContext myValidationSupportContext;
 	private final IVersionTypeConverter myModelConverter;
-	private volatile List<StructureDefinition> myAllStructures;
 	private final LoadingCache<ResourceKey, IBaseResource> myFetchResourceCache;
+	private volatile List<StructureDefinition> myAllStructures;
 	private org.hl7.fhir.r5.model.Parameters myExpansionProfile;
 
 	public VersionSpecificWorkerContextWrapper(ValidationSupportContext theValidationSupportContext, IVersionTypeConverter theModelConverter) {
@@ -122,8 +123,18 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
 	}
 
 	@Override
-	public void loadFromPackage(NpmPackage pi, IContextResourceLoader loader, String[] types) throws FHIRException {
+	public int loadFromPackage(NpmPackage pi, IContextResourceLoader loader) throws FileNotFoundException, IOException, FHIRException {
+		throw new UnsupportedOperationException();
+	}
 
+	@Override
+	public int loadFromPackage(NpmPackage pi, IContextResourceLoader loader, String[] types) throws FHIRException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int loadFromPackageAndDependencies(NpmPackage pi, IContextResourceLoader loader, BasePackageCacheManager pcm) throws FileNotFoundException, IOException, FHIRException {
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
@@ -529,6 +540,14 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
 		return doValidation(convertedVs, validationOptions, system, code, display);
 	}
 
+	@Override
+	public void validateCodeBatch(ValidationOptions options, List<? extends CodingValidationRequest> codes, ValueSet vs) {
+		for (CodingValidationRequest next : codes) {
+			ValidationResult outcome = validateCode(options, next.getCoding(), vs);
+			next.setResult(outcome);
+		}
+	}
+
 	@Nonnull
 	private ValidationResult doValidation(IBaseResource theValueSet, ConceptValidationOptions theValidationOptions, String theSystem, String theCode, String theDisplay) {
 		IValidationSupport.CodeValidationResult result;

hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java

@@ -643,6 +643,9 @@ public class FhirInstanceValidatorDstu3Test {
 					ourLog.info("Skipping logical type: {}", next.getId());
 					continue;
 				}
+				if (sd.getUrl().equals("http://hl7.org/fhir/StructureDefinition/Resource")) {
+					continue;
+				}
 			}
 
 			ourLog.info("Validating {}", next.getId());
@@ -762,7 +765,7 @@ public class FhirInstanceValidatorDstu3Test {
 		Patient resource = loadResource("/dstu3/nl/nl-core-patient-01.json", Patient.class);
 		ValidationResult results = myVal.validateWithResult(resource);
 		List<SingleValidationMessage> outcome = logResultsAndReturnNonInformationalOnes(results);
-		assertThat(outcome.toString(), containsString("The Coding provided is not in the value set http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.20.5.1--20171231000000"));
+		assertThat(outcome.toString(), containsString("The Coding provided (urn:oid:2.16.840.1.113883.2.4.4.16.34#6030) is not in the value set http://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.40.2.20.5.1--20171231000000"));
 	}
 
 	private void loadNL() throws IOException {

hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java

@@ -826,7 +826,7 @@ public class FhirInstanceValidatorR4Test extends BaseTest {
 			"  \"resourceType\":\"Patient\"," +
 			"  \"text\": {\n" +
 			"    \"status\": \"generated\",\n" +
-			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"> </div>\"\n" +
+			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\">HELLO</div>\"\n" +
 			"  },\n" +
 			"  \"id\":\"123\"" +
 			"}";
@@ -842,7 +842,7 @@ public class FhirInstanceValidatorR4Test extends BaseTest {
 				"\"resourceType\":\"Patient\"," +
 				"  \"text\": {\n" +
 				"    \"status\": \"generated\",\n" +
-				"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"> </div>\"\n" +
+				"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\">HELLO</div>\"\n" +
 				"  },\n" +
 				"\"id\":\"123\"," +
 				"\"foo\":\"123\"" +

hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/FhirInstanceValidatorR5Test.java

@@ -451,7 +451,7 @@ public class FhirInstanceValidatorR5Test {
 			"  \"resourceType\":\"Patient\"," +
 			"  \"text\": {\n" +
 			"    \"status\": \"generated\",\n" +
-			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"> </div>\"\n" +
+			"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\">HELLO</div>\"\n" +
 			"  },\n" +
 			"  \"id\":\"123\"" +
 			"}";
@@ -467,7 +467,7 @@ public class FhirInstanceValidatorR5Test {
 				"\"resourceType\":\"Patient\"," +
 				"  \"text\": {\n" +
 				"    \"status\": \"generated\",\n" +
-				"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"> </div>\"\n" +
+				"    \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\">HELLO</div>\"\n" +
 				"  },\n" +
 				"\"id\":\"123\"," +
 				"\"foo\":\"123\"" +

hapi-fhir-validation/src/test/resources/bug872-ext-with-hl7-url.json

@@ -2,7 +2,7 @@
 	"resourceType": "Patient",
 	"text": {
 		"status": "generated",
-		"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"> </div>"
+		"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">HELLO</div>"
 	},
 	"extension": [
 		{

pom.xml

@@ -678,7 +678,7 @@
 
 	<properties>
 
-		<fhir_core_version>5.0.9</fhir_core_version>
+		<fhir_core_version>5.0.22</fhir_core_version>
 		<ucum_version>1.0.2</ucum_version>
 
 		<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>