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 2bd350a6af6..a5cc9566edb 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.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 @@ private static void mergeChange(@NotNull NodeBuilder parent, @NotNull PropertySt Set ourMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(ours.getValue(Type.STRINGS))); // merge ours and theirs to a de-duplicated set - Set combined = new LinkedHashSet<>(Sets.intersection(ourMembers, theirMembers)); - for (String m : Sets.difference(ourMembers, theirMembers)) { + Set 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); }