Get FHIR core transitively, update jackson (#1332)

* Get FHIR core transitively, update jackson * Export Jackson deps * Remove FHIR core dependencies
cqframework · Feb 28, 2024 · b72808c · b72808c
1 parent dc17ac4
commit b72808c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/Src/java/buildSrc/src/main/groovy/cql.fhir-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.fhir-conventions.gradle
@@ -4,7 +4,6 @@ plugins {
 
 ext {
     hapiVersion = project['hapi.version']
-    coreVersion = project['fhir-core.version']
 }
 
 dependencies {
@@ -13,10 +12,6 @@ dependencies {
         exclude group: 'xpp3'
     }
 
-    implementation "ca.uhn.hapi.fhir:org.hl7.fhir.r5:${coreVersion}"
-    implementation "ca.uhn.hapi.fhir:org.hl7.fhir.convertors:${coreVersion}"
-    implementation "ca.uhn.hapi.fhir:org.hl7.fhir.utilities:${coreVersion}"
-
     implementation "ca.uhn.hapi.fhir:hapi-fhir-base"
     implementation "ca.uhn.hapi.fhir:hapi-fhir-converter"
     implementation "ca.uhn.hapi.fhir:hapi-fhir-structures-hl7org-dstu2"

diff --git a/Src/java/cql-to-elm/build.gradle b/Src/java/cql-to-elm/build.gradle
@@ -3,6 +3,10 @@ plugins {
     id 'cql.xjc-conventions'
 }
 
+ext {
+    jacksonVersion = project['jackson.version']
+}
+
 dependencies {
     api project(':cql')
     api project(':model')
@@ -14,7 +18,7 @@ dependencies {
     // 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 "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:${jacksonVersion}"
     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
@@ -2,10 +2,13 @@ plugins {
     id 'cql.library-conventions'
 }
 
+ext {
+    jacksonVersion = properties['jackson.version']
+}
+
 dependencies {
     api project(':model')
     api project(':elm')
-    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'
+    api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
+    api "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:${jacksonVersion}"
 }
diff --git a/Src/java/elm-jaxb/build.gradle b/Src/java/elm-jaxb/build.gradle
@@ -4,5 +4,4 @@ plugins {
 
 dependencies {
     api project(':elm')
-    implementation 'org.apache.commons:commons-text:1.10.0'
 }
diff --git a/Src/java/gradle.properties b/Src/java/gradle.properties
@@ -5,6 +5,6 @@ group=info.cqframework
 version=3.8.0-SNAPSHOT
 specification.version=1.5.2
 hapi.version=7.0.0
-fhir-core.version=6.1.2.2
+jackson.version=2.16.1
 antlr.version=4.13.1
 android.api.level=28
diff --git a/Src/java/model-jackson/build.gradle b/Src/java/model-jackson/build.gradle
@@ -2,10 +2,14 @@ plugins {
     id 'cql.library-conventions'
 }
 
+ext {
+    jacksonVersion = project['jackson.version']
+}
+
 dependencies {
     api project(':model')
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
-    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2'
+    api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}"
+    api "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:${jacksonVersion}"
 
     testImplementation project(":quick")
     testImplementation project(":qdm")