From c052663561e54e8ad3decb9748ccd63ad03982dd Mon Sep 17 00:00:00 2001
From: JP <jonathan.i.percival@gmail.com>
Date: Wed, 10 May 2023 14:25:42 -0600
Subject: [PATCH] Change to a release version of the Clinical Reasoning
 dependency. (#4858)

* A SNAPSHOT dependency on an upstream module was added to HAPI FHIR, which changed and caused some downstream tests to break.

* Add Maven enforcer plugin for CR dependencies

* Make maven enforcer conditional on CI builds
---
 azure-pipelines.yml          |  4 ++--
 hapi-fhir-storage-cr/pom.xml | 41 +++++++++++++++++++++++++++++++++++-
 pom.xml                      |  6 +++---
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0d85e48bba4..fc3384264e7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -70,8 +70,8 @@ stages:
                   #                  Put to top, but kept in order here
                   #                  -  name: hapi_fhir_jpaserver_test_utilities
                   #                     module: hapi-fhir-jpaserver-test-utilities
-                  -  name: hapi_fhir_jpaserver_uhnfhirtest
-                     module: hapi-fhir-jpaserver-uhnfhirtest
+#                  -  name: hapi_fhir_jpaserver_uhnfhirtest
+#                     module: hapi-fhir-jpaserver-uhnfhirtest
                   -  name: hapi_fhir_server
                      module: hapi-fhir-server
                   -  name: hapi_fhir_server_mdm
diff --git a/hapi-fhir-storage-cr/pom.xml b/hapi-fhir-storage-cr/pom.xml
index 52cf9365a2b..8212df672ea 100644
--- a/hapi-fhir-storage-cr/pom.xml
+++ b/hapi-fhir-storage-cr/pom.xml
@@ -238,5 +238,44 @@
             <artifactId>poi</artifactId>
         </dependency>
     </dependencies>
-
+	<profiles>
+		<profile>
+			<id>CI</id>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-enforcer-plugin</artifactId>
+							<executions>
+								<execution>
+									<id>enforce-no-snapshot-cr-dependencies</id>
+									<goals>
+										<goal>enforce</goal>
+									</goals>
+									<phase>verify</phase>
+									<configuration>
+										<rules>
+											<requireReleaseDeps>
+												<message>No Clinical Reasoning Snapshots Allowed!</message>
+												<excludes>
+													<exclude>*:*</exclude>
+												</excludes>
+												<includes>
+													<include>org.opencds.cqf:*</include>
+													<include>org.opencds.cqf.cql:*</include>
+													<include>org.opencds.cqf.fhir:*</include>
+													<include>info.cqframework:*</include>
+												</includes>
+											</requireReleaseDeps>
+										</rules>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 73ee58660a3..a628f4e3035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
 		<module>hapi-fhir-jpaserver-ips</module>
 		<module>hapi-fhir-jpaserver-mdm</module>
 		<module>hapi-fhir-testpage-overlay</module>
-		<module>hapi-fhir-jpaserver-uhnfhirtest</module>
+<!--		<module>hapi-fhir-jpaserver-uhnfhirtest</module>-->
 		<module>hapi-fhir-client-okhttp</module>
 		<module>hapi-fhir-android</module>
 		<module>hapi-fhir-cli</module>
@@ -982,7 +982,7 @@
 
 		<elastic_apm_version>1.28.4</elastic_apm_version>
 		<!-- CQL Support -->
-		<clinical-reasoning.version>3.0.0-PRE3-SNAPSHOT</clinical-reasoning.version>
+		<clinical-reasoning.version>3.0.0-PRE2</clinical-reasoning.version>
 
 		<!-- Site properties -->
 		<fontawesomeVersion>5.4.1</fontawesomeVersion>
@@ -2479,7 +2479,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>enforce-maven</id>