Skip to content

Commit 7be86f3

Browse files
authored
JarHell caused by latest software.amazon.awssdk 2.20.141 (opensearch-project#616)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 301687d commit 7be86f3

3 files changed

Lines changed: 14 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
4141
### Removed
4242

4343
### Fixed
44+
- [BUG] JarHell caused by latest software.amazon.awssdk 2.20.141 ([#616](https://github.com/opensearch-project/opensearch-java/pull/616))
4445

4546
### Security
4647

java-client/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ plugins {
5555
}
5656
apply(plugin = "opensearch.repositories")
5757

58+
configurations {
59+
all {
60+
exclude(group = "software.amazon.awssdk", module = "third-party-jackson-core")
61+
}
62+
}
63+
5864
checkstyle {
5965
toolVersion = "10.0"
6066
}

java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,15 @@ public void testCatPitSegments() throws Exception {
241241
.pitSegments(r -> r.headers("index,shard,id,segment,size"));
242242

243243
assertNotNull("PitSegmentsResponse.segments() is null", PitSegmentsResponse.valueBody());
244-
assertTrue("PitSegmentsResponse.segments().size() == 0",
244+
245+
if (Version.fromString(version).onOrAfter(Version.fromString("2.10.0"))) {
246+
assertTrue("PitSegmentsResponse.segments().size() == 0",
247+
PitSegmentsResponse.valueBody().isEmpty());
248+
} else {
249+
assertTrue("PitSegmentsResponse.segments().size() == 0",
245250
PitSegmentsResponse.valueBody().size() > 0);
246251
}
252+
}
247253

248254
private void createIndex(String indexName) throws Exception {
249255
CreateIndexResponse createResponse = javaClient().indices().create(b -> b.index(indexName));

0 commit comments

Comments
 (0)