Rev to latest CQL/HAPI (#537)

cqframework · Sep 27, 2024 · 99461ad · 99461ad
1 parent 47e7140
commit 99461ad
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 64 deletions.
diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml
@@ -5,14 +5,14 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-api</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <name>FHIR Clinical Reasoning (APIs)</name>
   <description>FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencies>

diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml
@@ -5,26 +5,26 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-benchmark</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
     <name>FHIR Clinical Reasoning (Benchmarks)</name>
     <description>Tests validating performance of FHIR Clinical Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -34,14 +34,14 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
             <!--TODO: test-jars don't seem to work very well. Need to investigate some alternatives -->
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>

diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
@@ -5,60 +5,60 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-bom</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Bill Of Materials)</name>
   <description>This bom can be used to simplify dependency management when using this project</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-api</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-utility</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cql</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jackson</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jaxb</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr-cli</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml
@@ -5,26 +5,26 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cql</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <name>FHIR Clinical Reasoning (CQL)</name>
   <description>Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -62,13 +62,13 @@
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>

diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml
@@ -6,36 +6,36 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-cli</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
     <name>FHIR Clinical Reasoning (CLI)</name>
     <description>CLI for running FHIR Clincial Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-api</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-utility</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cql</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml
@@ -7,21 +7,21 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-spring</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
     <name>FHIR Clinical Reasoning (Spring)</name>
     <description>Spring configurations for FHIR Clinical Reasoning</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.12.0-SNAPSHOT</version>
+        <version>3.12.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.12.0-SNAPSHOT</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml
@@ -5,45 +5,45 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cr</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <name>FHIR Clinical Reasoning (Operations)</name>
   <description>Implementations of clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-cql</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
     </dependency>
 
     <!-- test dependencies-->
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.12.0-SNAPSHOT</version>
+      <version>3.12.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...ir-cr/src/test/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureEvaluationTest.java b/...ir-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
@@ -5,15 +5,15 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jackson</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Jackson)</name>
   <description>Aggregator module for Jackson dependencies</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencies>

diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml
@@ -5,15 +5,15 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jaxb</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.12.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (JAXB)</name>
   <description>Aggregator module for JAXB dependencies</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.12.0</version>
   </parent>
 
   <dependencies>