JarHell caused by latest software.amazon.awssdk 2.20.141

Signed-off-by: Andriy Redko <[email protected]>
reta · Sep 6, 2023 · a286d8a · a286d8a
1 parent 301687d
commit a286d8a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 
 ### Fixed
+ - [BUG] JarHell caused by latest software.amazon.awssdk 2.20.141 ([#616](https://github.com/opensearch-project/opensearch-java/pull/616))
 
 ### Security
 

diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -55,6 +55,12 @@ plugins {
 }
 apply(plugin = "opensearch.repositories")
 
+configurations {
+    all {
+        exclude(group = "software.amazon.awssdk", module = "third-party-jackson-core")
+    }
+}
+
 checkstyle {
     toolVersion = "10.0"
 }

diff --git a/...-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java b/...-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
@@ -241,9 +241,15 @@ public void testCatPitSegments() throws Exception {
                 .pitSegments(r -> r.headers("index,shard,id,segment,size"));
 
         assertNotNull("PitSegmentsResponse.segments() is null", PitSegmentsResponse.valueBody());
-        assertTrue("PitSegmentsResponse.segments().size() == 0",
+
+        if (Version.fromString(version).onOrAfter(Version.fromString("2.10.0"))) {
+            assertTrue("PitSegmentsResponse.segments().size() == 0",
+                PitSegmentsResponse.valueBody().isEmpty());
+        } else {
+            assertTrue("PitSegmentsResponse.segments().size() == 0",
                 PitSegmentsResponse.valueBody().size() > 0);
         }
+    }
 
     private void createIndex(String indexName) throws Exception {
         CreateIndexResponse createResponse = javaClient().indices().create(b -> b.index(indexName));