More cleanup of dependencies (#1275)

cqframework · Nov 6, 2023 · 510baf6 · 510baf6
1 parent 1da3590
commit 510baf6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle
@@ -19,8 +19,8 @@ dependencies {
     xjc 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2'
     xjc 'org.slf4j:slf4j-simple:1.7.36'
 
-    api 'codes.rafael.jaxb2_commons:jaxb2-basics-runtime:3.0.0'
     api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'codes.rafael.jaxb2_commons:jaxb2-basics-runtime:3.0.0'
 }
 
 ext.xjc = [

diff --git a/Src/java/cql-to-elm/build.gradle b/Src/java/cql-to-elm/build.gradle
@@ -15,14 +15,17 @@ dependencies {
     // disallowed. For those reasons xpp3 is excluded here, and included as a runtime dependency for
     // tests. Users of the CQL translator will need to supply their own implementation or add xpp3
     // at runtime.
-    api ('org.fhir:ucum:1.0.3') {
-        exclude group: 'xpp3'
-    }
-
+    implementation 'org.fhir:ucum:1.0.8'
     implementation 'org.apache.commons:commons-text:1.10.0'
-    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2'
+
+    // TODO: This dependencies are required due the the fact that the CqlTranslatorOptionsMapper lives
+    // in the cql-to-elm project. Ideally, we'd factor out all serialization depedencies into common
+    // libraries such that we could swap out jackson for something else. In the meantime, these are
+    // "implementation" dependencies so that they are not exported downstream.
+    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
 
+
     testImplementation project(':elm-jackson')
     testImplementation project(':model-jackson')
     testImplementation project(':quick')

diff --git a/Src/java/elm-jackson/build.gradle b/Src/java/elm-jackson/build.gradle
@@ -8,6 +8,4 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
     implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2'
-    // needs javax.json.JsonException when using SAXUnmarshaller.getNewXMLReader
-    implementation 'org.glassfish:javax.json:1.0.4'
 }
diff --git a/Src/java/elm-test/build.gradle b/Src/java/elm-test/build.gradle
@@ -4,7 +4,8 @@ plugins {
 
 dependencies {
     implementation project(':cql-to-elm')
-    implementation project(':model-jaxb')
-    implementation project(':elm-jackson')
+    // implementation project(':model-jaxb')
     implementation project(':elm-jaxb')
+    implementation project(':model-jackson')
+    implementation project(':elm-jackson')
 }
diff --git a/Src/java/engine/build.gradle b/Src/java/engine/build.gradle
@@ -4,15 +4,10 @@ plugins {
 
 dependencies {
     api 'org.apache.commons:commons-text:1.10.0'
-    api 'org.fhir:ucum:1.0.3'
-    api 'xpp3:xpp3_min:1.1.4c'
-    api 'xmlpull:xmlpull:1.1.3.1'
-    api 'com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
-    implementation project(path: ':elm')
-    implementation project(path: ':cql-to-elm')
+    api 'org.fhir:ucum:1.0.8'
+    implementation project(':elm')
+    implementation project(':cql-to-elm')
 
-    testImplementation project(':cql-to-elm')
     testImplementation project(':model-jackson')
     testImplementation project(':elm-jackson')
     testImplementation 'org.mockito:mockito-core:5.4.0'