This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11612 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit abbbf7f9ae628003234e624104767502d2a293c8 Author: Rishabh Kumar <[email protected]> AuthorDate: Mon Mar 24 13:33:23 2025 +0530 OAK-11612 : removed usages of Guava's Sets.union --- .../java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java | 3 +-- .../java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java index 1b3b2b349f..8f56ea8842 100755 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java @@ -71,7 +71,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.util.Objects.requireNonNull; -import static org.apache.jackrabbit.guava.common.collect.Sets.union; import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier.copyProperties; @@ -473,7 +472,7 @@ public class RepositorySidegrade { } excludes.add("/:async"); - final Set<String> merges = union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), Set.of("/jcr:system")); + final Set<String> merges = SetUtils.union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), Set.of("/jcr:system")); NodeStateCopier.builder() .include(includes) .exclude(excludes.build()) diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java index 827bc7eabc..b45dc7c4e3 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.upgrade; import static java.util.Objects.requireNonNull; -import static org.apache.jackrabbit.guava.common.collect.Sets.union; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState.ALL; import static org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState.NONE; @@ -940,8 +939,8 @@ public class RepositoryUpgrade { private String copyWorkspace(NodeState sourceRoot, NodeBuilder targetRoot, String workspaceName) throws RepositoryException { final Set<String> includes = calculateEffectiveIncludePaths(includePaths, sourceRoot); - final Set<String> excludes = union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.excludePaths)), Set.of("/jcr:system/jcr:versionStorage")); - final Set<String> merges = union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), Set.of("/jcr:system")); + final Set<String> excludes = SetUtils.union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.excludePaths)), Set.of("/jcr:system/jcr:versionStorage")); + final Set<String> merges = SetUtils.union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), Set.of("/jcr:system")); logger.info("Copying workspace {} [i: {}, e: {}, m: {}]", workspaceName, includes, excludes, merges);
