(jackrabbit-oak) branch trunk updated: OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with oak-commons (#2717)

[daim]

This is an automated email from the ASF dual-hosted git repository.

daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new eeca288ad4 OAK-12083 : replaced guava's 
Uninterruptible.joinUninterruptibly with oak-commons (#2717)
eeca288ad4 is described below

commit eeca288ad4b652af130dabdd91f63c42630bdd85
Author: Rishabh Kumar <rishabhdaim1...@gmail.com>
AuthorDate: Mon Feb 2 17:06:43 2026 +0530

    OAK-12083 : replaced guava's Uninterruptible.joinUninterruptibly with 
oak-commons (#2717)
---
 .../jackrabbit/oak/plugins/document/HierarchyConflictTest.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
index 2f0dce4aff..a19c58b767 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/HierarchyConflictTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static 
org.apache.jackrabbit.guava.common.util.concurrent.Uninterruptibles.joinUninterruptibly;
 import static org.apache.jackrabbit.oak.api.CommitFailedException.OAK;
 import static org.junit.Assert.fail;
 
@@ -109,7 +108,7 @@ public class HierarchyConflictTest {
                     
builder.getChildNode("foo").getChildNode("bar").child("qux");
                     nodeAdded.countDown();
                     // wait until r2 commits
-                    joinUninterruptibly(t);
+                    UninterruptibleUtils.joinUninterruptibly(t);
                 }
             });
 
@@ -167,7 +166,7 @@ public class HierarchyConflictTest {
                     builder.getChildNode("foo").getChildNode("bar").remove();
                     nodeRemoved.countDown();
                     // wait until r1 commits
-                    joinUninterruptibly(t);
+                    UninterruptibleUtils.joinUninterruptibly(t);
                 }
             });