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 re...@apache.org on 2024/12/28 11:06:46 UTC

(jackrabbit-oak) 01/01: OAK-11311: merge trunk

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

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

commit 16c2bdc558c12f42812a7797cec4199ee54b9785
Merge: 37ded9c8fa eed00e0230
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Sat Dec 28 12:06:28 2024 +0100

    OAK-11311: merge trunk

 .../impl/principal/ExternalGroupPrincipalTest.java |  1 -
 .../cug/impl/CugAccessControlManagerTest.java      |  3 +-
 .../oak/commons/collections/CollectionUtils.java   | 17 ++++++++
 .../oak/commons/collections/package-info.java      |  2 +-
 .../commons/collections/CollectionUtilsTest.java   | 51 ++++++++++++++++++++++
 .../security/user/RepMembersConflictHandler.java   |  2 +-
 .../oak/query/SQL2OptimiseQueryTest.java           |  5 ++-
 .../composite/AbstractCompositeProviderTest.java   |  7 +--
 .../composite/CompositeProviderCustomMixTest.java  |  4 +-
 .../jackrabbit/oak/explorer/NodeStoreTree.java     |  3 +-
 .../jackrabbit/oak/run/DataStoreCommandTest.java   |  4 +-
 .../oak/segment/SegmentBufferWriterPoolTest.java   |  6 +--
 .../oak/composite/it/CompositeTestSupport.java     |  3 +-
 .../plugins/document/DocumentNodeStoreBranch.java  |  5 +--
 .../oak/plugins/document/rdb/RDBDocumentStore.java |  2 +-
 15 files changed, 91 insertions(+), 24 deletions(-)