From 3354da70decce93d796f678113cd4c59ca27b899 Mon Sep 17 00:00:00 2001 From: JP Date: Fri, 8 Dec 2023 14:58:41 -0700 Subject: [PATCH] Rev to CR 3.0.0-PRE13, HAPI 6.10.0, FHIR Core 6.1.2.2 (#390) * Rev to CR 3.0.0-PRE13 * Fix formatting * Update to CQL 3.5.1 --- 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 | 12 ++++---- cqf-fhir-cr-spring/pom.xml | 6 ++-- cqf-fhir-cr/pom.xml | 14 ++++----- .../measure/dstu3/Dstu3MeasureProcessor.java | 11 +++---- .../fhir/cr/measure/helper/DateHelper.java | 30 ++++++++++++------- .../cr/measure/r4/R4MeasureProcessor.java | 8 ++--- .../cr/measure/helper/DateHelperTest.java | 21 +++++++------ cqf-fhir-jackson/pom.xml | 4 +-- cqf-fhir-jaxb/pom.xml | 4 +-- cqf-fhir-test/pom.xml | 8 ++--- cqf-fhir-utility/pom.xml | 6 ++-- docs/pom.xml | 6 ++-- pom.xml | 8 ++--- 17 files changed, 97 insertions(+), 89 deletions(-) diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml index e53341a5f..84ffae5be 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml index f1c67a660..644e23d04 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Benchmarks) Tests validating performance of FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.openjdk.jmh @@ -34,14 +34,14 @@ org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 test-jar org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom test diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml index 16e6af077..841496dc9 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 @@ -21,44 +21,44 @@ org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom org.opencds.cqf.fhir cqf-fhir-jaxb - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml index 3a2cf7dbe..bfad87b6d 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (CQL) Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 info.cqframework @@ -53,13 +53,13 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 test org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom test diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml index da8f54080..211b7b780 100644 --- a/cqf-fhir-cr-cli/pom.xml +++ b/cqf-fhir-cr-cli/pom.xml @@ -5,36 +5,36 @@ org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (CLI) CLI for running FHIR Clincial Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml index 3584fa6a7..8d5b64a14 100644 --- a/cqf-fhir-cr-spring/pom.xml +++ b/cqf-fhir-cr-spring/pom.xml @@ -6,21 +6,21 @@ org.opencds.cqf.fhir cqf-fhir-cr-spring - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Spring) Spring configurations for FHIR Clinical Reasoning org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.springframework diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml index c71fc8284..0808e1667 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Operations) Implementations of clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom test org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 test diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java index 4530470fa..f9d1cdbdb 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java @@ -17,7 +17,6 @@ import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; -import org.opencds.cqf.cql.engine.runtime.DateTime; import org.opencds.cqf.cql.engine.runtime.Interval; import org.opencds.cqf.fhir.api.Repository; import org.opencds.cqf.fhir.cql.Engines; @@ -59,7 +58,8 @@ public MeasureReport evaluateMeasure( measure, periodStart, periodEnd, reportType, subjectIds, additionalData, parameters); } - // NOTE: Do not make a top-level function that takes a Measure resource. This ensures that + // NOTE: Do not make a top-level function that takes a Measure resource. This + // ensures that // the repositories are set up correctly. protected MeasureReport evaluateMeasure( Measure measure, @@ -98,7 +98,8 @@ protected MeasureReport evaluateMeasure( Map paramMap = resolveParameterMap(parameters); context.getState().setParameters(lib.getLibrary(), paramMap); // Set parameters for included libraries - // Note: this may not be the optimal method (e.g. libraries with the same parameter name, but different + // Note: this may not be the optimal method (e.g. libraries with the same + // parameter name, but different // values) if (lib.getLibrary().getIncludes() != null) { lib.getLibrary() @@ -147,9 +148,9 @@ protected MeasureReportType evalTypeToReportType(MeasureEvalType measureEvalType private Interval buildMeasurementPeriod(String periodStart, String periodEnd) { // resolve the measurement period return new Interval( - DateTime.fromJavaDate(DateHelper.resolveRequestDate(periodStart, true)), + DateHelper.resolveRequestDate(periodStart, true), true, - DateTime.fromJavaDate(DateHelper.resolveRequestDate(periodEnd, false)), + DateHelper.resolveRequestDate(periodEnd, false), true); } diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelper.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelper.java index e4fdb81dd..bec6400be 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelper.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelper.java @@ -2,42 +2,48 @@ import java.time.Instant; import java.time.LocalDateTime; +import java.time.OffsetDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAccessor; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.TimeZone; +import org.opencds.cqf.cql.engine.runtime.DateTime; /** - * Helper class to resolve measurement period start and end dates. If a timezone is specified in a + * Helper class to resolve measurement period start and end dates. If a timezone + * is specified in a * datetime, it's used. If not the timezone of the local system is used. */ public class DateHelper { - public static Date resolveRequestDate(String date, boolean start) { + public static DateTime resolveRequestDate(String date, boolean start) { // ISO Instance Format if (date.contains("Z")) { - return Date.from(Instant.from(DateTimeFormatter.ISO_INSTANT.parse(date))); + var offset = Instant.parse(date).atOffset(ZoneOffset.UTC); + return new DateTime(offset); } + // ISO Offset Format boolean isOffsetDateString = date.contains("T") && date.contains(".") && date.contains("-"); if (isOffsetDateString) { - return Date.from(Instant.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(date))); + var offset = OffsetDateTime.parse(date, DateTimeFormatter.ISO_OFFSET_DATE_TIME); + return new DateTime(offset); } // Local DateTime if (date.contains("T")) { - TemporalAccessor ta = DateTimeFormatter.ISO_LOCAL_DATE_TIME.parse(date); - LocalDateTime ld = LocalDateTime.from(ta); - return Date.from(ld.atZone(ZoneId.systemDefault()).toInstant()); + var offset = LocalDateTime.parse(date, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + .atZone(ZoneId.systemDefault()) + .toOffsetDateTime(); + return new DateTime(offset); } return resolveDate(start, date); } - private static Date resolveDate(boolean start, String dateString) { + private static DateTime resolveDate(boolean start, String dateString) { Calendar calendar = Calendar.getInstance(); calendar.clear(); @@ -95,6 +101,8 @@ private static Date resolveDate(boolean start, String dateString) { calendar.set(Calendar.MILLISECOND, 999); } - return Date.from(calendar.toInstant()); + // TODO: Seems like we might want set the precision appropriately here? + var offset = calendar.toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime(); + return new DateTime(offset); } } diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java index c60f8e151..5c447953b 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java @@ -18,7 +18,6 @@ import org.hl7.fhir.r4.model.MeasureReport; import org.hl7.fhir.r4.model.Parameters; import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; -import org.opencds.cqf.cql.engine.runtime.DateTime; import org.opencds.cqf.cql.engine.runtime.Interval; import org.opencds.cqf.fhir.api.Repository; import org.opencds.cqf.fhir.cql.Engines; @@ -124,7 +123,8 @@ protected MeasureReport evaluateMeasure( Map paramMap = resolveParameterMap(parameters); context.getState().setParameters(lib.getLibrary(), paramMap); // Set parameters for included libraries - // Note: this may not be the optimal method (e.g. libraries with the same parameter name, but different + // Note: this may not be the optimal method (e.g. libraries with the same + // parameter name, but different // values) if (lib.getLibrary().getIncludes() != null) { lib.getLibrary() @@ -177,9 +177,9 @@ protected MeasureReportType evalTypeToReportType(MeasureEvalType measureEvalType private Interval buildMeasurementPeriod(String periodStart, String periodEnd) { // resolve the measurement period return new Interval( - DateTime.fromJavaDate(DateHelper.resolveRequestDate(periodStart, true)), + DateHelper.resolveRequestDate(periodStart, true), true, - DateTime.fromJavaDate(DateHelper.resolveRequestDate(periodEnd, false)), + DateHelper.resolveRequestDate(periodEnd, false), true); } diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelperTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelperTest.java index ad99d4d6c..cc4584b5d 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelperTest.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/helper/DateHelperTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.Date; import org.junit.jupiter.api.Test; // TODO: These tests are only partially complete. We need to actually verify that resolved dates are @@ -13,10 +12,10 @@ public class DateHelperTest { @Test public void testResolveRequestDateWithTime() throws Exception { String date = "2019-01-17T12:30:00"; - Date resolvedDateStart = DateHelper.resolveRequestDate(date, true); + var resolvedDateStart = DateHelper.resolveRequestDate(date, true); assertTrue(resolvedDateStart != null); - Date resolvedDateEnd = DateHelper.resolveRequestDate(date, false); + var resolvedDateEnd = DateHelper.resolveRequestDate(date, false); assertTrue(resolvedDateEnd != null); assertEquals(resolvedDateStart, resolvedDateEnd); } @@ -24,10 +23,10 @@ public void testResolveRequestDateWithTime() throws Exception { @Test public void testResolveRequestDateOffset() throws Exception { String date = "2019-01-01T22:00:00.0-06:00"; - Date resolvedDateStart = DateHelper.resolveRequestDate(date, true); + var resolvedDateStart = DateHelper.resolveRequestDate(date, true); assertTrue(resolvedDateStart != null); - Date resolvedDateEnd = DateHelper.resolveRequestDate(date, false); + var resolvedDateEnd = DateHelper.resolveRequestDate(date, false); assertTrue(resolvedDateEnd != null); assertEquals(resolvedDateStart, resolvedDateEnd); } @@ -35,10 +34,10 @@ public void testResolveRequestDateOffset() throws Exception { @Test public void testResolveRequestDateWithZOffset() throws Exception { String date = "2017-01-01T00:00:00.000Z"; - Date resolvedDateStart = DateHelper.resolveRequestDate(date, true); + var resolvedDateStart = DateHelper.resolveRequestDate(date, true); assertTrue(resolvedDateStart != null); - Date resolvedDateEnd = DateHelper.resolveRequestDate(date, false); + var resolvedDateEnd = DateHelper.resolveRequestDate(date, false); assertTrue(resolvedDateEnd != null); assertEquals(resolvedDateStart, resolvedDateEnd); } @@ -46,20 +45,20 @@ public void testResolveRequestDateWithZOffset() throws Exception { @Test public void testResolveRequestOnlyDate() throws Exception { String date = "2017-01-01"; - Date resolvedDateStart = DateHelper.resolveRequestDate(date, true); + var resolvedDateStart = DateHelper.resolveRequestDate(date, true); assertTrue(resolvedDateStart != null); - Date resolvedDateEnd = DateHelper.resolveRequestDate(date, false); + var resolvedDateEnd = DateHelper.resolveRequestDate(date, false); assertTrue(resolvedDateEnd != null); } @Test public void testResolveRequestOnlyYear() throws Exception { String date = "2017"; - Date resolvedDateStart = DateHelper.resolveRequestDate(date, true); + var resolvedDateStart = DateHelper.resolveRequestDate(date, true); assertTrue(resolvedDateStart != null); - Date resolvedDateEnd = DateHelper.resolveRequestDate(date, false); + var resolvedDateEnd = DateHelper.resolveRequestDate(date, false); assertTrue(resolvedDateEnd != null); } } diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml index bd1185190..729407439 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom FHIR Clinical Reasoning (Jackson) Aggregator module for Jackson dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml index d8d57f1e5..0ae588b93 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom FHIR Clinical Reasoning (JAXB) Aggregator module for JAXB dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml index dd25fce39..64917ea67 100644 --- a/cqf-fhir-test/pom.xml +++ b/cqf-fhir-test/pom.xml @@ -5,26 +5,26 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Test Utilities) Utilities to support unit testing clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.skyscreamer diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml index 40fc6d735..84ebb679f 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.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Utilities) Utilities to help develop clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 ca.uhn.hapi.fhir diff --git a/docs/pom.xml b/docs/pom.xml index 3675d9863..9aba999a7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir docs - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 FHIR Clinical Reasoning (Documentation) Documentation website for FHIR Clinical Reasoning @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 @@ -23,7 +23,7 @@ cqf-fhir-bom pom import - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 diff --git a/pom.xml b/pom.xml index 3012be95a..b5872b04b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE13-SNAPSHOT + 3.0.0-PRE13 pom FHIR Clinical Reasoning FHIR Clinical Reasoning Implementations @@ -19,11 +19,11 @@ 5.9.1 2.0.4 - 3.4.1 + 3.5.1 1.36 5.3.23 - 6.0.22.2 - 6.8.5 + 6.1.2.2 + 6.10.0 4.6.1 32.1.2-jre