Skip to content

Version Bump: springframework and jackson #443

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
penghuo merged 2 commits into from
Feb 24, 2022
+10 −9
Merged

Version Bump: springframework and jackson #443

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
9a75758
Version Bump: springframework and jackson
penghuo Feb 23, 2022
87ba2bc
fix springframework
penghuo Feb 23, 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
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 {
compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
compile group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
compile project(':common')

testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.5.RELEASE'
testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.19.RELEASE'
testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
}
Expand Down
5 changes: 3 additions & 2 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,16 @@ configurations.all {
resolutionStrategy.force 'junit:junit:4.13.2'
// conflict with spring-jcl
exclude group: "commons-logging", module: "commons-logging"
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.10.5'
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6'
// 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.12.6'
}

dependencies {
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
compile project(":ppl")
compile project(':legacy')
compile 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 {
compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
compile group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
compile group: 'org.json', name: 'json', version: '20180813'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
compile project(':common')
compile project(':core')
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 {
compile "org.antlr:antlr4-runtime:4.7.1"
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
compile group: 'org.json', name: 'json', version:'20180813'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.19.RELEASE'
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.19.RELEASE'
compile project(':common')
compile project(':core')
compile project(':protocol')
Expand Down