Revert "Bump jackson-databind only to 2.13.2.1 (#1824)"

This reverts commit 5e87cf8.
cloudfoundry · Mar 29, 2022 · e4ceb0b · e4ceb0b
1 parent 5e87cf8
commit e4ceb0b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 30 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -43,7 +43,7 @@ libraries.hamcrest = "org.hamcrest:hamcrest:${versions.hamcrestVersion}"
 libraries.hibernateValidator = "org.hibernate.validator:hibernate-validator"
 libraries.hsqldb = "org.hsqldb:hsqldb"
 libraries.jacksonAnnotations = "com.fasterxml.jackson.core:jackson-annotations"
-libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.13.2.1"
+libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind"
 libraries.jacksonDataformatYaml = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 libraries.javaxMail = "com.sun.mail:jakarta.mail"
 libraries.javaxServlet = "javax.servlet:jstl"

diff --git a/metrics-data/build.gradle b/metrics-data/build.gradle
@@ -1,9 +1,7 @@
 description = "CloudFoundry Identity Metrics Data Jar"
 
 dependencies {
-  implementation(libraries.jacksonDatabind) {
-    exclude(module: "jackson-bom")
-  }
+  implementation(libraries.jacksonDatabind)
   implementation(libraries.jacksonAnnotations)
 }
 

diff --git a/model/build.gradle b/model/build.gradle
@@ -3,12 +3,8 @@ description = "CloudFoundry Identity Model JAR"
 dependencies {
     implementation(project(":cloudfoundry-identity-metrics-data"))
 
-    implementation(libraries.jacksonDatabind) {
-        exclude(module: "jackson-bom")
-    }
-    implementation(libraries.jacksonAnnotations) {
-        exclude(module: "jackson-bom")
-    }
+    implementation(libraries.jacksonDatabind)
+    implementation(libraries.jacksonAnnotations)
 
     implementation(libraries.javaxValidationApi)
 

diff --git a/server/build.gradle b/server/build.gradle
@@ -10,9 +10,7 @@ dependencies {
     provided(libraries.tomcatEmbed)
     implementation(libraries.javaxMail)
 
-    implementation(libraries.jacksonDatabind) {
-        exclude(module: "jackson-bom")
-    }
+    implementation(libraries.jacksonDatabind)
     implementation(libraries.jsonPath)
     implementation(libraries.zxing)
     implementation(libraries.springBeans)

diff --git a/statsd-lib/build.gradle b/statsd-lib/build.gradle
@@ -7,21 +7,15 @@ repositories {
 dependencies {
     implementation(project(":cloudfoundry-identity-metrics-data"))
     implementation(libraries.springBootStarter)
-    implementation(libraries.springBootStarterWeb) {
-        exclude(module: "jackson-bom")
-    }
+    implementation(libraries.springBootStarterWeb)
     implementation(libraries.springBootStarterLog4j2)
     implementation(libraries.statsdClient)
     testImplementation(libraries.junit)
     testImplementation(libraries.mockito)
     testImplementation(libraries.springBootStarterTest)
 
-    implementation(libraries.jacksonDataformatYaml) {
-        exclude(module: "jackson-bom")
-    }
-    implementation(libraries.jacksonDatabind) {
-        exclude(module: "jackson-bom")
-    }
+    implementation(libraries.jacksonDataformatYaml)
+    implementation(libraries.jacksonDatabind)
 }
 
 test {

diff --git a/uaa/build.gradle b/uaa/build.gradle
@@ -28,17 +28,12 @@ dependencies {
     }
     implementation(project(":cloudfoundry-identity-statsd-lib"))
     implementation(libraries.springBootStarter)
-    implementation(libraries.springBootStarterWeb) {
-        exclude(module: "jackson-bom")
-    }
+    implementation(libraries.springBootStarterWeb)
     implementation(libraries.springSecurityOauth) {
         exclude(module: "commons-codec")
         exclude(module: "jackson-mapper-asl")
         exclude(module: "spring-security-web")
     }
-    implementation(libraries.jacksonDatabind) {
-        exclude(module: "jackson-bom")
-    }
     implementation(libraries.thymeLeaf) {
         exclude(module: "ognl")
     }
@@ -57,8 +52,6 @@ dependencies {
 
     testImplementation(identityServer.sourceSets.test.output)
 
-    // remove commit if spring-boot defines a patched version
-    testImplementation("com.fasterxml.jackson:jackson-bom:2.13.2.20220324")
     testImplementation(project(":cloudfoundry-identity-model"))
     testImplementation(project(":cloudfoundry-identity-metrics-data"))
     testImplementation(libraries.apacheDsProtocolLdap) {