From 222bb7a8c00980a9f925f8b0ba40e2110fc2010e Mon Sep 17 00:00:00 2001
From: JP <jonathan@alphora.com>
Date: Thu, 4 Feb 2021 13:00:03 -0700
Subject: [PATCH] Update to release versions of cql components (#2357)

---
 hapi-fhir-jpaserver-cql/pom.xml | 39 ---------------------------------
 pom.xml                         |  7 +++---
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/hapi-fhir-jpaserver-cql/pom.xml b/hapi-fhir-jpaserver-cql/pom.xml
index e16377f2c53..2a2ccc385f6 100644
--- a/hapi-fhir-jpaserver-cql/pom.xml
+++ b/hapi-fhir-jpaserver-cql/pom.xml
@@ -28,45 +28,6 @@
 			<artifactId>evaluator.engine</artifactId>
 			<version>${cql-evaluator.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.opencds.cqf</groupId>
-			<artifactId>tooling</artifactId>
-			<version>${cqf-tooling.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>javax.activation-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>jakarta.xml.bind</groupId>
-					<artifactId>jakarta.xml.bind-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>jakarta.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.istack</groupId>
-					<artifactId>istack-commons-tools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.istack</groupId>
-					<artifactId>istack-commons-runtime</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>info.bliki.wiki</groupId>
-					<artifactId>bliki-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.cql</groupId>
 			<artifactId>engine</artifactId>
diff --git a/pom.xml b/pom.xml
index cb038b0cb89..d31dba63ede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -820,10 +820,9 @@
 		<!-- CQL Support -->
 		<!-- FIXME KBD: Change all of these -SNAPSHOT versions to release versions
 		(e.g. 1.3.1-SNAPSHOT -> 1.3.1) before finalizing this work! -->
-		<cqf-tooling.version>1.3.1-SNAPSHOT</cqf-tooling.version>
-		<cql-engine.version>1.5.1-SNAPSHOT</cql-engine.version>
-		<cql-evaluator.version>1.1.0-SNAPSHOT</cql-evaluator.version>
-		<cqframework.version>1.5.2-SNAPSHOT</cqframework.version>
+		<cql-engine.version>1.5.1</cql-engine.version>
+		<cql-evaluator.version>1.1.0</cql-evaluator.version>
+		<cqframework.version>1.5.1</cqframework.version>
 
 		<!-- Site properties -->
 		<fontawesomeVersion>5.4.1</fontawesomeVersion>