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.

Sign up for GitHub

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

Update Jackson to 2.14.1 and fix dependency resolution issues #1159

Closed
wants to merge 1 commit into from
Closed

Update Jackson to 2.14.1 and fix dependency resolution issues #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
spring_version = "5.3.22"
jackson_version = "2.13.4"
jackson_version = "2.14.1"
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
version_tokens = opensearch_version.tokenize('-')
Expand Down
4 changes: 3 additions & 1 deletion integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ configurations.all {
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
Expand All @@ -77,7 +79,7 @@ dependencies {
include '*.jar'
builtBy 'compileJdbc'
}
testImplementation group: 'com.h2database', name: 'h2', version: '2.1.210'
testImplementation group: 'com.h2database', name: 'h2', version: '2.1.214'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressing https://www.mend.io/vulnerability-database/CVE-2022-45868

testImplementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
}
Expand Down
7 changes: 5 additions & 2 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ configurations.all {
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
Expand All @@ -104,8 +106,9 @@ compileTestJava {
dependencies {
api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
api "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
api "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
// Bundled with the OpenSearch (https://github.com/opensearch-project/OpenSearch/pull/5366)
compileOnly "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the dependency scope because of opensearch-project/OpenSearch@c6663fd

compileOnly "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"

api project(":ppl")
api project(':legacy')
Expand Down
2 changes: 1 addition & 1 deletion sql-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ repositories {

dependencies {
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.3"
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.14.1"
implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452'

testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1')
Expand Down