Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Revert 'Remove jackson-databind and jackson-annotations coming from core' #370

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ checkstyleMain.enabled = false
checkstyleTest.enabled = false

dependencies {

def jacksonVersion = "2.14.1"
def jacksonDataBindVersion = "2.14.1"
def nettyVersion = "${versions.netty}"

configurations {
Expand All @@ -251,13 +254,13 @@ dependencies {
configurations.all {
resolutionStrategy {
force 'junit:junit:4.13.1'
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 "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 "org.apache.commons:commons-lang3:3.12.0"
force "org.slf4j:slf4j-api:2.0.0"
}
Expand All @@ -271,7 +274,9 @@ 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.module:jackson-module-paranamer:${versions.jackson}"
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(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') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8ac9db160a515ba727b136ff0fb53a5a5340760e
61b74e933d98825e89beacffe29a3c7004153fbf