Skip to content

Commit d0ec7b4

Browse files
Resolve depdendency conflicts with grpc plugin.
Signed-off-by: Finn Carroll <carrofin@amazon.com>
1 parent 434e194 commit d0ec7b4

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,9 @@ configurations {
491491
force "net.bytebuddy:byte-buddy:1.17.6"
492492
force "org.ow2.asm:asm:9.8"
493493
force "com.google.j2objc:j2objc-annotations:3.0.0"
494-
force "com.google.protobuf:protobuf-java:3.25.5"
495-
force "io.perfmark:perfmark-api:0.27.0"
496-
force "com.google.guava:failureaccess:1.0.3"
494+
495+
// For org.opensearch.plugin:transport-grpc
496+
force "com.google.guava:failureaccess:1.0.2"
497497
}
498498
}
499499

sample-resource-plugin/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ configurations.all {
5656
force 'org.hamcrest:hamcrest:2.2'
5757
force 'org.mockito:mockito-core:5.18.0'
5858
force 'org.slf4j:slf4j-api:1.7.36'
59-
force 'com.google.errorprone:error_prone_annotations:2.36.0'
60-
force 'com.google.guava:guava:33.4.8-jre'
59+
60+
// Duplicate dependencies with conflicting versions from org.opensearch.plugin:transport-grpc
61+
// Force versions present in security plugin
62+
force "com.google.errorprone:error_prone_annotations:2.36.0"
63+
force "com.google.protobuf:protobuf-java:3.25.5"
64+
force "com.google.guava:guava:33.4.8-jre"
65+
force "com.google.guava:failureaccess:1.0.3"
6166
}
6267
}
6368

0 commit comments

Comments
 (0)