This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11500 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e843f42096de34e253a4ff9b25123d9a489e0c88 Merge: 78fdcc0938 3a923e6827 Author: Julian Reschke <[email protected]> AuthorDate: Thu Feb 20 13:50:58 2025 +0100 Merge branch 'trunk' into OAK-11500 .../external/impl/ExternalLoginModule.java | 3 +- .../principal/ExternalGroupPrincipalProvider.java | 4 +- .../external/basic/DefaultSyncContextTest.java | 2 +- .../external/impl/AbstractDynamicTest.java | 2 +- .../external/impl/DynamicSyncContextTest.java | 2 +- .../impl/principal/AbstractPrincipalTest.java | 2 +- .../ExternalPrincipalConfigurationTest.java | 2 +- .../principal/SyncHandlerMappingTrackerTest.java | 2 +- .../ldap/impl/LdapIdentityProviderTest.java | 2 +- .../authorization/cug/impl/NestedCugHook.java | 2 +- .../cug/impl/CugPermissionProviderTest.java | 2 +- .../authorization/cug/impl/CugPolicyImplTest.java | 2 +- .../authorization/cug/impl/NestedCugHookTest.java | 2 +- .../authorization/cug/impl/VersionTest.java | 2 +- .../impl/PrincipalBasedAccessControlManager.java | 3 +- .../impl/PrincipalPolicyValidatorProvider.java | 2 +- .../principalbased/impl/PolicyValidatorTest.java | 2 +- .../impl/PrincipalPolicyImporterTest.java | 2 +- .../principalbased/PrinicipalBasedReadTest.java | 3 +- .../oak/commons/collections/IterableUtils.java | 48 +++++++++ .../oak/commons/collections/IterableUtilsTest.java | 111 +++++++++++++++++++++ .../jackrabbit/oak/core/SecureNodeBuilder.java | 2 +- .../oak/plugins/index/IndexPathServiceImpl.java | 2 +- .../jackrabbit/oak/plugins/index/IndexUpdate.java | 2 +- .../index/nodetype/NodeTypeIndexLookup.java | 3 +- .../index/property/PropertyIndexLookup.java | 4 +- .../plugins/index/property/PropertyIndexPlan.java | 4 +- .../plugins/index/reference/ReferenceIndex.java | 3 +- .../oak/plugins/index/upgrade/IndexDisabler.java | 2 +- .../migration/AbstractDecoratedNodeState.java | 4 +- .../migration/version/VersionHistoryUtil.java | 4 +- .../oak/plugins/name/NamespaceEditor.java | 2 +- .../plugins/nodetype/EffectiveNodeTypeImpl.java | 3 +- .../oak/plugins/nodetype/EffectiveType.java | 5 +- .../plugins/nodetype/ReadOnlyNodeTypeManager.java | 2 +- .../oak/plugins/nodetype/TypeRegistration.java | 2 +- .../oak/plugins/tree/impl/AbstractTree.java | 2 +- .../authentication/token/TokenLoginModule.java | 3 +- .../authentication/user/LoginModuleImpl.java | 3 +- .../authorization/AuthorizationContext.java | 3 +- .../accesscontrol/AccessControlManagerImpl.java | 2 +- .../accesscontrol/AccessControlValidator.java | 2 +- .../authorization/restriction/GlobsPattern.java | 2 +- .../authorization/restriction/SubtreePattern.java | 2 +- .../internal/SecurityProviderRegistration.java | 3 +- .../jackrabbit/oak/core/SecureNodeBuilderTest.java | 2 +- .../index/property/AsyncPropertyIndexTest.java | 2 +- .../plugins/index/property/PropertyIndexTest.java | 2 +- .../plugins/migration/FilteringNodeStateTest.java | 2 +- .../oak/plugins/tree/impl/TreeUtilTest.java | 2 +- .../AuthenticationConfigurationImplTest.java | 2 +- .../permission/PermissionHookTest.java | 2 +- .../internal/InternalSecurityProviderTest.java | 2 +- .../internal/SecurityProviderRegistrationTest.java | 2 +- .../security/user/AbstractAddMembersByIdTest.java | 2 +- .../oak/security/user/MembershipBaseTest.java | 2 +- .../oak/security/user/UserContextTest.java | 2 +- .../oak/security/user/action/GroupActionTest.java | 2 +- .../oak/composite/CompositeNodeStoreTest.java | 2 +- .../jackrabbit/oak/spi/state/NodeStoreTest.java | 2 +- .../jackrabbit/oak/jcr/delegate/NodeDelegate.java | 2 +- .../oak/jcr/observation/EventFactory.java | 2 +- .../jackrabbit/oak/jcr/ObservationQueueTest.java | 2 +- .../jackrabbit/oak/jcr/binary/BinaryAccessIT.java | 2 +- .../index/lucene/LuceneIndexNodeManager.java | 3 +- .../plugins/index/lucene/LucenePropertyIndex.java | 3 +- .../index/lucene/hybrid/LuceneDocumentHolder.java | 3 +- .../lucene/property/HybridPropertyIndexLookup.java | 3 +- .../property/UniquenessConstraintValidator.java | 3 +- .../index/lucene/util/IndexDefinitionBuilder.java | 3 +- .../lucene/writer/MultiplexingIndexWriter.java | 10 +- .../index/lucene/IndexAugmentorFactoryTest.java | 2 +- .../index/lucene/LucenePropertyIndexTest.java | 2 +- .../ConcurrentCopyOnReadDirectoryTest.java | 2 +- .../hybrid/LuceneJournalPropertyBuilderTest.java | 2 +- .../property/LuceneIndexPropertyQueryTest.java | 2 +- .../util/LuceneIndexDefinitionBuilderTest.java | 2 +- .../lucene/writer/MultiplexingIndexWriterTest.java | 2 +- .../indexer/document/NodeStateEntryTraverser.java | 4 +- .../org/apache/jackrabbit/oak/run/cli/Options.java | 3 +- .../flatfile/ChildNodeStateProviderTest.java | 2 +- .../apache/jackrabbit/oak/run/FrozenNodeRef.java | 2 +- .../oak/plugins/index/search/IndexDefinition.java | 2 +- .../search/spi/editor/FulltextDocumentMaker.java | 3 +- .../search/spi/editor/FulltextIndexEditor.java | 3 +- .../index/search/util/IndexDefinitionBuilder.java | 3 +- .../jackrabbit/oak/plugins/tree/TreeUtil.java | 2 +- .../oak/spi/security/CompositeConfiguration.java | 3 +- .../security/privilege/PrivilegeBitsProvider.java | 2 +- .../jackrabbit/oak/plugins/tree/TreeUtilTest.java | 2 +- .../spi/security/CompositeConfigurationTest.java | 2 +- .../oak/spi/security/OpenSecurityProviderTest.java | 2 +- .../security/authentication/AuthInfoImplTest.java | 2 +- .../authorization/permission/PermissionsTest.java | 2 +- .../principal/CompositePrincipalProviderTest.java | 2 +- .../privilege/PrivilegeBitsProviderTest.java | 2 +- .../apache/jackrabbit/oak/segment/MapRecord.java | 6 +- .../jackrabbit/oak/segment/file/tar/TarFiles.java | 2 +- .../oak/segment/file/proc/DataSegmentNodeTest.java | 2 +- .../jackrabbit/oak/plugins/document/Branch.java | 5 +- .../oak/plugins/document/DocumentNodeState.java | 2 +- .../oak/plugins/document/NodeDocument.java | 3 +- .../oak/plugins/document/TieredDiffCache.java | 3 +- .../plugins/document/VersionGarbageCollector.java | 2 +- .../plugins/document/cache/NodeDocumentCache.java | 5 +- .../document/mongo/MongoVersionGCSupport.java | 4 +- .../plugins/document/rdb/RDBDataSourceFactory.java | 70 ++++--------- .../plugins/document/rdb/RDBVersionGCSupport.java | 3 +- .../secondary/DelegatingDocumentNodeState.java | 2 +- .../oak/plugins/document/BackgroundWriteTest.java | 2 +- .../document/ClusterRevisionComparisonTest.java | 2 +- .../plugins/document/ConcurrentReadAndAddTest.java | 2 +- .../plugins/document/DocumentMKBuilderTest.java | 2 +- .../plugins/document/DocumentNodeStoreTest.java | 2 +- .../oak/plugins/document/DocumentSplitTest.java | 2 +- .../oak/plugins/document/JournalGCTest.java | 2 +- .../plugins/document/LargeMergeRecoveryTest.java | 2 +- .../plugins/document/LastRevRecoveryAgentTest.java | 2 +- .../oak/plugins/document/LastRevRecoveryTest.java | 2 +- .../document/LastRevSingleNodeRecoveryTest.java | 2 +- .../plugins/document/MissingLastRevSeekerTest.java | 2 +- .../MongoVersionGCSupportDefaultNoBranchTest.java | 2 +- .../oak/plugins/document/NodeDocumentTest.java | 2 +- .../oak/plugins/document/RevisionVectorTest.java | 2 +- .../oak/plugins/document/VersionGCQueryTest.java | 2 +- .../oak/plugins/document/VersionGCTest.java | 2 +- .../plugins/document/VersionGCWithSplitTest.java | 2 +- .../document/VersionGarbageCollectorIT.java | 2 +- .../document/bundlor/DocumentBundlingTest.java | 2 +- .../secondary/DelegatingDocumentNodeStateTest.java | 2 +- .../oak/plugins/document/util/UtilsTest.java | 2 +- .../oak/plugins/memory/ModifiedNodeState.java | 8 +- .../oak/plugins/memory/PropertyValues.java | 2 +- .../oak/spi/commit/BackgroundObserver.java | 2 +- .../jackrabbit/oak/spi/commit/MoveTracker.java | 4 +- pom.xml | 33 ++++++ 136 files changed, 389 insertions(+), 204 deletions(-)
