From f971db6e86c266bb1b004f3fb16e5a21550d8649 Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Fri, 24 May 2024 21:09:57 +0200 Subject: [PATCH 01/16] Updated Java Minimum version to 17 (#686) --- Dockerfile | 8 ++++---- pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f03d4c0b1c..15c49515b86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM docker.io/library/maven:3.9.4-eclipse-temurin-17 AS build-hapi +FROM docker.io/library/maven:3.9.6-eclipse-temurin-17 AS build-hapi WORKDIR /tmp/hapi-fhir-jpaserver-starter -ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.31.0 +ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3 RUN curl -LSsO https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar COPY pom.xml . @@ -18,7 +18,7 @@ RUN mkdir /app && cp /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /app/main. ########### bitnami tomcat version is suitable for debugging and comes with a shell ########### it can be built using eg. `docker build --target tomcat .` -FROM bitnami/tomcat:9.0 AS tomcat +FROM bitnami/tomcat:10.1 AS tomcat RUN rm -rf /opt/bitnami/tomcat/webapps/ROOT && \ mkdir -p /opt/bitnami/hapi/data/hapi/lucenefiles && \ @@ -36,7 +36,7 @@ COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/opente ENV ALLOW_EMPTY_PASSWORD=yes ########### distroless brings focus on security and runs on plain spring boot - this is the default image -FROM gcr.io/distroless/java17-debian11:nonroot AS default +FROM gcr.io/distroless/java17-debian12:nonroot AS default # 65532 is the nonroot user's uid # used here instead of the name to allow Kubernetes to easily detect that the container # is running as a non-root (uid != 0) user. diff --git a/pom.xml b/pom.xml index 6b414afd4ee..e5d48ecb91e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ war - 11 + 17 @@ -393,7 +393,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 From b112ccdde4a2e88977ae959889218ed7bb9d92be Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 6 Jun 2024 14:57:38 +0200 Subject: [PATCH 02/16] fix: modified README.md to skip Tests in spring-boot:run command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71135e8fcc2..0b29933d7c3 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,7 @@ Server will then be accessible at http://localhost:8080/ and eg. http://localhos ### Using Spring Boot ```bash -mvn clean package spring-boot:repackage -Pboot && java -jar target/ROOT.war +mvn clean package spring-boot:repackage -DskipTests=true -Pboot && java -jar target/ROOT.war ``` Server will then be accessible at http://localhost:8080/ and eg. http://localhost:8080/fhir/metadata. Remember to adjust your overlay configuration in the application.yaml to the following: From fe18cce023af46f75e47599fe4f3ef1091555767 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 11:56:31 -0500 Subject: [PATCH 03/16] enable mass ingestion mode --- src/main/resources/application.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d7dcaf14891..1cb74c59f8e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,6 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false + # mass_ingestion_mode: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From cc51fa608208e20e3aee6a1590130de35cabe306 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:00:26 -0500 Subject: [PATCH 04/16] enable mass ingestion mode --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index eb156995df4..b9720d938da 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -37,6 +37,7 @@ public class AppProperties { private Boolean allow_multiple_delete = false; private Boolean allow_override_default_search_params = true; private Boolean auto_create_placeholder_reference_targets = false; + private Boolean enable_mass_ingestion_mode = false; private final Set auto_version_reference_at_paths = new HashSet<>(); private Boolean language_search_parameter_enabled = false; private Boolean dao_scheduling_enabled = true; @@ -328,6 +329,10 @@ public Boolean getAuto_create_placeholder_reference_targets() { return auto_create_placeholder_reference_targets; } + public Boolean getEnable_mass_ingestion_mode() { + return enable_mass_ingestion_mode; + } + public void setAuto_create_placeholder_reference_targets( Boolean auto_create_placeholder_reference_targets) { this.auto_create_placeholder_reference_targets = auto_create_placeholder_reference_targets; @@ -913,4 +918,4 @@ public Boolean getResource_dbhistory_enabled() { public void setResource_dbhistory_enabled(Boolean resource_dbhistory_enabled) { this.resource_dbhistory_enabled = resource_dbhistory_enabled; } -} \ No newline at end of file +} From 2239fe5b4586212d8fb3957eed5e82bb0e586b1e Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:02:05 -0500 Subject: [PATCH 05/16] enable mass ingestion mode --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java index 10ea4a6b886..14318f6ecc1 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java @@ -100,6 +100,8 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { : StorageSettings.IndexEnabledEnum.DISABLED); jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); + jpaStorageSettings.setEnableMassIngestionMode( + appProperties.getEnable_mass_ingestion_mode()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( appProperties.getEnforce_referential_integrity_on_write()); From 7ef0e0614d3f1f199a5150c8dd6eb77b244cdf75 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 12:03:03 -0500 Subject: [PATCH 06/16] typo --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 1cb74c59f8e..48feebc6c3c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,7 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false - # mass_ingestion_mode: false + # enable_mass_ingestion_mode: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From d4db8fbb1b1b1dd8959ff606f2595a61c89bd224 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Wed, 12 Jun 2024 14:16:17 -0500 Subject: [PATCH 07/16] fix: forgot to include a setter with my getter --- .../java/ca/uhn/fhir/jpa/starter/AppProperties.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index b9720d938da..8a59e2f92d8 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -325,14 +325,18 @@ public void setAllow_override_default_search_params( this.allow_override_default_search_params = allow_override_default_search_params; } - public Boolean getAuto_create_placeholder_reference_targets() { - return auto_create_placeholder_reference_targets; - } - public Boolean getEnable_mass_ingestion_mode() { return enable_mass_ingestion_mode; } + public void setEnable_mass_ingestion_mode(Boolean enable_mass_ingestion_mode) { + this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; + } + + public Boolean getAuto_create_placeholder_reference_targets() { + return auto_create_placeholder_reference_targets; + } + public void setAuto_create_placeholder_reference_targets( Boolean auto_create_placeholder_reference_targets) { this.auto_create_placeholder_reference_targets = auto_create_placeholder_reference_targets; From 056c9a16b2cd25fbe4130c57dcec44ca10fed913 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Thu, 13 Jun 2024 16:01:53 -0500 Subject: [PATCH 08/16] fix: use the correct function name --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java index 14318f6ecc1..e7b1d753e39 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java @@ -100,7 +100,7 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { : StorageSettings.IndexEnabledEnum.DISABLED); jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); - jpaStorageSettings.setEnableMassIngestionMode( + jpaStorageSettings.setMassIngestionMode( appProperties.getEnable_mass_ingestion_mode()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( From 40411f6fb825f2386b7c059fa08e3378e714e66f Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:17:06 -0500 Subject: [PATCH 09/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index 8a59e2f92d8..c8b6bd5fdee 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -37,7 +37,7 @@ public class AppProperties { private Boolean allow_multiple_delete = false; private Boolean allow_override_default_search_params = true; private Boolean auto_create_placeholder_reference_targets = false; - private Boolean enable_mass_ingestion_mode = false; + private Boolean mass_ingestion_mode_enabled = false; private final Set auto_version_reference_at_paths = new HashSet<>(); private Boolean language_search_parameter_enabled = false; private Boolean dao_scheduling_enabled = true; From 37c26a464a9baf3c2bdca02802c24de62ba100f3 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:17:35 -0500 Subject: [PATCH 10/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index c8b6bd5fdee..c465cba13bd 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -325,7 +325,7 @@ public void setAllow_override_default_search_params( this.allow_override_default_search_params = allow_override_default_search_params; } - public Boolean getEnable_mass_ingestion_mode() { + public Boolean getMass_ingestion_mode_enabled() { return enable_mass_ingestion_mode; } From 9a02b132855b4e8990f59f92ba85762d7a565797 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:01 -0500 Subject: [PATCH 11/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index c465cba13bd..a351f9d1e6a 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -329,7 +329,7 @@ public Boolean getMass_ingestion_mode_enabled() { return enable_mass_ingestion_mode; } - public void setEnable_mass_ingestion_mode(Boolean enable_mass_ingestion_mode) { + public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; } From ce0df03aac4097db320b48c60d28cf681f7878b2 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:17 -0500 Subject: [PATCH 12/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index a351f9d1e6a..0951b646bf6 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -326,7 +326,7 @@ public void setAllow_override_default_search_params( } public Boolean getMass_ingestion_mode_enabled() { - return enable_mass_ingestion_mode; + return mass_ingestion_mode_enabled; } public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { From 74344279e2b93ee461a5a59bc62f902fc61ec9ef Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:35 -0500 Subject: [PATCH 13/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java index 0951b646bf6..0f63df44ae5 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java @@ -330,7 +330,7 @@ public Boolean getMass_ingestion_mode_enabled() { } public void setMass_ingestion_mode_enabled(Boolean mass_ingestion_mode_enabled) { - this.enable_mass_ingestion_mode = enable_mass_ingestion_mode; + this.mass_ingestion_mode_enabled = mass_ingestion_mode_enabled; } public Boolean getAuto_create_placeholder_reference_targets() { From 0d8642ddfa95483ec457be1d6c74605b27837fe7 Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:18:52 -0500 Subject: [PATCH 14/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 48feebc6c3c..5b2a868e500 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -116,7 +116,7 @@ hapi: # allow_multiple_delete: true # allow_override_default_search_params: true # auto_create_placeholder_reference_targets: false - # enable_mass_ingestion_mode: false + # mass_ingestion_mode_enabled: false ### tells the server to automatically append the current version of the target resource to references at these paths # auto_version_reference_at_paths: Device.patient, Device.location, Device.parent, DeviceMetric.parent, DeviceMetric.source, Observation.device, Observation.subject # ips_enabled: false From 255031b26fe4ef6e5e745932621bfee2ede6094e Mon Sep 17 00:00:00 2001 From: Carl Anderson Date: Fri, 14 Jun 2024 11:19:09 -0500 Subject: [PATCH 15/16] fix: use the existing naming convention Co-authored-by: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> --- .../ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java index e7b1d753e39..0f15abff8e7 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java @@ -101,7 +101,7 @@ public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) { jpaStorageSettings.setAutoCreatePlaceholderReferenceTargets( appProperties.getAuto_create_placeholder_reference_targets()); jpaStorageSettings.setMassIngestionMode( - appProperties.getEnable_mass_ingestion_mode()); + appProperties.getMass_ingestion_mode_enabled()); jpaStorageSettings.setAutoVersionReferenceAtPaths(appProperties.getAuto_version_reference_at_paths()); jpaStorageSettings.setEnforceReferentialIntegrityOnWrite( appProperties.getEnforce_referential_integrity_on_write()); From 6cf5ffb5598fc5bf284f7389a738c31c02d2701d Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Fri, 14 Jun 2024 21:32:55 +0200 Subject: [PATCH 16/16] Updated parent to FHIR 7.2.1 (#695) * Updated parent to FHIR 7.2.1 * Updated chart * Updated chart * Fixing linter issues in Helm * Fixing linter issues for Helm, updated REAMDE --- Dockerfile | 2 +- README.md | 10 ++++----- charts/hapi-fhir-jpaserver/Chart.yaml | 6 +++--- charts/hapi-fhir-jpaserver/README.md | 4 ++-- charts/hapi-fhir-jpaserver/values.yaml | 2 +- docker-compose.yml | 7 +++++- pom.xml | 30 +++++++++++++------------- src/main/resources/application.yaml | 28 ++++++++++++++++++------ 8 files changed, 55 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15c49515b86..e3a6dc89dcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/maven:3.9.6-eclipse-temurin-17 AS build-hapi +FROM docker.io/library/maven:3.9.7-eclipse-temurin-17 AS build-hapi WORKDIR /tmp/hapi-fhir-jpaserver-starter ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3 diff --git a/README.md b/README.md index 0b29933d7c3..12aa22c14cb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ In order to use this sample, you should have: - [This project](https://github.com/hapifhir/hapi-fhir-jpaserver-starter) checked out. You may wish to create a GitHub Fork of the project and check that out instead so that you can customize the project and save the results to GitHub. ### and either - - Oracle Java (JDK) installed: Minimum JDK8 or newer. + - Oracle Java (JDK) installed: Minimum JDK17 or newer. - Apache Maven build tool (newest version) ### or @@ -102,7 +102,7 @@ spring: driverClassName: org.postgresql.Driver jpa: properties: - hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect hibernate.search.enabled: false ``` @@ -155,7 +155,7 @@ spring: driverClassName: org.postgresql.Driver jpa: properties: - hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect hibernate.search.enabled: false hapi: fhir: @@ -312,7 +312,7 @@ spring: driverClassName: org.postgresql.Driver jpa: properties: - hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect hibernate.search.enabled: false # Then comment all hibernate.search.backend.* @@ -430,7 +430,7 @@ spring: driverClassName: org.postgresql.Driver jpa: properties: - hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect hibernate.search.enabled: false # Then comment all hibernate.search.backend.* diff --git a/charts/hapi-fhir-jpaserver/Chart.yaml b/charts/hapi-fhir-jpaserver/Chart.yaml index c65fe3006c2..e9909832e37 100644 --- a/charts/hapi-fhir-jpaserver/Chart.yaml +++ b/charts/hapi-fhir-jpaserver/Chart.yaml @@ -10,8 +10,8 @@ dependencies: version: 14.3.1 repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled -appVersion: 7.0.3 -version: 0.16.0 +appVersion: 7.2.0 +version: 0.17.0 annotations: artifacthub.io/license: Apache-2.0 artifacthub.io/containsSecurityUpdates: "false" @@ -24,7 +24,7 @@ annotations: # When using the list of objects option the valid supported kinds are # added, changed, deprecated, removed, fixed, and security. - kind: changed - description: updated starter image to v7.0.3 + description: updated starter image to v7.2.0 - kind: changed description: updated curlimages/curl to 8.6.0 - kind: changed diff --git a/charts/hapi-fhir-jpaserver/README.md b/charts/hapi-fhir-jpaserver/README.md index 8b42fba90cc..0f9558567f3 100644 --- a/charts/hapi-fhir-jpaserver/README.md +++ b/charts/hapi-fhir-jpaserver/README.md @@ -1,6 +1,6 @@ # HAPI FHIR JPA Server Starter Helm Chart -![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.3](https://img.shields.io/badge/AppVersion-7.0.3-informational?style=flat-square) +![Version: 0.17.0](https://img.shields.io/badge/Version-0.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.2.0](https://img.shields.io/badge/AppVersion-7.2.0-informational?style=flat-square) This helm chart will help you install the HAPI FHIR JPA Server in a Kubernetes environment. @@ -36,7 +36,7 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver | image.pullPolicy | string | `"IfNotPresent"` | image pullPolicy to use | | image.registry | string | `"docker.io"` | registry where the HAPI FHIR server image is hosted | | image.repository | string | `"hapiproject/hapi"` | the path inside the repository | -| image.tag | string | `"v7.0.3@sha256:73ff82fec42e5cbb7e66338d47af09ba91c140e98beeaee41a5459572d5ae1ce"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. | +| image.tag | string | `"v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. | | imagePullSecrets | list | `[]` | image pull secrets to use when pulling the image | | ingress.annotations | object | `{}` | provide any additional annotations which may be required. Evaluated as a template. | | ingress.enabled | bool | `false` | whether to create an Ingress to expose the FHIR server HTTP endpoint | diff --git a/charts/hapi-fhir-jpaserver/values.yaml b/charts/hapi-fhir-jpaserver/values.yaml index 5a6701541fa..98f6f143330 100644 --- a/charts/hapi-fhir-jpaserver/values.yaml +++ b/charts/hapi-fhir-jpaserver/values.yaml @@ -7,7 +7,7 @@ image: # -- the path inside the repository repository: hapiproject/hapi # -- the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. - tag: "v7.0.3@sha256:73ff82fec42e5cbb7e66338d47af09ba91c140e98beeaee41a5459572d5ae1ce" + tag: "v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b" # -- image pullPolicy to use pullPolicy: IfNotPresent diff --git a/docker-compose.yml b/docker-compose.yml index 0fe0e457bec..ab4f15ce68f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,10 +4,15 @@ services: build: . container_name: hapi-fhir-jpaserver-start restart: on-failure + environment: + SPRING_DATASOURCE_URL: "jdbc:postgresql://hapi-fhir-postgres:5432/hapi" + SPRING_DATASOURCE_USERNAME: "admin" + SPRING_DATASOURCE_PASSWORD: "admin" + SPRING_DATASOURCE_DRIVERCLASSNAME: "org.postgresql.Driver" ports: - "8080:8080" hapi-fhir-postgres: - image: postgres:13-alpine + image: postgres:14-alpine container_name: hapi-fhir-postgres restart: always environment: diff --git a/pom.xml b/pom.xml index e5d48ecb91e..646eeb74287 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.2.0 + 7.2.1 hapi-fhir-jpaserver-starter @@ -77,13 +77,13 @@ ca.uhn.hapi.fhir hapi-fhir-base - ${project.version} + ${project.parent.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-subscription - ${project.version} + ${project.parent.version} com.zaxxer @@ -96,7 +96,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - ${project.version} + ${project.parent.version} org.springframework @@ -112,13 +112,13 @@ ca.uhn.hapi.fhir hapi-fhir-storage-cr - ${project.version} + ${project.parent.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-mdm - ${project.version} + ${project.parent.version} org.springframework @@ -128,13 +128,13 @@ ca.uhn.hapi.fhir hapi-fhir-server-cds-hooks - ${project.version} + ${project.parent.version} ca.uhn.hapi.fhir hapi-fhir-server-openapi - ${project.version} + ${project.parent.version} org.yaml @@ -146,21 +146,21 @@ ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - ${project.version} + ${project.parent.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - ${project.version} + ${project.parent.version} classes ca.uhn.hapi.fhir hapi-fhir-jpaserver-ips - ${project.version} + ${project.parent.version}