From 99461ad8f54ee595624b20d77d73f4d977615875 Mon Sep 17 00:00:00 2001 From: JP Date: Fri, 27 Sep 2024 13:47:06 -0600 Subject: [PATCH] Rev to latest CQL/HAPI (#537) --- cqf-fhir-api/pom.xml | 4 ++-- cqf-fhir-benchmark/pom.xml | 12 +++++------ cqf-fhir-bom/pom.xml | 20 +++++++++---------- cqf-fhir-cql/pom.xml | 12 +++++------ cqf-fhir-cr-cli/pom.xml | 14 ++++++------- cqf-fhir-cr-spring/pom.xml | 6 +++--- cqf-fhir-cr/pom.xml | 14 ++++++------- .../dstu3/Dstu3MeasureEvaluationTest.java | 12 +++++------ cqf-fhir-jackson/pom.xml | 4 ++-- cqf-fhir-jaxb/pom.xml | 4 ++-- cqf-fhir-test/pom.xml | 6 +++--- cqf-fhir-utility/pom.xml | 8 ++++---- docs/pom.xml | 6 +++--- pom.xml | 6 +++--- 14 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml index 9ec9e4eaf..d1f2da8af 100644 --- a/cqf-fhir-api/pom.xml +++ b/cqf-fhir-api/pom.xml @@ -5,14 +5,14 @@ org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (APIs) FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml index 305126d73..6b2c1ae9c 100644 --- a/cqf-fhir-benchmark/pom.xml +++ b/cqf-fhir-benchmark/pom.xml @@ -5,26 +5,26 @@ org.opencds.cqf.fhir cqf-fhir-benchmark - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Benchmarks) Tests validating performance of FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cr - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 org.openjdk.jmh @@ -34,14 +34,14 @@ org.opencds.cqf.fhir cqf-fhir-cr - 3.12.0-SNAPSHOT + 3.12.0 test-jar org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom test diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml index 6eda89ccf..d4db13722 100644 --- a/cqf-fhir-bom/pom.xml +++ b/cqf-fhir-bom/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-bom - 3.12.0-SNAPSHOT + 3.12.0 pom FHIR Clinical Reasoning (Bill Of Materials) This bom can be used to simplify dependency management when using this project @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 @@ -21,44 +21,44 @@ org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-utility - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cql - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom org.opencds.cqf.fhir cqf-fhir-jaxb - 3.12.0-SNAPSHOT + 3.12.0 pom org.opencds.cqf.fhir cqf-fhir-cr - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.12.0-SNAPSHOT + 3.12.0 diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml index 696b455db..74f22324d 100644 --- a/cqf-fhir-cql/pom.xml +++ b/cqf-fhir-cql/pom.xml @@ -5,26 +5,26 @@ org.opencds.cqf.fhir cqf-fhir-cql - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (CQL) Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-utility - 3.12.0-SNAPSHOT + 3.12.0 org.mockito @@ -62,13 +62,13 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 test org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom test diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml index 9ac7ad14f..5bdb2fff7 100644 --- a/cqf-fhir-cr-cli/pom.xml +++ b/cqf-fhir-cr-cli/pom.xml @@ -6,36 +6,36 @@ org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (CLI) CLI for running FHIR Clincial Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-utility - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cql - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom @@ -69,7 +69,7 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 test diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml index 20ce6eae9..257d9b180 100644 --- a/cqf-fhir-cr-spring/pom.xml +++ b/cqf-fhir-cr-spring/pom.xml @@ -7,21 +7,21 @@ org.opencds.cqf.fhir cqf-fhir-cr-spring - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Spring) Spring configurations for FHIR Clinical Reasoning org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cr - 3.12.0-SNAPSHOT + 3.12.0 org.springframework diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml index 70bf07fdf..6879a5bd9 100644 --- a/cqf-fhir-cr/pom.xml +++ b/cqf-fhir-cr/pom.xml @@ -5,45 +5,45 @@ org.opencds.cqf.fhir cqf-fhir-cr - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Operations) Implementations of clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-cql - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-utility - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom test org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 test diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureEvaluationTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureEvaluationTest.java index 110caaaee..31ebfb850 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureEvaluationTest.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureEvaluationTest.java @@ -94,7 +94,7 @@ void cohortMeasureEvaluation() throws Exception { any())) .thenReturn(Arrays.asList(patient)); - String cql = cql_with_dateTime() + sde_race() + "define InitialPopulation: 'Doe' in Patient.name.family"; + String cql = cql_with_dateTime() + sde_race() + "define InitialPopulation: 'Doe' in Patient.name.family.value"; Measure measure = cohort_measure(); @@ -124,8 +124,8 @@ void proportionMeasureEvaluation() throws Exception { .thenReturn(Arrays.asList(patient)); String cql = cql_with_dateTime() + sde_race() - + "define InitialPopulation: 'Doe' in Patient.name.family\n" - + "define Denominator: 'John' in Patient.name.given\n" + + "define InitialPopulation: 'Doe' in Patient.name.family.value\n" + + "define Denominator: 'John' in Patient.name.given.value\n" + "define Numerator: Patient.birthDate > @1970-01-01\n"; Measure measure = proportion_measure(); @@ -155,7 +155,7 @@ void continuosVariableMeasureEvaluation() throws Exception { .thenReturn(Arrays.asList(patient)); String cql = cql_with_dateTime() + sde_race() - + "define InitialPopulation: 'Doe' in Patient.name.family\n" + + "define InitialPopulation: 'Doe' in Patient.name.family.value\n" + "define MeasurePopulation: Patient.birthDate > @1970-01-01\n"; Measure measure = continuous_variable_measure(); @@ -211,8 +211,8 @@ void stratifiedMeasureEvaluation() throws Exception { .thenReturn(Arrays.asList(jane_doe())); String cql = cql_with_dateTime() + sde_race() - + "define InitialPopulation: 'Doe' in Patient.name.family\n" - + "define Denominator: 'John' in Patient.name.given\n" + + "define InitialPopulation: 'Doe' in Patient.name.family.value\n" + + "define Denominator: 'John' in Patient.name.given.value\n" + "define Numerator: Patient.birthDate > @1970-01-01\n" + "define Gender: Patient.gender\n"; Measure measure = stratified_measure(); diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml index c1469fe11..7f81efcab 100644 --- a/cqf-fhir-jackson/pom.xml +++ b/cqf-fhir-jackson/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-jackson - 3.12.0-SNAPSHOT + 3.12.0 pom FHIR Clinical Reasoning (Jackson) Aggregator module for Jackson dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml index e9e1fb641..e92316953 100644 --- a/cqf-fhir-jaxb/pom.xml +++ b/cqf-fhir-jaxb/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-jaxb - 3.12.0-SNAPSHOT + 3.12.0 pom FHIR Clinical Reasoning (JAXB) Aggregator module for JAXB dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml index 754ce263a..930911afd 100644 --- a/cqf-fhir-test/pom.xml +++ b/cqf-fhir-test/pom.xml @@ -5,21 +5,21 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Test Utilities) Utilities to support unit testing clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 ca.uhn.hapi.fhir diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml index 8715a6862..3009ce717 100644 --- a/cqf-fhir-utility/pom.xml +++ b/cqf-fhir-utility/pom.xml @@ -5,21 +5,21 @@ org.opencds.cqf.fhir cqf-fhir-utility - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Utilities) Utilities to help develop clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 org.opencds.cqf.fhir cqf-fhir-api - 3.12.0-SNAPSHOT + 3.12.0 org.mockito @@ -29,7 +29,7 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.12.0-SNAPSHOT + 3.12.0 test diff --git a/docs/pom.xml b/docs/pom.xml index 45cc987a1..5d3a4e232 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir docs - 3.12.0-SNAPSHOT + 3.12.0 FHIR Clinical Reasoning (Documentation) Documentation website for FHIR Clinical Reasoning @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 @@ -23,7 +23,7 @@ cqf-fhir-bom pom import - 3.12.0-SNAPSHOT + 3.12.0 diff --git a/pom.xml b/pom.xml index 9898da306..10acb9131 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.12.0-SNAPSHOT + 3.12.0 pom FHIR Clinical Reasoning FHIR Clinical Reasoning Implementations @@ -20,10 +20,10 @@ 5.9.1 2.0.4 - 3.15.0 + 3.16.0 1.36 5.3.39 - 7.4.0 + 7.4.2 4.6.1 32.1.2-jre 2.24.1