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>
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>
+1 −1		.github/workflows/build-images.yaml
+4 −3		Dockerfile
+14 −7		README.md
+3 −3		charts/hapi-fhir-jpaserver/Chart.yaml
+2 −2		charts/hapi-fhir-jpaserver/README.md
+1 −1		charts/hapi-fhir-jpaserver/values.yaml
+6 −1		docker-compose.yml
+19 −18		pom.xml
+10 −1		src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
+0 −64		src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksProcessor.java
+10 −0		src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/StarterCdsHooksConfig.java
+12 −0		src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/UpdatedCrDiscoveryServiceR4.java
+40 −34		src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
+3 −1		src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
+1 −3		src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java
+23 −6		src/main/resources/application.yaml
+114 −13		src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
+2 −1		src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
+0 −1		src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
+2 −3		src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
+0 −22		src/test/java/ca/uhn/fhir/jpa/starter/JpaStorageSettingsConfig.java
+5 −1		src/test/java/ca/uhn/fhir/jpa/starter/MdmTest.java
+1 −0		src/test/resources/r4/opioidcds-10-order-sign-bundle.json
+1 −1		src/test/smoketest/plain_server.http