Merge pull request #28238 from vespa-engine/balder/bring-some-libs-up2date

- Bring some libraries up to date.

2 files changed, 4 insertions, 5 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
index 62b56e6e8ff..4956698cc2f 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.search.dispatch.LoadBalancer.GroupStatus;
 import com.yahoo.search.dispatch.searchcluster.Group;
 import com.yahoo.search.dispatch.searchcluster.Node;
 import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -34,7 +33,7 @@ public class LoadBalancerTest {
 
         Optional<Group> grp = lb.takeGroup(null);
         Group group = grp.orElseThrow(() -> {
-            throw new AssertionFailedError("Expected a SearchCluster.Group");
+            throw new IllegalStateException("Expected a SearchCluster.Group");
         });
         assertEquals(1, group.nodes().size());
     }
@@ -47,7 +46,7 @@ public class LoadBalancerTest {
 
         Optional<Group> grp = lb.takeGroup(null);
         Group group = grp.orElseThrow(() -> {
-            throw new AssertionFailedError("Expected a SearchCluster.Group");
+            throw new IllegalStateException("Expected a SearchCluster.Group");
         });
         assertEquals(1, group.nodes().size());
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
index 8422196638a..b325bde05d9 100644
--- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java
@@ -81,8 +81,8 @@ public class SortingTestCase {
 
     private void requireThatChineseHasCorrectRules(Collator col) {
         final int reorderCodes [] = {UScript.HAN};
-        assertEquals("14.0.0.0", col.getUCAVersion().toString());
-        assertEquals("153.112.40.0", col.getVersion().toString());
+        assertEquals("15.0.0.0", col.getUCAVersion().toString());
+        assertEquals("153.120.43.8", col.getVersion().toString());
         assertEquals(Arrays.toString(reorderCodes), Arrays.toString(col.getReorderCodes()));
 
         assertNotEquals("", ((RuleBasedCollator) col).getRules());