From d9f3ac1c3ba53a37657258ac17c501254c2cc537 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Fri, 6 Sep 2024 14:51:05 -0400
Subject: [PATCH] Bump org.hl7.fhir.core to 6.3.23 (#6266)

* Bump org.hl7.fhir.core to 6.3.23

* Fix breaking test (check for no value and null)

* Fix typo
---
 .../resources/ca/uhn/hapi/fhir/changelog/7_6_0/changes.yaml   | 1 +
 .../ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java     | 4 ++--
 pom.xml                                                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/changes.yaml
index 0510a3e0708..7d14d84956f 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/changes.yaml
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/changes.yaml
@@ -4,6 +4,7 @@
       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.18 -&gt; 6.3.23</li>
       <li>Bower/Moment.js (hapi-fhir-testpage-overlay): 2.27.0 -&gt; 2.29.4</li>
       <li>htmlunit (Base): 3.9.0 -&gt; 3.11.0</li>
       <li>Elasticsearch (Base): 8.11.1 -&gt; 8.14.3</li>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
index d7f6f5da0b4..122caf5b490 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
@@ -588,8 +588,8 @@ public class PackageInstallerSvcImpl implements IPackageInstallerSvc {
 		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
diff --git a/pom.xml b/pom.xml
index 8aa11b301dd..a7cae721347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -948,7 +948,7 @@
 	</licenses>
 
 	<properties>
-		<fhir_core_version>6.3.18</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>