Skip to content

Bump Jackson dependency version #745

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

Merged
dai-chen merged 2 commits into from
Aug 11, 2022
Merged

Bump Jackson dependency version #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
178c1ed
Bump jackson version and add version config in root gradle script
dai-chen Aug 11, 2022
603a3f1
Bump jackson version in JDBC driver
dai-chen Aug 11, 2022
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: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
spring_version = "5.3.22"
jackson_version = "2.13.3"
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
version_tokens = opensearch_version.tokenize('-')
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ repositories {

dependencies {
api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
api group: 'org.springframework', name: 'spring-context', version: '5.3.22'
api group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
api group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
api project(':common')

testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testImplementation group: 'org.springframework', name: 'spring-test', version: '5.3.22'
testImplementation group: 'org.springframework', name: 'spring-test', version: "${spring_version}"
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
}
Expand Down
6 changes: 3 additions & 3 deletions integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ 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.core:jackson-core:2.13.3'
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3'
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ dependencies {
api project(':core')
api group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
implementation group: 'org.json', name: 'json', version:'20180813'
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"
Expand Down
8 changes: 4 additions & 4 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ configurations.all {
// conflict with spring-jcl
exclude group: "commons-logging", module: "commons-logging"
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.3'
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
// 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-cbor:2.13.3'
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
}
compileJava {
options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
Expand All @@ -98,7 +98,7 @@ compileTestJava {
}

dependencies {
api group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
api project(":ppl")
api project(':legacy')
api project(':opensearch')
Expand Down
4 changes: 2 additions & 2 deletions ppl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ dependencies {
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
api group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
api group: 'org.json', name: 'json', version: '20180813'
implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22'
implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
implementation group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
implementation group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
api project(':common')
api project(':core')
Expand Down
8 changes: 4 additions & 4 deletions protocol/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ plugins {

dependencies {
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
implementation 'com.google.code.gson:gson:2.8.9'
implementation project(':core')
implementation project(':opensearch')
Expand All @@ -44,7 +44,7 @@ dependencies {
}

configurations.all {
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
}

test {
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.2.2'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.3"
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
4 changes: 2 additions & 2 deletions sql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
implementation "org.antlr:antlr4-runtime:4.7.1"
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
implementation group: 'org.json', name: 'json', version:'20180813'
implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22'
implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
implementation group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
implementation group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
implementation project(':common')
implementation project(':core')
api project(':protocol')
Expand Down