From 5d20253b33784387d9921d65ca82bd5673306fd3 Mon Sep 17 00:00:00 2001
From: "taha.attari@smilecdr.com" <taha.attari@smilecdr.com>
Date: Mon, 27 May 2024 20:26:48 -0400
Subject: [PATCH 1/3] fix propertiesLauncher

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 433bf99ff..0401e7ae2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ RUN mkdir plugin
 COPY /server/target/cqf-ruler-server-${VERSION}.war server/ROOT.war
 
 EXPOSE 8080
-CMD ["java", "-cp", "server/ROOT.war", "-Dloader.path=WEB-INF/classes,WEB-INF/lib,WEB-INF/lib-provided,plugin", "org.springframework.boot.loader.PropertiesLauncher"]
+CMD ["java", "-cp", "server/ROOT.war", "-Dloader.path=WEB-INF/classes,WEB-INF/lib,WEB-INF/lib-provided,plugin", "org.springframework.boot.loader.launch.PropertiesLauncher"]

From ed26324e91d8dccd92055f603be5032d21d11157 Mon Sep 17 00:00:00 2001
From: "taha.attari@smilecdr.com" <taha.attari@smilecdr.com>
Date: Mon, 3 Jun 2024 16:29:25 -0400
Subject: [PATCH 2/3] use classic loader for spring boot

---
 server/pom.xml                             | 7 +++++++
 server/src/main/resources/application.yaml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index 4a5101b6b..8e3edfe07 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -270,6 +270,12 @@
 			<version>0.15.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.opencds.cqf.ruler</groupId>
+			<artifactId>cqf-ruler-ecr</artifactId>
+			<version>0.15.0-SNAPSHOT</version>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-sdc</artifactId>
@@ -300,6 +306,7 @@
 						</goals>
 						<configuration>
 							<mainClass>org.opencds.cqf.ruler.Application</mainClass>
+							<loaderImplementation>CLASSIC</loaderImplementation>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/server/src/main/resources/application.yaml b/server/src/main/resources/application.yaml
index 2aab73ca7..4d20496dc 100644
--- a/server/src/main/resources/application.yaml
+++ b/server/src/main/resources/application.yaml
@@ -74,6 +74,7 @@ hapi:
 
       ## CR Settings
       cr:
+         enabled: true
          cql:
             use_embedded_libraries: true
             compiler:
@@ -113,7 +114,6 @@ hapi:
                terminology_parameter_mode: FILTER_IN_MEMORY #  AUTO, USE_VALUE_SET_URL, USE_INLINE_CODES, FILTER_IN_MEMORY
                profile_mode: DECLARED # ENFORCED, DECLARED, OPTIONAL, TRUST, OFF
 
-
       ## CDS Hook Settings
       cdshooks:
          enabled: true

From 251b8c80f5958d9c856041f9968e2cd21346a5e3 Mon Sep 17 00:00:00 2001
From: "taha.attari@smilecdr.com" <taha.attari@smilecdr.com>
Date: Mon, 3 Jun 2024 16:32:11 -0400
Subject: [PATCH 3/3] remove ecr plugin

---
 server/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index 8e3edfe07..c6c23bf12 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -270,12 +270,6 @@
 			<version>0.15.0-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.opencds.cqf.ruler</groupId>
-			<artifactId>cqf-ruler-ecr</artifactId>
-			<version>0.15.0-SNAPSHOT</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.ruler</groupId>
 			<artifactId>cqf-ruler-sdc</artifactId>
@@ -306,7 +300,7 @@
 						</goals>
 						<configuration>
 							<mainClass>org.opencds.cqf.ruler.Application</mainClass>
-							<loaderImplementation>CLASSIC</loaderImplementation>
+							<loaderImplementation>CLASSIC</loaderImplementation>	
 						</configuration>
 					</execution>
 				</executions>