You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2024/12/22 09:08:20 UTC

(jackrabbit-oak) 01/01: Merge pull request #1917 from apache/OAK-11321

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

commit 9b0b5be72e20a4c2f75ec0aefacdbc587c3fd514
Merge: 81abf85d20 0116e9ea57
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Sun Dec 22 14:38:13 2024 +0530

    Merge pull request #1917 from apache/OAK-11321
    
    OAK-11321 : renoved usage of guava Sets.union

 .../oak/plugins/blob/BlobGCCheckpointRefTest.java  |  3 +-
 .../jackrabbit/oak/plugins/blob/BlobGCTest.java    | 26 ++++-------
 .../oak/commons/collections/CollectionUtils.java   | 17 ++++++++
 .../oak/commons/collections/package-info.java      |  2 +-
 .../jackrabbit/oak/commons/FileIOUtilsTest.java    | 10 ++---
 .../commons/collections/CollectionUtilsTest.java   | 51 ++++++++++++++++++++++
 .../oak/plugins/commit/MergingNodeStateDiff.java   |  7 ++-
 .../oak/plugins/nodetype/TypeRegistration.java     |  3 +-
 .../jackrabbit/oak/query/ast/CoalesceImpl.java     |  4 +-
 .../composite/CompositeProviderCustomMixTest.java  |  8 ++--
 .../blob/datastore/DataStoreTrackerGCTest.java     | 12 ++---
 .../jackrabbit/oak/run/DataStoreCheckTest.java     | 10 ++---
 .../oak/composite/InitialContentMigrator.java      |  6 ++-
 .../oak/plugins/document/rdb/RDBDocumentStore.java |  2 +-
 .../oak/plugins/document/CommitQueueTest.java      |  4 +-
 .../plugins/document/SharedBlobStoreGCTest.java    |  7 ++-
 .../oak/upgrade/RepositorySidegrade.java           |  5 ++-
 .../jackrabbit/oak/upgrade/RepositoryUpgrade.java  |  8 ++--
 18 files changed, 118 insertions(+), 67 deletions(-)