Cherry pick core dependency bumps 6.3.11 -> 6.3.23

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_3/changes.yaml

@@ -0,0 +1,8 @@
+---
+- item:
+      type: "add"
+      title: "The version of a few dependencies have been bumped to more recent versions
+      (dependent HAPI modules listed in brackets):
+      <ul>
+      <li>org.hl7.fhir.core (Base): 6.3.11 -&gt; 6.3.23</li>
+      </ul>"

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java

@@ -588,8 +588,8 @@ private boolean isValidResourceStatusForPackageUpload(IBaseResource theResource)
 		if (statusTypes.isEmpty()) {
 			return true;
 		}
-		// Resource has a null status field
-		if (statusTypes.get(0).getValue() == null) {
+		// Resource has no status field, or an explicitly null one
+		if (!statusTypes.get(0).hasValue() || statusTypes.get(0).getValue() == null) {
 			return false;
 		}
 		// Resource has a status, and we need to check based on type

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

@@ -228,7 +228,7 @@ public void testValidateCodeInEnumeratedValueSetWithUnknownCodeSystem_Warning()
 		encoded = encode(oo);
 		ourLog.info(encoded);
 		assertThat(oo.getIssue()).hasSize(1);
-		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code1'", oo.getIssueFirstRep().getDiagnostics());
+		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code1' (error because this is a required binding)", oo.getIssueFirstRep().getDiagnostics());
 		assertEquals(OperationOutcome.IssueSeverity.WARNING, oo.getIssueFirstRep().getSeverity());
 
 		// Invalid code
@@ -334,7 +334,7 @@ public void testValidateCodeInNonEnumeratedValueSetWithUnknownCodeSystem_Warning
 		encoded = encode(oo);
 		ourLog.info(encoded);
 		assertThat(oo.getIssue()).hasSize(1);
-		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code1'", oo.getIssueFirstRep().getDiagnostics());
+		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code1' (error because this is a required binding)", oo.getIssueFirstRep().getDiagnostics());
 		assertEquals(OperationOutcome.IssueSeverity.WARNING, oo.getIssueFirstRep().getSeverity());
 
 		// Invalid code
@@ -343,7 +343,7 @@ public void testValidateCodeInNonEnumeratedValueSetWithUnknownCodeSystem_Warning
 		encoded = encode(oo);
 		ourLog.info(encoded);
 		assertThat(oo.getIssue()).hasSize(1);
-		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code99'", oo.getIssue().get(0).getDiagnostics());
+		assertEquals("CodeSystem is unknown and can't be validated: http://cs for 'http://cs#code99' (error because this is a required binding)", oo.getIssue().get(0).getDiagnostics());
 		assertEquals(OperationOutcome.IssueSeverity.WARNING, oo.getIssue().get(0).getSeverity());
 	}
 

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

@@ -81,4 +81,9 @@ public boolean prependLinks() {
 	public String getLinkForUrl(String corePath, String url) {
 		throw new UnsupportedOperationException(Msg.code(693));
 	}
+
+	@Override
+	public String getCanonicalForDefaultContext() {
+		return null;
+	}
 }

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

@@ -45,7 +45,7 @@ public void testValidateCustomResource() throws IOException {
 
 		assertThat(result.getMessages()).hasSize(3);
 		assertEquals("Error parsing JSON: the primitive value must be a boolean", result.getMessages().get(0).getMessage());
-		assertEquals("The property name  must be a JSON Array, not a Primitive property (at CustomResource)", result.getMessages().get(1).getMessage());
+		assertEquals("The property name must be a JSON Array, not a Primitive property (at CustomResource)", result.getMessages().get(1).getMessage());
 		assertEquals("Unrecognized property 'id1'", result.getMessages().get(2).getMessage());
 
 	}

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

@@ -464,7 +464,7 @@ public void testValidateScalarInRepeatableField() {
 		ValidationResult result = val.validateWithResult(operationDefinition);
 		List<SingleValidationMessage> all = logResultsAndReturnAll(result);
 		assertFalse(result.isSuccessful());
-		assertEquals("The property resource  must be a JSON Array, not a Primitive property (at OperationDefinition)", all.get(0).getMessage());
+		assertEquals("The property resource must be a JSON Array, not a Primitive property (at OperationDefinition)", all.get(0).getMessage());
 	}
 
 	@Test

hapi-fhir-validation/src/test/java/org/hl7/fhir/r4b/validation/FhirInstanceValidatorR4BTest.java

@@ -401,7 +401,7 @@ public void testValidateScalarInRepeatableField() {
 		ValidationResult result = val.validateWithResult(operationDefinition);
 		List<SingleValidationMessage> all = logResultsAndReturnAll(result);
 		assertFalse(result.isSuccessful());
-		assertEquals("The property resource  must be a JSON Array, not a Primitive property (at OperationDefinition)", all.get(0).getMessage());
+		assertEquals("The property resource must be a JSON Array, not a Primitive property (at OperationDefinition)", all.get(0).getMessage());
 	}
 
 	@Test

pom.xml

@@ -938,7 +938,7 @@
 	</licenses>
 
 	<properties>
-		<fhir_core_version>6.3.11</fhir_core_version>
+		<fhir_core_version>6.3.23</fhir_core_version>
 		<spotless_version>2.41.1</spotless_version>
 		<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m</surefire_jvm_args>