From 8bd261c32184b31eccde1f4dda60bd5cbf29ae9a Mon Sep 17 00:00:00 2001
From: Taha <TahaAttari@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:10:06 -0400
Subject: [PATCH] Bump jpa server and HAPI (#793)

* pull subscription settings out of storage

* undo push to server starter

* update git submodule to latest branch

* update to latest latest

---------

Co-authored-by: taha.attari@smilecdr.com <taha.attari@smilecdr.com>
---
 .gitmodules                          | 2 +-
 external/hapi-fhir-jpaserver-starter | 2 +-
 pom.xml                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 14a2cbf65..a070da7ff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "external/hapi-fhir-jpaserver-starter"]
 	path = external/hapi-fhir-jpaserver-starter
 	url = https://github.com/hapifhir/hapi-fhir-jpaserver-starter.git
-	branch = br-cs-merged
+	branch = rel_7_5_tracking
diff --git a/external/hapi-fhir-jpaserver-starter b/external/hapi-fhir-jpaserver-starter
index efcea5cf9..a45ca7a49 160000
--- a/external/hapi-fhir-jpaserver-starter
+++ b/external/hapi-fhir-jpaserver-starter
@@ -1 +1 @@
-Subproject commit efcea5cf9118cfcd4de3061a9a4fbefca0bb3fe8
+Subproject commit a45ca7a493777aee46cff53ed77ff46991dc6abc
diff --git a/pom.xml b/pom.xml
index 752419b6d..a45b5131d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
 
 		<!-- Dependency Versions -->
 		<flexmark_version>0.62.2</flexmark_version>
-		<hapi_version>7.2.0</hapi_version>
+		<hapi_version>7.4.2</hapi_version>
 		<jetty_version>12.0.0.alpha3</jetty_version>
 		<junit_version>5.8.2</junit_version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>