Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Get FHIR core transitively, update jackson
Browse files Browse the repository at this point in the history
JPercival committed Feb 23, 2024
1 parent dc17ac4 commit 6154fb0
Showing 4 changed files with 11 additions and 9 deletions.
7 changes: 3 additions & 4 deletions Src/java/buildSrc/src/main/groovy/cql.fhir-conventions.gradle
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ plugins {

ext {
hapiVersion = project['hapi.version']
coreVersion = project['fhir-core.version']
}

dependencies {
@@ -13,9 +12,9 @@ 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:org.hl7.fhir.r5"
implementation "ca.uhn.hapi.fhir:org.hl7.fhir.convertors"
implementation "ca.uhn.hapi.fhir:org.hl7.fhir.utilities"

implementation "ca.uhn.hapi.fhir:hapi-fhir-base"
implementation "ca.uhn.hapi.fhir:hapi-fhir-converter"
6 changes: 4 additions & 2 deletions Src/java/elm-jackson/build.gradle
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ 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'
implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.1'
implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.1'
}
1 change: 0 additions & 1 deletion Src/java/gradle.properties
Original file line number Diff line number Diff line change
@@ -5,6 +5,5 @@ 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
antlr.version=4.13.1
android.api.level=28
6 changes: 4 additions & 2 deletions Src/java/model-jackson/build.gradle
Original file line number Diff line number Diff line change
@@ -4,8 +4,10 @@ plugins {

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'
implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.1'
implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.1'

testImplementation project(":quick")
testImplementation project(":qdm")

0 comments on commit 6154fb0

Please sign in to comment.