Skip to content

Commit 8ede32d

Browse files
authored
Fix dependency conflict by excluding error_prone_annotations from Guava (#1573)
1 parent e740054 commit 8ede32d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ dependencies {
258258
zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${opensearch_build}"
259259
secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}"
260260
compileOnly fileTree(dir: knnJarDirectory, include: ["opensearch-knn-${opensearch_build}.jar", "remote-index-build-client-${opensearch_build}.jar"])
261-
compileOnly group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
261+
compileOnly (group: 'com.google.guava', name: 'guava', version:'32.1.3-jre') {
262+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
263+
}
262264
api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"
263265
testFixturesImplementation "org.opensearch.test:framework:${opensearch_version}"
264266
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: "${versions.commonslang}"
@@ -285,7 +287,9 @@ dependencies {
285287
runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
286288
testFixturesImplementation "org.opensearch:common-utils:${version}"
287289
testFixturesImplementation group: 'org.apache.commons', name: 'commons-lang3', version: "${versions.commonslang}"
288-
testFixturesCompileOnly group: 'com.google.guava', name: 'guava', version:'32.1.3-jre'
290+
testFixturesCompileOnly (group: 'com.google.guava', name: 'guava', version:'32.1.3-jre') {
291+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
292+
}
289293
testFixturesImplementation fileTree(dir: knnJarDirectory, include: ["opensearch-knn-${opensearch_build}.jar", "remote-index-build-client-${opensearch_build}.jar"])
290294
testImplementation fileTree(dir: knnJarDirectory, include: ["opensearch-knn-${opensearch_build}.jar", "remote-index-build-client-${opensearch_build}.jar"])
291295
testImplementation "org.opensearch.plugin:parent-join-client:${opensearch_version}"

0 commit comments

Comments
 (0)