(jackrabbit-oak) branch trunk updated: OAK-11751 : removed usage of Guava's Sets (#2324)

[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 f6e9e84caa OAK-11751 : removed usage of Guava's Sets (#2324)
f6e9e84caa is described below

commit f6e9e84caab72ba1c3d955fedc6d7886df8b1b99
Author: Rishabh Kumar <rishabhdaim1...@gmail.com>
AuthorDate: Fri Jun 6 22:41:33 2025 +0530

    OAK-11751 : removed usage of Guava's Sets (#2324)
    
    Co-authored-by: Rishabh Kumar <d...@adobe.com>
---
 .../jackrabbit/oak/security/user/RepMembersConflictHandler.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
index 2bd350a6af..a5cc9566ed 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
@@ -33,8 +33,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.Sets;
-
 /**
  * The {@code RepMembersConflictHandler} takes care of merging the {@code 
rep:members} property
  * during parallel updates.
@@ -162,13 +160,13 @@ class RepMembersConflictHandler implements 
ThreeWayConflictHandler {
         Set<String> ourMembers = 
Collections.unmodifiableSet(SetUtils.toLinkedSet(ours.getValue(Type.STRINGS)));
 
         // merge ours and theirs to a de-duplicated set
-        Set<String> combined = new 
LinkedHashSet<>(Sets.intersection(ourMembers, theirMembers));
-        for (String m : Sets.difference(ourMembers, theirMembers)) {
+        Set<String> combined = new 
LinkedHashSet<>(SetUtils.intersection(ourMembers, theirMembers));
+        for (String m : SetUtils.difference(ourMembers, theirMembers)) {
             if (!base.contains(m)) {
                 combined.add(m);
             }
         }
-        for (String m : Sets.difference(theirMembers, ourMembers)) {
+        for (String m : SetUtils.difference(theirMembers, ourMembers)) {
             if (!base.contains(m)) {
                 combined.add(m);
             }