Merge branch 'master' into update-jdk-11

maximthomas

29.55.2025 9df0c0351216575123c607a39c5c7ec453bae64b

 opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java

@@ -13,6 +13,7 @@
 *
 * Copyright 2006-2010 Sun Microsystems, Inc.
 * Portions Copyright 2011-2016 ForgeRock AS.
 * Portions Copyright 2023-2025 3A Systems, LLC.
 */
package org.opends.server.replication;

@@ -333,7 +334,7 @@
    String rsDir = "generationIdTest" + replServerId + testCase + "Db";
    ReplicationServer replicationServer = new ReplicationServer(
        new ReplServerFakeConfiguration(rsPort, rsDir, 0, replServerId, 0, 1000, servers));
    Thread.sleep(2000);
    Thread.sleep(3000);
    return replicationServer;
  }

@@ -990,7 +991,7 @@
  private void waitForStableGenerationId(final long expectedGenId) throws Exception
  {
    TestTimer timer = new TestTimer.Builder()
      .maxSleep(20, SECONDS)
      .maxSleep(30, SECONDS)
      .sleepTimes(100, MILLISECONDS)
      .toTimer();
    timer.repeatUntilSuccess(new CallableVoid()