Skip to content

Commit 281c430

Browse files
authored
updating gson version to resolve conflict coming from core (#4176)
* updating gson version to resolve conflict coming from core Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * forcing error_prone_annotations Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
1 parent 5cabf63 commit 281c430

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

common/build.gradle

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

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

memory/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
3838
testImplementation "org.opensearch.test:framework:${opensearch_version}"
3939
testImplementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
40-
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
40+
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
4141
testImplementation group: 'org.json', name: 'json', version: '20231013'
4242
testImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
4343
testImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")

ml-algorithms/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
4444
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
4545
}
46-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
46+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
4747
implementation platform("ai.djl:bom:0.31.1")
4848
implementation group: 'ai.djl.pytorch', name: 'pytorch-model-zoo'
4949
implementation group: 'ai.djl', name: 'api'

plugin/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ dependencies {
8282
implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
8383
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
8484
}
85-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
85+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
86+
api "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
8687
implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${versions.commonslang}"
8788
implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
8889
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
@@ -430,6 +431,8 @@ configurations.all {
430431
resolutionStrategy.force "org.bouncycastle:bcprov-jdk18on:1.78.1"
431432
resolutionStrategy.force 'io.projectreactor:reactor-core:3.7.0'
432433
resolutionStrategy.force 'commons-beanutils:commons-beanutils:1.11.0'
434+
resolutionStrategy.force 'com.google.code.gson:gson:2.13.2'
435+
resolutionStrategy.force "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
433436
}
434437

435438
apply plugin: 'com.netflix.nebula.ospackage'

search-processors/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
dependencies {
3030
implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
3131
compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
32-
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
32+
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
3333
implementation "org.apache.commons:commons-lang3:${versions.commonslang}"
3434
implementation project(':opensearch-ml-memory')
3535
implementation group: 'org.opensearch', name: 'common-utils', version: "${common_utils_version}"

0 commit comments

Comments
 (0)