Remove jackson-databind and jackson-annotations now coming from core (#…

…349) Signed-off-by: David Zane <davizane@amazon.com>
opensearch-project · Jan 5, 2023 · 90faf0c · 90faf0c
1 parent e4e7ed5
commit 90faf0c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -238,9 +238,6 @@ checkstyleMain.enabled = false
 checkstyleTest.enabled = false
 
 dependencies {
-
-    def jacksonVersion = "2.13.4"
-    def jacksonDataBindVersion = "2.13.4.2"
     def nettyVersion = "4.1.79.Final"
 
     configurations {
@@ -254,13 +251,13 @@ dependencies {
     configurations.all {
         resolutionStrategy {
             force 'junit:junit:4.13.1'
-            force "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-            force "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-            force "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
-            force "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
-            force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
-            force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
-            force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
+            force "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
+            force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+            force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+            force "com.fasterxml.jackson.module:jackson-module-paranamer:${versions.jackson}"
+            force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
+            force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
+            force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
             force "org.apache.commons:commons-lang3:3.12.0"
             force "org.slf4j:slf4j-api:2.0.0"
         }
@@ -274,9 +271,7 @@ dependencies {
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
     implementation "org.opensearch:performanceanalyzer-rca:${version}"
-    implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
-    implementation "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.module:jackson-module-paranamer:${versions.jackson}"
     implementation(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1')
     implementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1')
     implementation(group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0') {

diff --git a/licenses/jackson-annotations-2.13.4.jar.sha1 b/licenses/jackson-annotations-2.13.4.jar.sha1
diff --git a/licenses/jackson-databind-2.13.4.2.jar.sha1 b/licenses/jackson-databind-2.13.4.2.jar.sha1
diff --git a/licenses/jackson-module-paranamer-2.13.4.jar.sha1 b/licenses/jackson-module-paranamer-2.13.4.jar.sha1
diff --git a/licenses/jackson-module-paranamer-2.14.1.jar.sha1 b/licenses/jackson-module-paranamer-2.14.1.jar.sha1
@@ -0,0 +1 @@
+58f6c8b06f2f0e78e933f9a2594381c058abbd99
diff --git a/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-3.0.0.0-SNAPSHOT.jar.sha1
@@ -1 +1 @@
-f6f83c4471cd122ccae11fa375c3c2e2715789a8
+5f095985e19dc87f62919f3bf4c2c29beee1006e