From bad8e5b7ace4df64a73af6661720459c1af2f064 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Mon, 9 Mar 2026 15:34:15 +0300
Subject: [PATCH 1/2] Update commons.version from 3.0.2 to 3.0.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6085559d1d..bf8b398d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <localized.jars.classifier>i18n</localized.jars.classifier>
-        <commons.version>3.0.2</commons.version>
+        <commons.version>3.0.3</commons.version>
         <freemarker.version>2.3.34</freemarker.version>
         <metrics-core.version>4.2.30</metrics-core.version>
         <bc.fips.version>2.1.2</bc.fips.version>

From 548fd7e3218cbdd6651fa548801f4b4903ba4487 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Tue, 10 Mar 2026 12:41:39 +0300
Subject: [PATCH 2/2] FIX test signatures

---
 .../java/org/opends/server/backends/pluggable/Utils.java    | 3 ++-
 .../opends/server/controls/PersistentSearchControlTest.java | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/Utils.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/Utils.java
index bf1ffd1be8..e114e99e3d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/Utils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/Utils.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.backends.pluggable;
 
@@ -26,7 +27,7 @@ final class Utils
 {
   public static void assertIdsEquals(Iterator<EntryID> actual, long... expected)
   {
-    assertThat(actual).containsAll(asList(expected));
+    assertThat(actual).toIterable().containsAll(asList(expected));
   }
 
   public static void assertIsEmpty(EntryIDSet actual)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
index 15ef052e36..506638dd7c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.controls;
 
@@ -32,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.assertj.core.api.Assertions;
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.io.ASN1;
 import org.forgerock.opendj.io.ASN1Writer;
@@ -145,6 +147,10 @@ public void checkInvalidIntTest(Map<Integer, String> exceptedValues)
     }
   }
 
+  private void fail() {
+    Assertions.fail();
+  }
+
   /**
    * Test int to type.
    */