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 <justin.mckelvy@smilecdr.com>
cqframework · Nov 28, 2022 · 67b2475 · 67b2475
1 parent 4b21166
commit 67b2475
Show file tree

Hide file tree

Showing 20 changed files with 69 additions and 68 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-core</artifactId>
@@ -14,7 +13,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-external</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 
 		<dependency>

diff --git 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
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-test</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/external/pom.xml b/external/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-external</artifactId>

diff --git a/plugin/case-reporting/pom.xml b/plugin/case-reporting/pom.xml
@@ -4,15 +4,15 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-case-reporting</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 
 	</dependencies>

diff --git a/plugin/cds-hooks/pom.xml b/plugin/cds-hooks/pom.xml
@@ -4,30 +4,30 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cds-hooks</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cr</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-security</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cpg</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/plugin/cpg/pom.xml b/plugin/cpg/pom.xml
@@ -4,21 +4,21 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cpg</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-security</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/plugin/cql/pom.xml b/plugin/cql/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-cql</artifactId>

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
@@ -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
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 	<artifactId>cqf-ruler-cr</artifactId>
 	<dependencies>
@@ -28,7 +27,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cql</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 	</dependencies>
 </project>
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
@@ -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
@@ -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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-dev-tools</artifactId>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-plugin</artifactId>
@@ -25,12 +25,12 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-core</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-external</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 
 		<dependency>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-test</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/plugin/ra/pom.xml b/plugin/ra/pom.xml
@@ -4,15 +4,15 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-ra</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-cr</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/plugin/sdc/pom.xml b/plugin/sdc/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-sdc</artifactId>

diff --git a/plugin/security/pom.xml b/plugin/security/pom.xml
@@ -4,15 +4,15 @@
 	<parent>
 		<groupId>org.opencds.cqf.ruler</groupId>
 		<artifactId>cqf-ruler-plugin</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
+		<version>0.9.0</version>
 	</parent>
 
 	<artifactId>cqf-ruler-security</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-dev-tools</artifactId>
-			<version>0.9.0-SNAPSHOT</version>
+			<version>0.9.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>