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: [email protected] <[email protected]>
cqframework · Sep 30, 2024 · 8bd261c · 8bd261c
1 parent 3d88881
commit 8bd261c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
diff --git 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>