From 67b247567ed0cb2112bff26ac44d6b7618eed066 Mon Sep 17 00:00:00 2001 From: Justin McKelvy <60718638+Capt-Mac@users.noreply.github.com> Date: Mon, 28 Nov 2022 11:56:40 -0700 Subject: [PATCH] Release v0.9.0 (#672) * fix build issues on master and WIP hedis test fix * update hedis bundle with beneficiary instead of policyholder Co-authored-by: justin.mckelvy --- core/pom.xml | 7 +++--- .../cqf/ruler/ExampleServerDstu3IT.java | 1 + example/pom.xml | 6 ++--- external/pom.xml | 2 +- plugin/case-reporting/pom.xml | 4 ++-- plugin/cds-hooks/pom.xml | 10 ++++----- plugin/cpg/pom.xml | 6 ++--- plugin/cql/pom.xml | 5 ++--- .../org/opencds/cqf/ruler/cql/CqlConfig.java | 2 +- plugin/cr/pom.xml | 7 +++--- .../r4/provider/DataOperationProviderIT.java | 4 ++-- .../resources/BCSEHEDISMY2022-bundle.json | 18 +++++++-------- plugin/dev-tools/pom.xml | 2 +- plugin/pom.xml | 8 +++---- plugin/ra/pom.xml | 4 ++-- plugin/sdc/pom.xml | 5 ++--- plugin/security/pom.xml | 4 ++-- pom.xml | 14 +++++++----- server/pom.xml | 22 +++++++++---------- test/pom.xml | 6 ++--- 20 files changed, 69 insertions(+), 68 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index deda26882..877a61d3c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-core @@ -14,7 +13,7 @@ org.opencds.cqf.ruler cqf-ruler-external - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/core/src/test/java/org/opencds/cqf/ruler/ExampleServerDstu3IT.java b/core/src/test/java/org/opencds/cqf/ruler/ExampleServerDstu3IT.java index f4e40dd22..d4e100a47 100644 --- a/core/src/test/java/org/opencds/cqf/ruler/ExampleServerDstu3IT.java +++ b/core/src/test/java/org/opencds/cqf/ruler/ExampleServerDstu3IT.java @@ -34,6 +34,7 @@ class ExampleServerDstu3IT { @LocalServerPort private int port; + @BeforeEach void beforeEach() { ourCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER); diff --git a/example/pom.xml b/example/pom.xml index cfe13c42f..8004bb6dc 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 ../ @@ -16,7 +16,7 @@ org.opencds.cqf.ruler cqf-ruler-core - 0.9.0-SNAPSHOT + 0.9.0 org.junit.jupiter @@ -31,7 +31,7 @@ org.opencds.cqf.ruler cqf-ruler-test - 0.9.0-SNAPSHOT + 0.9.0 test diff --git a/external/pom.xml b/external/pom.xml index c0477d1da..a394def55 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-external diff --git a/plugin/case-reporting/pom.xml b/plugin/case-reporting/pom.xml index 05fe25c77..e6d2d4a42 100644 --- a/plugin/case-reporting/pom.xml +++ b/plugin/case-reporting/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-case-reporting @@ -12,7 +12,7 @@ org.opencds.cqf.ruler cqf-ruler-cql - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/plugin/cds-hooks/pom.xml b/plugin/cds-hooks/pom.xml index 4dd61d285..83841785c 100644 --- a/plugin/cds-hooks/pom.xml +++ b/plugin/cds-hooks/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-cds-hooks @@ -12,22 +12,22 @@ org.opencds.cqf.ruler cqf-ruler-cql - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-cr - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-security - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-cpg - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/plugin/cpg/pom.xml b/plugin/cpg/pom.xml index a686f81c6..21100086d 100644 --- a/plugin/cpg/pom.xml +++ b/plugin/cpg/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-cpg @@ -12,13 +12,13 @@ org.opencds.cqf.ruler cqf-ruler-cql - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-security - 0.9.0-SNAPSHOT + 0.9.0 test diff --git a/plugin/cql/pom.xml b/plugin/cql/pom.xml index d9cd175ec..9dd05f7b8 100644 --- a/plugin/cql/pom.xml +++ b/plugin/cql/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-cql diff --git a/plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java b/plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java index b81508e00..0e1a3b3fe 100644 --- a/plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java +++ b/plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java @@ -205,7 +205,7 @@ LibraryLoaderFactory libraryLoaderFactory( } return new CacheAwareLibraryLoaderDecorator( - new TranslatingLibraryLoader(modelManager, lcp, cqlTranslatorOptions), globalLibraryCache) { + new TranslatingLibraryLoader(modelManager, lcp, cqlTranslatorOptions, null), globalLibraryCache) { // TODO: This is due to a bug with the ELM annotations which prevent options // from matching the way they should @Override diff --git a/plugin/cr/pom.xml b/plugin/cr/pom.xml index 4eeb2515b..a82d6c90f 100644 --- a/plugin/cr/pom.xml +++ b/plugin/cr/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-cr @@ -28,7 +27,7 @@ org.opencds.cqf.ruler cqf-ruler-cql - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/provider/DataOperationProviderIT.java b/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/provider/DataOperationProviderIT.java index f9e3c3a3d..9d8285616 100644 --- a/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/provider/DataOperationProviderIT.java +++ b/plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/provider/DataOperationProviderIT.java @@ -136,7 +136,7 @@ void testR4LibraryFhirQueryPattern() { "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-fhirQueryPattern") .getValueAsPrimitive().getValueAsString(); assertEquals( - "Coverage?policy-holder=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591", + "Coverage?beneficiary=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591", query); } break; @@ -208,7 +208,7 @@ void testR4MeasureFhirQueryPattern() { "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-fhirQueryPattern") .getValueAsPrimitive().getValueAsString(); assertEquals( - "Coverage?policy-holder=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591", + "Coverage?beneficiary=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591", query); } break; diff --git a/plugin/cr/src/test/resources/BCSEHEDISMY2022-bundle.json b/plugin/cr/src/test/resources/BCSEHEDISMY2022-bundle.json index 979daa26f..59ac27f84 100644 --- a/plugin/cr/src/test/resources/BCSEHEDISMY2022-bundle.json +++ b/plugin/cr/src/test/resources/BCSEHEDISMY2022-bundle.json @@ -18043,7 +18043,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-7-93", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-7" }, "period": { @@ -18068,7 +18068,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-7-94", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-7" }, "period": { @@ -18093,7 +18093,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-7-95", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-7" }, "period": { @@ -18156,7 +18156,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-9-93", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-9" }, "period": { @@ -18181,7 +18181,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-9-94", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-9" }, "period": { @@ -18206,7 +18206,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-9-95", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-9" }, "period": { @@ -18269,7 +18269,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-23-93", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-23" }, "period": { @@ -18372,7 +18372,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-65-93", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-65" }, "period": { @@ -18441,7 +18441,7 @@ "resource": { "resourceType": "Coverage", "id": "Coverage-21-93", - "policyHolder": { + "beneficiary": { "reference": "Patient/Patient-21" }, "period": { diff --git a/plugin/dev-tools/pom.xml b/plugin/dev-tools/pom.xml index 222541cae..463e04498 100644 --- a/plugin/dev-tools/pom.xml +++ b/plugin/dev-tools/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-dev-tools diff --git a/plugin/pom.xml b/plugin/pom.xml index ab974aeef..de5bc5d49 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-plugin @@ -25,12 +25,12 @@ org.opencds.cqf.ruler cqf-ruler-core - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-external - 0.9.0-SNAPSHOT + 0.9.0 @@ -50,7 +50,7 @@ org.opencds.cqf.ruler cqf-ruler-test - 0.9.0-SNAPSHOT + 0.9.0 test diff --git a/plugin/ra/pom.xml b/plugin/ra/pom.xml index aa1ec019b..43a995bb7 100644 --- a/plugin/ra/pom.xml +++ b/plugin/ra/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-ra @@ -12,7 +12,7 @@ org.opencds.cqf.ruler cqf-ruler-cr - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/plugin/sdc/pom.xml b/plugin/sdc/pom.xml index 8974a4390..b3f66ea9b 100644 --- a/plugin/sdc/pom.xml +++ b/plugin/sdc/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-sdc diff --git a/plugin/security/pom.xml b/plugin/security/pom.xml index efd8703a1..fbee21a66 100644 --- a/plugin/security/pom.xml +++ b/plugin/security/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler-plugin - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-security @@ -12,7 +12,7 @@ org.opencds.cqf.ruler cqf-ruler-dev-tools - 0.9.0-SNAPSHOT + 0.9.0 test diff --git a/pom.xml b/pom.xml index 31d96948f..3f04cbdcd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 pom cqf-ruler @@ -90,9 +90,9 @@ 2.1.0-SNAPSHOT - 2.2.0 - 2.3.0-SNAPSHOT - 2.3.0-SNAPSHOT + 2.4.0 + 2.3.0 + 2.3.0 5.6.36 @@ -162,7 +162,11 @@ - + + ca.uhn.hapi.fhir + org.hl7.fhir.convertors + ${fhir_core_version} + ca.uhn.hapi.fhir hapi-fhir-testpage-overlay diff --git a/server/pom.xml b/server/pom.xml index 9abe670c3..1cb4126a1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-server @@ -63,7 +63,7 @@ org.opencds.cqf.ruler cqf-ruler-core - 0.9.0-SNAPSHOT + 0.9.0 @@ -229,37 +229,37 @@ org.opencds.cqf.ruler cqf-ruler-case-reporting - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-cds-hooks - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-cpg - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-cql - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-cr - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-dev-tools - 0.9.0-SNAPSHOT + 0.9.0 runtime @@ -267,19 +267,19 @@ org.opencds.cqf.ruler cqf-ruler-ra - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-sdc - 0.9.0-SNAPSHOT + 0.9.0 runtime org.opencds.cqf.ruler cqf-ruler-security - 0.9.0-SNAPSHOT + 0.9.0 runtime diff --git a/test/pom.xml b/test/pom.xml index 965aef042..191c60625 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.opencds.cqf.ruler cqf-ruler - 0.9.0-SNAPSHOT + 0.9.0 cqf-ruler-test @@ -102,12 +102,12 @@ org.opencds.cqf.ruler cqf-ruler-core - 0.9.0-SNAPSHOT + 0.9.0 org.opencds.cqf.ruler cqf-ruler-external - 0.9.0-SNAPSHOT + 0.9.0