From 7e59cf63113d02c03d96184ea466aa88bfd60149 Mon Sep 17 00:00:00 2001 From: Michael Folz Date: Tue, 10 Dec 2024 12:48:56 +0100 Subject: [PATCH 1/3] No issue - bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffeb3ca..c35542b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ de.medizininformatik-initiative DataportalBackend - 6.0.2 + 6.1.0-SNAPSHOT Dataportal Backend Backend of the Dataportal From f32dfc65fa9c786c52ff90775aabccb6e3ee8b58 Mon Sep 17 00:00:00 2001 From: Michael Folz Date: Tue, 10 Dec 2024 14:42:21 +0100 Subject: [PATCH 2/3] #412 - Switch - Ontology - get from assets - change download url for ontology files accordingly --- .github/scripts/download-and-unpack-ontology.sh | 2 +- .github/workflows/ci.yml | 4 ++-- docker-compose.yml | 6 ++---- pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/scripts/download-and-unpack-ontology.sh b/.github/scripts/download-and-unpack-ontology.sh index 3770c79..f7e8972 100755 --- a/.github/scripts/download-and-unpack-ontology.sh +++ b/.github/scripts/download-and-unpack-ontology.sh @@ -1,7 +1,7 @@ #!/bin/bash -e mkdir --parents .github/integration-test/ontology/ui_profiles .github/integration-test/ontology/migration -curl -L https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/${ONTOLOGY_GIT_TAG}/example/fdpg-ontology/backend.zip -o .github/integration-test/ontology/backend.zip +curl -L https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/${ONTOLOGY_GIT_TAG}/backend.zip -o .github/integration-test/ontology/backend.zip unzip -jod .github/integration-test/ontology/ui_profiles/ .github/integration-test/ontology/backend.zip mv .github/integration-test/ontology/ui_profiles/R__Load_latest_ui_profile.sql .github/integration-test/ontology/migration/ rm .github/integration-test/ontology/backend.zip diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 178c8fe..a8f8d7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,9 +148,9 @@ jobs: needs: tests runs-on: ubuntu-latest env: - ONTOLOGY_GIT_TAG: v3.0.0-test.11 + ONTOLOGY_GIT_TAG: v3.0.1 ELASTIC_HOST: http://localhost:9200 - ELASTIC_FILEPATH: https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/TAGPLACEHOLDER/example/fdpg-ontology/ + ELASTIC_FILEPATH: https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/TAGPLACEHOLDER/ ELASTIC_FILENAME: elastic.zip OVERRIDE_EXISTING: true diff --git a/docker-compose.yml b/docker-compose.yml index 04e1205..8b7af92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -139,12 +139,10 @@ services: environment: ES_HOST: http://dataportal-elastic ES_PORT: 9200 - ONTO_GIT_TAG: v3.0.0 - ONTO_REPO: https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/ - ONTO_RELATIVE_PATH: /example/fdpg-ontology/ + ONTO_GIT_TAG: v3.0.1 + ONTO_REPO: https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download DOWNLOAD_FILENAME: elastic.zip EXIT_ON_EXISTING_INDICES: false - FORCE_INDEX_CREATION: true volumes: dataportal-postgres-data: diff --git a/pom.xml b/pom.xml index c35542b..cc71762 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ download-single - https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/${ontology-tag}/example/fdpg-ontology + https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/${ontology-tag}/ backend.zip ${ontoDirectory.download} @@ -435,7 +435,7 @@ download-single - https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/${ontology-tag}/example/fdpg-ontology + https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/${ontology-tag}/ mapping.zip ${ontoDirectory.download} From 993ec72174ded439d5aa35ebf52800db58accebd Mon Sep 17 00:00:00 2001 From: Michael Folz Date: Tue, 10 Dec 2024 15:34:22 +0100 Subject: [PATCH 3/3] Release 6.0.3 - update changelog and pom.xml --- CHANGELOG.md | 5 +++++ pom.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a81057..94d155c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## [6.0.3] - 2024-12-10 + +### Changed +- Download path for ontology files has changed + ## [6.0.2] - 2024-12-10 ### Fixed diff --git a/pom.xml b/pom.xml index cc71762..a039975 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ de.medizininformatik-initiative DataportalBackend - 6.1.0-SNAPSHOT + 6.0.3 Dataportal Backend Backend of the Dataportal