Update the cql evaluator version to 1.4.2 (google#1020)

* Update the cql evaluator version to 1.4.2 * Downgrade junit to 4.12 to satisfy the dependency requirement * Add back META-INF/sun-jaxb.episode file exclusion * Add back licensee config for jakarta.xml.bind
aurangzaibumer · Feb 11, 2022 · ce6b01a · ce6b01a
1 parent 8b4b8e1
commit ce6b01a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -155,8 +155,7 @@ object Dependencies {
  }
 
  object Cql {
- const val cqlEngine = "1.3.14-SNAPSHOT"
- const val evaluator = "1.3.1-SNAPSHOT"
+ const val evaluator = "1.4.2"
  }
 
  object JavaJsonTools {
@@ -204,7 +203,7 @@ object Dependencies {
 
  const val espresso = "3.3.0"
  const val jacoco = "0.8.7"
- const val junit = "4.13"
+ const val junit = "4.12"
  const val mockitoKotlin = "3.2.0"
  const val mockitoInline = "4.0.0"
  const val robolectric = "4.5.1"

diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
@@ -92,13 +92,9 @@ configurations {
  exclude(module = "xpp3")
  exclude(group = "net.sf.saxon", module = "Saxon-HE")
  exclude(module = "hamcrest-all")
- exclude(module = "jaxb-impl")
- exclude(module = "jaxb-core")
  exclude(module = "jakarta.activation-api")
  exclude(module = "javax.activation")
  exclude(module = "jakarta.xml.bind-api")
- // TODO = the following line can be removed from the next CQL engine release.
- exclude(module = "hapi-fhir-jpaserver-base")
  }
 }
 

diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
@@ -86,7 +86,6 @@ android {
  "META-INF/notice.txt",
  "META-INF/LGPL-3.0.txt",
  "META-INF/sun-jaxb.episode",
- "META-INF/sun-jaxb.episode",
  "META-INF/*.kotlin_module",
  "readme.html",
  )
@@ -114,7 +113,6 @@ configurations {
  exclude(group = "org.eclipse.persistence")
  exclude(group = "com.google.code.javaparser")
  exclude(group = "jakarta.activation")
- // exclude(group = "jakarta.xml.bind")
  }
 }