Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Issue 623, fix security vulnerability regarding to depedencies common… #624

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
3 changes: 2 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ repositories {

dependencies {
compile "org.antlr:antlr4-runtime:4.7.1"
compile group: 'com.google.guava', name: 'guava', version: '23.0'
// https://github.com/google/guava/wiki/CVE-2018-10237
compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'

testCompile group: 'junit', name: 'junit', version: '4.12'
}
3 changes: 2 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ repositories {
}

dependencies {
compile group: 'com.google.guava', name: 'guava', version: '23.0'
// https://github.com/google/guava/wiki/CVE-2018-10237
compile group: 'com.google.guava', name: 'guava', version: '29.0-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.apache.commons', name: 'commons-lang3', version: '3.10'
Expand Down
3 changes: 2 additions & 1 deletion elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ repositories {
dependencies {
compile project(':core')
compile group: 'org.elasticsearch', name: 'elasticsearch', version: "${es_version}"
compile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: "${es_version}"
compile "io.github.resilience4j:resilience4j-retry:1.5.0"
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.4'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.4'
compileOnly group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: "${es_version}"

testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
testCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-high-level-client', version: "${es_version}"
}

test {
Expand Down
2 changes: 2 additions & 0 deletions integ-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ repositories {

configurations.all {
exclude group: "commons-logging", module: "commons-logging"
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
}

dependencies {
Expand Down
8 changes: 7 additions & 1 deletion legacy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ dependencies {
compile group: 'org.locationtech.spatial4j', name: 'spatial4j', version:'0.7'
compile group: "org.elasticsearch.plugin", name: 'parent-join-client', version: "${es_version}"
compile group: "org.elasticsearch.plugin", name: 'reindex-client', version: "${es_version}"
compile group: 'com.google.guava', name: 'guava', version:'23.0'
constraints {
implementation('commons-codec:commons-codec:1.13') {
because 'https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379'
}
}
// https://github.com/google/guava/wiki/CVE-2018-10237
implementation group: 'com.google.guava', name: 'guava', version: '29.0-jre'
compile group: 'org.json', name: 'json', version:'20180813'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
compile group: 'org.elasticsearch', name: 'elasticsearch', version: "${es_version}"
Expand Down
2 changes: 2 additions & 0 deletions plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ thirdPartyAudit.enabled = false
configurations.all {
// conflict with spring-jcl
exclude group: "commons-logging", module: "commons-logging"
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
}

dependencies {
Expand Down
3 changes: 2 additions & 1 deletion ppl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ dependencies {
antlr "org.antlr:antlr4:4.7.1"

compile "org.antlr:antlr4-runtime:4.7.1"
compile group: 'com.google.guava', name: 'guava', version: '23.0'
// https://github.com/google/guava/wiki/CVE-2018-10237
compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
compile group: 'org.elasticsearch', name: 'elasticsearch-x-content', version: "${es_version}"
compile group: 'org.json', name: 'json', version: '20180813'
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
Expand Down
3 changes: 2 additions & 1 deletion protocol/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ repositories {
}

dependencies {
compile group: 'com.google.guava', name: 'guava', version: '23.0'
// https://github.com/google/guava/wiki/CVE-2018-10237
compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
compile group: 'org.json', name: 'json', version: '20180813' //TODO: change to other JSON lib?
compile project(':core')

Expand Down
3 changes: 2 additions & 1 deletion sql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ dependencies {
antlr "org.antlr:antlr4:4.7.1"

compile "org.antlr:antlr4-runtime:4.7.1"
compile group: 'com.google.guava', name: 'guava', version:'23.0'
// https://github.com/google/guava/wiki/CVE-2018-10237
implementation group: 'com.google.guava', name: 'guava', version: '29.0-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'
Expand Down