Skip to content

Commit 6ba54cf

Browse files
jngz-eszane-neo
andauthored
fix CVE from ai.djl dependency (#3478) (#3482)
Signed-off-by: Zan Niu <zaniu@amazon.com> Co-authored-by: zane-neo <zaniu@amazon.com>
1 parent 8f604cb commit 6ba54cf

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
testImplementation "org.opensearch.test:framework:${opensearch_version}"
2525

2626
compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
27-
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
27+
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
2828
compileOnly group: 'org.json', name: 'json', version: '20231013'
2929
testImplementation group: 'org.json', name: 'json', version: '20231013'
3030
implementation('com.google.guava:guava:32.1.3-jre') {

memory/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@ dependencies {
2828
implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
2929
implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "5.2.2"
3030
implementation "org.opensearch:common-utils:${common_utils_version}"
31-
implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
31+
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
32+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
33+
}
3234
testImplementation (group: 'junit', name: 'junit', version: '4.13.2') {
3335
exclude module : 'hamcrest'
3436
exclude module : 'hamcrest-core'
3537
}
3638
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
3739
testImplementation "org.opensearch.test:framework:${opensearch_version}"
3840
testImplementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
39-
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
41+
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
4042
testImplementation group: 'org.json', name: 'json', version: '20231013'
4143
testImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
4244
testImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
@@ -84,4 +86,4 @@ spotless {
8486

8587
eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('.eclipseformat.xml')
8688
}
87-
}
89+
}

ml-algorithms/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ dependencies {
4141
implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0'
4242
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
4343
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
44-
implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
45-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
46-
implementation platform("ai.djl:bom:0.28.0")
44+
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
45+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
46+
}
47+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
48+
implementation platform("ai.djl:bom:0.31.1")
4749
implementation group: 'ai.djl.pytorch', name: 'pytorch-model-zoo'
4850
implementation group: 'ai.djl', name: 'api'
4951
implementation group: 'ai.djl.huggingface', name: 'tokenizers'

plugin/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ dependencies {
7575
implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
7676
implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
7777
implementation group: 'com.networknt' , name: 'json-schema-validator', version: '1.4.0'
78-
implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
79-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
78+
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
79+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
80+
}
81+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
8082
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
8183
implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
8284
implementation "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0"

search-processors/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ repositories {
3030
dependencies {
3131
implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
3232
compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
33-
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
33+
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
3434
implementation 'org.apache.commons:commons-lang3:3.12.0'
3535
implementation project(':opensearch-ml-memory')
3636
implementation group: 'org.opensearch', name: 'common-utils', version: "${common_utils_version}"
3737
// https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5
3838
implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "5.2.2"
39-
implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
39+
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.2-jre') {
40+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
41+
}
4042
implementation group: 'org.json', name: 'json', version: '20231013'
4143
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
4244
testImplementation "org.opensearch.test:framework:${opensearch_version}"

0 commit comments

Comments
 (0)