Skip to content

Commit

Permalink
Merge pull request #10302 from chadlwilson/bump-jackson
Browse files Browse the repository at this point in the history
Bump jackson-databind to 2.13.2.2 via switching to BOM
  • Loading branch information
chadlwilson committed Mar 30, 2022
2 parents a83e7b7 + f7c2a39 commit e479ba7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ final Map<String, String> libraries = [
hamcrest : 'org.hamcrest:hamcrest-core:2.2',
hibernate : 'org.hibernate:hibernate-ehcache:3.6.10.Final',
httpClientMock : 'com.github.paweladamski:HttpClientMock:1.10.0',
jackson : 'com.fasterxml.jackson.core:jackson-core:2.13.2',
jacksonBom : 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328',
javaAssist : 'javassist:javassist:3.12.1.GA',
javaxAnnotation : 'javax.annotation:javax.annotation-api:1.3.2',
jaxb : 'javax.xml.bind:jaxb-api:2.3.1',
Expand Down Expand Up @@ -142,7 +142,7 @@ final Map<String, String> v = [
h2 : versionOf(libraries.h2),
hamcrest : versionOf(libraries.hamcrest),
hibernate : versionOf(libraries.hibernate),
jackson : versionOf(libraries.jackson),
jacksonBom : versionOf(libraries.jacksonBom),
javaAssist : versionOf(libraries.javaAssist),
javaxAnnotation : versionOf(libraries.javaxAnnotation),
jaxb : versionOf(libraries.jaxb),
Expand Down Expand Up @@ -196,7 +196,6 @@ final Map<String, String> related = [
aspectjWeaver : "org.aspectj:aspectjweaver:${v.aspectj}",
bouncyCastlePkix : "org.bouncycastle:bcpkix-jdk15on:${v.bouncyCastle}",
hamcrestLibrary : "org.hamcrest:hamcrest-library:${v.hamcrest}",
jacksonDatabind : "com.fasterxml.jackson.core:jackson-databind:${v.jackson}",
jaxbRuntime : "org.glassfish.jaxb:jaxb-runtime:${v.jaxb}",
jettyDeploy : "org.eclipse.jetty:jetty-deploy:${v.jetty}",
jettyJmx : "org.eclipse.jetty:jetty-jmx:${v.jetty}",
Expand Down
5 changes: 3 additions & 2 deletions spark/spark-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ dependencies {
api project(':common')
api project(':server')

implementation project.deps.jackson
implementation project.deps.jacksonDatabind
implementation(platform(project.deps.jacksonBom))
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation project.deps.springWeb

api(project.deps.spark) {
Expand Down

0 comments on commit e479ba7

Please sign in to comment.