From 6cf5ffb5598fc5bf284f7389a738c31c02d2701d Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Fri, 14 Jun 2024 21:32:55 +0200 Subject: [PATCH] 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}