diff --git a/docs/changelog.md b/docs/changelog.md index 4025f63e08c..4b3ddc6e433 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,9 +1,14 @@ -2025 Release 4.0.16 +2026/01/08 Release 4.0.16 -- adapt test and map for (440) +- adapt test and map for (#440) - update org.hl7.fhir.core 6.7.10 (#448) -- support validating CodeableConcept in internal tx (448) +- support validating CodeableConcept in internal tx (#448) - FHIR R4 validation error with R5 extension (#424) +- Fix THO loading: Unknown code '26' in the CodeSystem 'http://terminology.hl7.org/CodeSystem/object-role' version '4.0.1' (#452) +- Remove auto install ig's (did not handle -ballot versions) +- Use hl7.terminology#7.0.1 as FHIR Java validator 6.7.10 is doing (#452) + +NOTE: Remove in your installation existing classpath entries for hl7.terminology#x.x.x in application.yaml 2025/11/03 Release 4.0.15 diff --git a/jmeter/test.http b/jmeter/test.http index 8af39482ac0..194d2ae925e 100644 --- a/jmeter/test.http +++ b/jmeter/test.http @@ -22,7 +22,7 @@ Content-Type: application/fhir+json { "attachment" : { "language" : "de-CH" -^ } + } } ] } diff --git a/matchbox-engine/src/main/java/ch/ahdis/matchbox/engine/MatchboxEngine.java b/matchbox-engine/src/main/java/ch/ahdis/matchbox/engine/MatchboxEngine.java index de564c94b04..f3df0d49072 100644 --- a/matchbox-engine/src/main/java/ch/ahdis/matchbox/engine/MatchboxEngine.java +++ b/matchbox-engine/src/main/java/ch/ahdis/matchbox/engine/MatchboxEngine.java @@ -99,8 +99,10 @@ public class MatchboxEngine extends ValidationEngine { // Current packages that are provided with Matchbox Engine - public static final String PACKAGE_R4_TERMINOLOGY = "hl7.terminology.r4#6.3.0"; - public static final String PACKAGE_R5_TERMINOLOGY = "hl7.terminology.r5#6.3.0"; + public static final String PACKAGE_R4_TERMINOLOGY = "hl7.terminology.r4#7.0.1"; + public static final String PACKAGE_R5_TERMINOLOGY = "hl7.terminology.r5#7.0.1"; + public static final String PACKAGE_R4_TERMINOLOGY63 = "hl7.terminology.r4#6.3.0"; + public static final String PACKAGE_R5_TERMINOLOGY63 = "hl7.terminology.r5#6.3.0"; public static final String PACKAGE_R4_TERMINOLOGY65 = "hl7.terminology.r4#6.5.0"; public static final String PACKAGE_R5_TERMINOLOGY65 = "hl7.terminology.r5#6.5.0"; public static final String PACKAGE_R4_UV_EXTENSIONS = "hl7.fhir.uv.extensions.r4#5.2.0"; diff --git a/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java index 02e36baf52b..8d21903c403 100644 --- a/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java +++ b/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java @@ -349,6 +349,9 @@ public int compare(T arg1, T arg2) { protected ContextUtilities cutils; private List suppressedMappings; + // matchbox patch https://github.com/ahdis/matchbox/issues/425 + private Locale locale; + protected BaseWorkerContext() throws FileNotFoundException, IOException, FHIRException { setValidationMessageLanguage(getLocale()); clock = new TimeTracker(); @@ -437,6 +440,7 @@ protected void copy(BaseWorkerContext other) { cachingAllowed = other.cachingAllowed; suppressedMappings = other.suppressedMappings; cutils.setSuppressedMappings(other.suppressedMappings); + locale = other.locale; // matchbox patch https://github.com/ahdis/matchbox/issues/425 } } @@ -613,18 +617,21 @@ public void cacheResourceFromPackage(Resource r, PackageInformation packageInfo) if (Utilities.existsInList(url, "http://hl7.org/fhir/SearchParameter/example")) { return; } - // matchbox patch for duplicate resources, see https://github.com/ahdis/matchbox/issues/227 - // org.hl7.fhir.r5.conformance.R5ExtensionsLoader.loadR5SpecialTypes(R5ExtensionsLoader.java:141) + // matchbox patch for duplicate resources, see https://github.com/ahdis/matchbox/issues/227 and issues/452 CanonicalResource ex = fetchResourceWithException(m.fhirType(), url); - if (ex.getVersion() != null && m.getVersion() != null && laterVersion(m.getVersion(), ex.getVersion())) { + boolean forceDrop = false; + if (url.startsWith("http://terminology.hl7.org/") && ex.getVersion()!=null && ex.getSourcePackage()!=null && ex.getVersion().equals(ex.getSourcePackage().getVersion()) ) { + forceDrop = true; + } + if (forceDrop || (ex.getVersion() != null && m.getVersion() != null && laterVersion(m.getVersion(), ex.getVersion()))) { logger.logDebugMessage(LogCategory.INIT, - "Note replacing old version: " + "Note replacing existing version (is older): " + formatMessage(I18nConstants.DUPLICATE_RESOURCE_, url, - m.getVersion(), ex.getVersion(), ex.fhirType())); + m.getVersion(), ex.getVersion(), ex.fhirType()) + (forceDrop ? "forced" : "")); dropResource(ex); } else { logger.logDebugMessage(LogCategory.INIT, - "Note keeping newer version: " + "Note keeping existing version (is newer): " + formatMessage(I18nConstants.DUPLICATE_RESOURCE_, url, m.getVersion(), @@ -3779,7 +3786,23 @@ public List fetchResourceVersions(Class class_, Strin } public void setLocale(Locale locale) { - super.setLocale(locale); + // matchbox patch https://github.com/ahdis/matchbox/issues/425 + if (this.locale == null) { + this.locale = locale; + super.setLocale(locale); + } else { + if (!this.locale.equals(locale)) { + this.locale = locale; + super.setLocale(locale); + if (locale != null) { + log.info("changing locale to" + locale.toLanguageTag()); + } else { + log.info("resetting locale"); + } + } + } + // END matchbox patch + if (locale == null) { return; } diff --git a/matchbox-engine/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java b/matchbox-engine/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java index 5fa33319e33..6b9a9295c04 100644 --- a/matchbox-engine/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java +++ b/matchbox-engine/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java @@ -360,9 +360,7 @@ protected InputStreamWithSrc loadFromPackageServer(String id, String version) { String packageName = id + "#" + version; switch (packageName) { case MatchboxEngine.PACKAGE_R4_TERMINOLOGY: - case MatchboxEngine.PACKAGE_R4_TERMINOLOGY65: case MatchboxEngine.PACKAGE_R5_TERMINOLOGY: - case MatchboxEngine.PACKAGE_R5_TERMINOLOGY65: case MatchboxEngine.PACKAGE_R4_UV_EXTENSIONS: case MatchboxEngine.PACKAGE_R5_UV_EXTENSIONS: ourLog.info("loading from classpath "+id); diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r4#6.3.0.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r4#6.3.0.tgz deleted file mode 100644 index 33b186924e1..00000000000 Binary files a/matchbox-engine/src/main/resources/hl7.terminology.r4#6.3.0.tgz and /dev/null differ diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r4#6.5.0.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r4#6.5.0.tgz deleted file mode 100644 index fa3894e8180..00000000000 Binary files a/matchbox-engine/src/main/resources/hl7.terminology.r4#6.5.0.tgz and /dev/null differ diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r4#7.0.1.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r4#7.0.1.tgz new file mode 100644 index 00000000000..1baec6c905b Binary files /dev/null and b/matchbox-engine/src/main/resources/hl7.terminology.r4#7.0.1.tgz differ diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r5#6.3.0.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r5#6.3.0.tgz deleted file mode 100644 index c4604d1a1fe..00000000000 Binary files a/matchbox-engine/src/main/resources/hl7.terminology.r5#6.3.0.tgz and /dev/null differ diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r5#6.5.0.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r5#6.5.0.tgz deleted file mode 100644 index 02f92aacd5f..00000000000 Binary files a/matchbox-engine/src/main/resources/hl7.terminology.r5#6.5.0.tgz and /dev/null differ diff --git a/matchbox-engine/src/main/resources/hl7.terminology.r5#7.0.1.tgz b/matchbox-engine/src/main/resources/hl7.terminology.r5#7.0.1.tgz new file mode 100644 index 00000000000..52f254b28c5 Binary files /dev/null and b/matchbox-engine/src/main/resources/hl7.terminology.r5#7.0.1.tgz differ diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/packages/IgLoaderFromJpaPackageCache.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/packages/IgLoaderFromJpaPackageCache.java index 421fd3514b6..37a53351c7c 100644 --- a/matchbox-server/src/main/java/ch/ahdis/matchbox/packages/IgLoaderFromJpaPackageCache.java +++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/packages/IgLoaderFromJpaPackageCache.java @@ -179,14 +179,19 @@ public void loadIg(List igs, Map bina switch (FhirVersionEnum.forVersionString(this.getVersion())) { case R4, R4B -> { - if (src.startsWith("hl7.terminology#6.5.0")) { + if (src.startsWith("hl7.terminology#7.0.1")) { log.info("Requesting to load '{}', loading '{}' instead'", src, PACKAGE_R4_TERMINOLOGY); + loadIg(igs, binaries, PACKAGE_R4_TERMINOLOGY, recursive); + return; + } + if (src.startsWith("hl7.terminology#6.5.0")) { + log.info("Requesting to load '{}', loading '{}' instead'", src, PACKAGE_R4_TERMINOLOGY65); loadIg(igs, binaries, PACKAGE_R4_TERMINOLOGY65, recursive); return; } if (src.startsWith("hl7.terminology#6.3.0")) { - log.info("Requesting to load '{}', loading '{}' instead'", src, PACKAGE_R4_TERMINOLOGY); - loadIg(igs, binaries, PACKAGE_R4_TERMINOLOGY, recursive); + log.info("Requesting to load '{}', loading '{}' instead'", src, PACKAGE_R4_TERMINOLOGY63); + loadIg(igs, binaries, PACKAGE_R4_TERMINOLOGY63, recursive); return; } if (src.startsWith("hl7.fhir.uv.extensions#5.2.0")) { @@ -196,14 +201,19 @@ public void loadIg(List igs, Map bina } } case R5 -> { + if (src.startsWith("hl7.terminology#7.0.1")) { + log.info("Requesting to load '{}', loading '{}' instead'", src, PACKAGE_R5_TERMINOLOGY); + loadIg(igs, binaries, PACKAGE_R5_TERMINOLOGY, recursive); + return; + } if (src.startsWith("hl7.terminology#6.5.0")) { - log.info("Requesting to load '{}', loading from classpath '{}' instead'", src, PACKAGE_R5_TERMINOLOGY); + log.info("Requesting to load '{}', loading from classpath '{}' instead'", src, PACKAGE_R5_TERMINOLOGY65); loadIg(igs, binaries, PACKAGE_R5_TERMINOLOGY65, recursive); return; } if (src.startsWith("hl7.terminology#6.3.0")) { - log.info("Requesting to load '{}', loading from classpath '{}' instead'", src, PACKAGE_R5_TERMINOLOGY); - loadIg(igs, binaries, PACKAGE_R5_TERMINOLOGY, recursive); + log.info("Requesting to load '{}', loading from classpath '{}' instead'", src, PACKAGE_R5_TERMINOLOGY63); + loadIg(igs, binaries, PACKAGE_R5_TERMINOLOGY63, recursive); return; } if (src.startsWith("hl7.fhir.uv.extensions#5.2.0")) { diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/validation/ValidationProvider.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/validation/ValidationProvider.java index fa6ada35e7a..ae84be359ab 100644 --- a/matchbox-server/src/main/java/ch/ahdis/matchbox/validation/ValidationProvider.java +++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/validation/ValidationProvider.java @@ -166,11 +166,6 @@ public IBaseResource validate(final HttpServletRequest theRequest) { } } - // Check if the IG should be auto-installed - if (!cliContext.isHttpReadOnly()) { - this.ensureIgIsInstalled(theRequest.getParameter("ig"), theRequest.getParameter("profile")); - } - if (theRequest.getParameter("profile") == null) { return this.getOoForError("The 'profile' parameter must be provided"); } @@ -389,89 +384,6 @@ private IBaseResource getOoForError(final @NonNull String message) { return VersionConvertorFactory_40_50.convertResource(oo); } - private void ensureIgIsInstalled(@Nullable final String ig, - final String profile) { - if (ig != null) { - // Easy case, the IG is known - final var parts = ig.split("#"); - if (!this.igProvider.has(parts[0], parts[1])) { - log.debug("Auto-installing the IG '{}' version '{}'", parts[0], parts[1]); - this.igProvider.installFromInternetRegistry(parts[0], parts[1]); - } - return; - } - - if (profile.startsWith("http://hl7.org/fhir/")) { - log.debug("Profile '{}' is a core FHIR profile, no need to install an IG", profile); - return; - } - - // Harder case, only the profile is known - final var parts = profile.split("\\|"); - final String canonical; - final String version; - if (parts.length == 2) { - final Boolean found = new TransactionTemplate(this.myTxManager) - .execute(tx -> this.myPackageVersionResourceDao.getPackageVersionByCanonicalAndVersion(parts[0], parts[1]).isPresent()); - if (found != null && found) { - // The profile was found in the database, the IG is installed - return; - } - canonical = parts[0]; - version = parts[1]; - } else { - canonical = profile; - version = null; - } - - // The profile was not found in the database, we need to search for the IG that contains it - final var gson = new Gson(); - final var igSearchUrl = - "https://packages.simplifier.net/catalog?canonical=%s&prerelease=false".formatted(URLEncoder.encode(canonical, StandardCharsets.UTF_8)); - final SimplifierPackage[] packages; - try (final CloseableHttpClient httpclient = HttpClients.createDefault()) { - final var httpget = new HttpGet(igSearchUrl); - packages = httpclient.execute(httpget, response -> - gson.fromJson(new InputStreamReader(response.getEntity().getContent()), SimplifierPackage[].class)); - } catch (final Exception e) { - log.error("Error while searching for IGs", e); - return; - } - - if (packages == null || packages.length == 0) { - return; - } - log.debug("Found {} IGs for profile '{}', checking the first one ('{}')", packages.length, profile, - packages[0].getName()); - if (version != null) { - // This might not be always true, but it's a good heuristic: let's use the profile version as the IG version - this.igProvider.installFromInternetRegistry(packages[0].getName(), version); - return; - } - // We have to search for the latest profile version - final var versionSearchUrl = "https://packages.simplifier.net/" + packages[0].getName(); - final SimplifierPackageVersionsObject versionsObject; - try (final CloseableHttpClient httpclient = HttpClients.createDefault()) { - final var httpget = new HttpGet(versionSearchUrl); - versionsObject = httpclient.execute(httpget, response -> - gson.fromJson(new InputStreamReader(response.getEntity().getContent()), SimplifierPackageVersionsObject.class)); - } catch (final Exception e) { - log.error("Error while searching for IG versions", e); - return; - } - - if (versionsObject == null || versionsObject.getVersions() == null || versionsObject.getVersions().isEmpty()) { - return; - } - - final var latestVersion = versionsObject.getVersions().keySet().toArray()[ versionsObject.getVersions().size()-1].toString(); - try { - this.igProvider.installFromInternetRegistry(packages[0].getName(), latestVersion); - } catch (final Exception e) { - log.error("Error while installing IG version", e); - } - } - public static List doValidate(final MatchboxEngine engine, String content, final EncodingEnum encoding, diff --git a/matchbox-server/src/main/resources/application.yaml b/matchbox-server/src/main/resources/application.yaml index befbf90cd69..ccb1363d9bc 100644 --- a/matchbox-server/src/main/resources/application.yaml +++ b/matchbox-server/src/main/resources/application.yaml @@ -73,14 +73,6 @@ hapi: # name: hl7.fhir.r4.core # version: 4.0.1 # url: classpath:/hl7.fhir.r4.core.tgz - # fhir_extensions: - # name: hl7.fhir.uv.extensions.r4 - # version: 5.2.0 - # url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - # fhir_terminology: - # name: hl7.terminology.r4 - # version: 6.3.0 - # url: classpath:/hl7.terminology.r4#6.3.0.tgz # ch-core: # name: ch.fhir.ig.ch-core # version: 4.0.0-ballot diff --git a/matchbox-server/src/test/resources/application-test-r4.yaml b/matchbox-server/src/test/resources/application-test-r4.yaml index 3de6adc931b..3615264b30a 100644 --- a/matchbox-server/src/test/resources/application-test-r4.yaml +++ b/matchbox-server/src/test/resources/application-test-r4.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.5.0 - url: classpath:/hl7.terminology.r4#6.5.0.tgz matchbox_health_test_ig_r4: name: matchbox.health.test.ig.r4 version: 0.2.0 diff --git a/matchbox-server/src/test/resources/application-test-r5onr4.yaml b/matchbox-server/src/test/resources/application-test-r5onr4.yaml index c9b2645c314..8c4778f7476 100644 --- a/matchbox-server/src/test/resources/application-test-r5onr4.yaml +++ b/matchbox-server/src/test/resources/application-test-r5onr4.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.5.0 - url: classpath:/hl7.terminology.r4#6.5.0.tgz fhir_r5_core: name: hl7.fhir.r5.core version: 5.0.0 diff --git a/matchbox-server/with-alis/application.yaml b/matchbox-server/with-alis/application.yaml index b9eb5f5879b..f394c7524c2 100644 --- a/matchbox-server/with-alis/application.yaml +++ b/matchbox-server/with-alis/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz hl7_fhir_uv_ips: name: ch.fhir.ig.ch-alis version: 0.3.0-draft diff --git a/matchbox-server/with-ans/application.yaml b/matchbox-server/with-ans/application.yaml index 9be48fbef4c..622839e3abb 100644 --- a/matchbox-server/with-ans/application.yaml +++ b/matchbox-server/with-ans/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz ans_fr_tddui: name: ans.fhir.fr.tddui version: 2.1.0-ballot diff --git a/matchbox-server/with-ca/application.yaml b/matchbox-server/with-ca/application.yaml index 0a08d58a485..ae4c5bd8091 100644 --- a/matchbox-server/with-ca/application.yaml +++ b/matchbox-server/with-ca/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz cda: name: ca.infoway.io.psca version: 2.0.0-DFT-Ballot diff --git a/matchbox-server/with-cda-r5/application.yaml b/matchbox-server/with-cda-r5/application.yaml index 8ae4cfb84c4..23f87f3675c 100644 --- a/matchbox-server/with-cda-r5/application.yaml +++ b/matchbox-server/with-cda-r5/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r5.core version: 5.0.0 url: classpath:/hl7.fhir.r5.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r5 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r5#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r5 - version: 6.3.0 - url: classpath:/hl7.terminology.r5#6.3.0.tgz cda: name: hl7.cda.uv.core version: 2.0.1-sd-202510-matchbox-patch diff --git a/matchbox-server/with-cda/application.yaml b/matchbox-server/with-cda/application.yaml index 37b541cb069..9ff1fa75fde 100644 --- a/matchbox-server/with-cda/application.yaml +++ b/matchbox-server/with-cda/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz cda: name: hl7.cda.uv.core version: 2.0.1-sd-202510-matchbox-patch diff --git a/matchbox-server/with-ch/application.yaml b/matchbox-server/with-ch/application.yaml index a93577bbed0..bc1949291d9 100644 --- a/matchbox-server/with-ch/application.yaml +++ b/matchbox-server/with-ch/application.yaml @@ -13,7 +13,9 @@ hapi: ch-core: name: ch.fhir.ig.ch-core version: 6.0.0 - url: https://fhir.ch/ig/ch-core/package.tgz + ch-epr-fhir: + name: ch.fhir.ig.ch-epr-fhir + version: 5.0.0 matchbox: fhir: context: diff --git a/matchbox-server/with-elm/application.yaml b/matchbox-server/with-elm/application.yaml index ccff030f124..0def2022b2c 100644 --- a/matchbox-server/with-elm/application.yaml +++ b/matchbox-server/with-elm/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz ch_elm: name: ch.fhir.ig.ch-elm version: 1.11.0 diff --git a/matchbox-server/with-eprik/application.yaml b/matchbox-server/with-eprik/application.yaml index b26d51537a2..ab8c9933df9 100644 --- a/matchbox-server/with-eprik/application.yaml +++ b/matchbox-server/with-eprik/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz hl7_fhir_uv_ips: name: hl7.fhir.uv.ips version: current diff --git a/matchbox-server/with-eu/application.yaml b/matchbox-server/with-eu/application.yaml index 6e618163799..4f54bb7c42f 100644 --- a/matchbox-server/with-eu/application.yaml +++ b/matchbox-server/with-eu/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz ch-emed: name: ch.fhir.ig.ch-vacd version: 3.0.0 diff --git a/matchbox-server/with-fr/application.yaml b/matchbox-server/with-fr/application.yaml index 2fb1142a075..c5c36b20236 100644 --- a/matchbox-server/with-fr/application.yaml +++ b/matchbox-server/with-fr/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz matchbox: fhir: context: diff --git a/matchbox-server/with-gazelle/application.yaml b/matchbox-server/with-gazelle/application.yaml index 9c9fb3447fa..02801567298 100644 --- a/matchbox-server/with-gazelle/application.yaml +++ b/matchbox-server/with-gazelle/application.yaml @@ -41,14 +41,6 @@ hapi: #name: hl7.terminology #version: 5.4.0 #url: classpath:/hl7.terminology#5.4.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz ips: name: hl7.fhir.uv.ips version: 1.1.0 diff --git a/matchbox-server/with-ips/application.yaml b/matchbox-server/with-ips/application.yaml index e673bde5084..884b1655542 100644 --- a/matchbox-server/with-ips/application.yaml +++ b/matchbox-server/with-ips/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz ips: name: hl7.fhir.uv.ips version: 1.1.0 diff --git a/matchbox-server/with-it/application.yaml b/matchbox-server/with-it/application.yaml index 794a5248775..3321b7e2207 100644 --- a/matchbox-server/with-it/application.yaml +++ b/matchbox-server/with-it/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz fhir_it: name: pntitalia.fhir.r4.draft version: 0.0.1 diff --git a/matchbox-server/with-oneengine/application.yaml b/matchbox-server/with-oneengine/application.yaml index ae21c2e38be..742c1859d12 100644 --- a/matchbox-server/with-oneengine/application.yaml +++ b/matchbox-server/with-oneengine/application.yaml @@ -23,14 +23,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz matchbox: fhir: context: diff --git a/matchbox-server/with-settings/application.yaml b/matchbox-server/with-settings/application.yaml index 6e618163799..4f54bb7c42f 100644 --- a/matchbox-server/with-settings/application.yaml +++ b/matchbox-server/with-settings/application.yaml @@ -10,14 +10,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz ch-emed: name: ch.fhir.ig.ch-vacd version: 3.0.0 diff --git a/matchbox-server/with-who/application.yaml b/matchbox-server/with-who/application.yaml index 9443c168102..ed784a14306 100644 --- a/matchbox-server/with-who/application.yaml +++ b/matchbox-server/with-who/application.yaml @@ -9,14 +9,6 @@ hapi: name: hl7.fhir.r4.core version: 4.0.1 url: classpath:/hl7.fhir.r4.core.tgz - fhir_extensions: - name: hl7.fhir.uv.extensions.r4 - version: 5.2.0 - url: classpath:/hl7.fhir.uv.extensions.r4#5.2.0.tgz - fhir_terminology: - name: hl7.terminology.r4 - version: 6.3.0 - url: classpath:/hl7.terminology.r4#6.3.0.tgz fhir_it: name: fhir.worldhealthorganization.smart-ot version: 0.2.1