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 2023/04/29 05:05:24 UTC

[jackrabbit-oak] branch trunk updated (d252634507 -> 9b908a2a45)

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

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


    from d252634507 Merge pull request #911 from apache/OAK-10210
     add 9b908a2a45 OAK-10198: switch oak-core to shaded guava (#905)

No new revisions were added by this update.

Summary of changes:
 oak-core/pom.xml                                       | 11 +++++------
 .../java/org/apache/jackrabbit/oak/InitialContent.java |  2 +-
 .../src/main/java/org/apache/jackrabbit/oak/Oak.java   | 16 ++++++++--------
 .../java/org/apache/jackrabbit/oak/OakInitializer.java |  2 +-
 .../jackrabbit/oak/cache/impl/CacheStatsMetrics.java   |  4 ++--
 .../jackrabbit/oak/core/ContentRepositoryImpl.java     |  2 +-
 .../apache/jackrabbit/oak/core/ContentSessionImpl.java |  2 +-
 .../org/apache/jackrabbit/oak/core/ImmutableRoot.java  |  2 +-
 .../org/apache/jackrabbit/oak/core/MutableRoot.java    |  6 +++---
 .../org/apache/jackrabbit/oak/core/MutableTree.java    |  4 ++--
 .../apache/jackrabbit/oak/core/SecureNodeBuilder.java  | 10 +++++-----
 .../apache/jackrabbit/oak/core/SecureNodeState.java    | 10 +++++-----
 .../jackrabbit/oak/management/RepositoryManager.java   |  6 +++---
 .../jackrabbit/oak/namepath/impl/GlobalNameMapper.java |  4 ++--
 .../jackrabbit/oak/namepath/impl/LocalNameMapper.java  |  4 ++--
 .../oak/plugins/atomic/AtomicCounterEditor.java        |  8 ++++----
 .../plugins/atomic/AtomicCounterEditorProvider.java    |  2 +-
 .../oak/plugins/commit/AnnotatingConflictHandler.java  |  2 +-
 .../oak/plugins/commit/ChildOrderConflictHandler.java  |  2 +-
 .../oak/plugins/commit/ConflictValidator.java          |  2 +-
 .../oak/plugins/commit/JcrConflictHandler.java         |  2 +-
 .../oak/plugins/commit/MergingNodeStateDiff.java       |  4 ++--
 .../jackrabbit/oak/plugins/cow/BranchNodeStore.java    | 10 +++++-----
 .../oak/plugins/identifier/IdentifierManager.java      | 16 ++++++++--------
 .../jackrabbit/oak/plugins/index/AsyncIndexInfo.java   |  2 +-
 .../oak/plugins/index/AsyncIndexInfoServiceImpl.java   |  2 +-
 .../jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 18 +++++++++---------
 .../oak/plugins/index/AsyncIndexerService.java         |  6 +++---
 .../plugins/index/CompositeIndexEditorProvider.java    |  4 ++--
 .../oak/plugins/index/IndexInfoServiceImpl.java        |  8 ++++----
 .../oak/plugins/index/IndexMBeanRegistration.java      |  4 ++--
 .../oak/plugins/index/IndexPathServiceImpl.java        | 12 ++++++------
 .../jackrabbit/oak/plugins/index/IndexUpdate.java      | 12 ++++++------
 .../jackrabbit/oak/plugins/index/IndexUtils.java       |  8 ++++----
 .../oak/plugins/index/TrackingCorruptIndexHandler.java | 10 +++++-----
 .../oak/plugins/index/aggregate/AggregateIndex.java    |  4 ++--
 .../oak/plugins/index/aggregate/AggregationCursor.java |  4 ++--
 .../plugins/index/aggregate/SimpleNodeAggregator.java  |  2 +-
 .../oak/plugins/index/cursor/AncestorCursor.java       |  6 +++---
 .../jackrabbit/oak/plugins/index/cursor/Cursors.java   |  4 ++--
 .../oak/plugins/index/cursor/PathCursor.java           |  4 ++--
 .../oak/plugins/index/cursor/TraversingCursor.java     |  4 ++--
 .../index/datastore/DataStoreTextProviderService.java  |  4 ++--
 .../plugins/index/datastore/DataStoreTextWriter.java   | 12 ++++++------
 .../oak/plugins/index/fulltext/ExtractedText.java      |  2 +-
 .../plugins/index/importer/AbortingIndexerLock.java    |  2 +-
 .../oak/plugins/index/importer/AsyncLaneSwitcher.java  |  2 +-
 .../plugins/index/importer/IndexDefinitionUpdater.java |  8 ++++----
 .../oak/plugins/index/importer/IndexImporter.java      |  8 ++++----
 .../oak/plugins/index/importer/IndexerInfo.java        |  6 +++---
 .../oak/plugins/index/importer/NodeStoreUtils.java     |  4 ++--
 .../oak/plugins/index/importer/PropUtils.java          |  2 +-
 .../oak/plugins/index/inventory/IndexPrinter.java      |  6 +++---
 .../plugins/index/nodetype/NodeTypeIndexLookup.java    |  2 +-
 .../plugins/index/nodetype/NodeTypeIndexProvider.java  |  2 +-
 .../index/progress/IndexingProgressReporter.java       |  2 +-
 .../index/progress/NodeCounterMBeanEstimator.java      |  2 +-
 .../plugins/index/progress/SimpleRateEstimator.java    |  2 +-
 .../oak/plugins/index/property/Multiplexers.java       |  4 ++--
 .../index/property/OrderedPropertyIndexProvider.java   |  2 +-
 .../oak/plugins/index/property/PropertyIndex.java      |  4 ++--
 .../plugins/index/property/PropertyIndexEditor.java    |  6 +++---
 .../index/property/PropertyIndexInfoProvider.java      |  2 +-
 .../plugins/index/property/PropertyIndexLookup.java    |  6 +++---
 .../oak/plugins/index/property/PropertyIndexPlan.java  | 10 +++++-----
 .../plugins/index/property/PropertyIndexProvider.java  |  2 +-
 .../oak/plugins/index/property/PropertyIndexUtil.java  |  2 +-
 .../oak/plugins/index/property/RecursiveDelete.java    |  4 ++--
 .../oak/plugins/index/property/ValuePatternUtil.java   |  2 +-
 .../index/property/jmx/PropertyIndexAsyncReindex.java  |  2 +-
 .../plugins/index/property/jmx/PropertyIndexStats.java |  6 +++---
 .../property/strategy/ContentMirrorStoreStrategy.java  | 10 +++++-----
 .../property/strategy/FilteringIndexStoreStrategy.java |  4 ++--
 .../index/property/strategy/IndexStoreStrategy.java    |  2 +-
 .../property/strategy/UniqueEntryStoreStrategy.java    |  2 +-
 .../oak/plugins/index/reference/ReferenceEditor.java   | 12 ++++++------
 .../oak/plugins/index/reference/ReferenceIndex.java    | 14 +++++++-------
 .../index/reference/ReferenceIndexProvider.java        |  2 +-
 .../oak/plugins/index/upgrade/IndexDisabler.java       |  6 +++---
 .../oak/plugins/itemsave/ItemSaveValidator.java        |  2 +-
 .../jackrabbit/oak/plugins/lock/LockConstants.java     |  2 +-
 .../oak/plugins/metric/MetricStatisticsProvider.java   |  2 +-
 .../oak/plugins/metric/StatisticsProviderFactory.java  |  2 +-
 .../plugins/migration/AbstractDecoratedNodeState.java  |  8 ++++----
 .../oak/plugins/migration/FilteringNodeState.java      |  2 +-
 .../oak/plugins/migration/NodeStateCopier.java         |  6 +++---
 .../oak/plugins/migration/report/LoggingReporter.java  |  2 +-
 .../plugins/migration/version/VersionHistoryUtil.java  |  8 ++++----
 .../plugins/migration/version/VersionableEditor.java   |  2 +-
 .../migration/version/VersionablePropertiesEditor.java |  2 +-
 .../jackrabbit/oak/plugins/name/NameValidator.java     |  2 +-
 .../jackrabbit/oak/plugins/name/NamespaceEditor.java   |  4 ++--
 .../apache/jackrabbit/oak/plugins/name/Namespaces.java |  8 ++++----
 .../oak/plugins/name/ReadOnlyNamespaceRegistry.java    |  2 +-
 .../oak/plugins/nodetype/AbstractTypeDefinition.java   |  2 +-
 .../oak/plugins/nodetype/EffectiveNodeTypeImpl.java    | 12 ++++++------
 .../jackrabbit/oak/plugins/nodetype/EffectiveType.java | 12 ++++++------
 .../oak/plugins/nodetype/ItemDefinitionImpl.java       |  2 +-
 .../oak/plugins/nodetype/NodeDefinitionImpl.java       |  2 +-
 .../jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java  | 16 ++++++++--------
 .../oak/plugins/nodetype/ReadOnlyNodeTypeManager.java  |  6 +++---
 .../jackrabbit/oak/plugins/nodetype/TypeEditor.java    | 12 ++++++------
 .../jackrabbit/oak/plugins/nodetype/TypePredicate.java | 10 +++++-----
 .../oak/plugins/nodetype/TypeRegistration.java         | 16 ++++++++--------
 .../oak/plugins/nodetype/write/NodeTypeRegistry.java   |  2 +-
 .../plugins/nodetype/write/NodeTypeTemplateImpl.java   |  6 +++---
 .../nodetype/write/PropertyDefinitionTemplateImpl.java |  2 +-
 .../oak/plugins/observation/EventGenerator.java        |  6 +++---
 .../oak/plugins/observation/FilteringDispatcher.java   |  2 +-
 .../oak/plugins/observation/FilteringObserver.java     |  2 +-
 .../oak/plugins/observation/NodeObserver.java          |  4 ++--
 .../oak/plugins/observation/filter/ACFilter.java       |  2 +-
 .../oak/plugins/observation/filter/FilterBuilder.java  | 12 ++++++------
 .../oak/plugins/observation/filter/Filters.java        |  4 ++--
 .../plugins/observation/filter/GlobbingPathFilter.java |  8 ++++----
 .../plugins/observation/filter/GlobbingPathHelper.java |  2 +-
 .../oak/plugins/observation/filter/MoveFilter.java     |  2 +-
 .../plugins/observation/filter/PropertyPredicate.java  |  2 +-
 .../observation/filter/RelativePathSelector.java       |  2 +-
 .../plugins/observation/filter/UniversalFilter.java    |  2 +-
 .../oak/plugins/observation/filter/UuidPredicate.java  |  2 +-
 .../oak/plugins/tree/factories/TreeFactory.java        |  2 +-
 .../oak/plugins/tree/impl/AbstractMutableTree.java     |  6 +++---
 .../jackrabbit/oak/plugins/tree/impl/AbstractTree.java | 18 +++++++++---------
 .../jackrabbit/oak/plugins/tree/impl/HiddenTree.java   |  2 +-
 .../oak/plugins/tree/impl/ImmutableTree.java           |  2 +-
 .../oak/plugins/tree/impl/NodeBuilderTree.java         |  2 +-
 .../oak/plugins/tree/impl/TreeProviderService.java     |  2 +-
 .../oak/plugins/version/OrphanedVersionCleaner.java    |  2 +-
 .../oak/plugins/version/ReadOnlyVersionManager.java    |  2 +-
 .../oak/plugins/version/ReadWriteVersionManager.java   | 10 +++++-----
 .../apache/jackrabbit/oak/plugins/version/Utils.java   |  2 +-
 .../jackrabbit/oak/plugins/version/VersionEditor.java  |  2 +-
 .../jackrabbit/oak/plugins/version/VersionHook.java    |  8 ++++----
 .../oak/plugins/version/VersionStorageEditor.java      |  2 +-
 .../oak/plugins/version/VersionableState.java          |  4 ++--
 .../oak/query/NodeStateNodeTypeInfoProvider.java       |  2 +-
 .../apache/jackrabbit/oak/query/QueryEngineImpl.java   |  4 ++--
 .../org/apache/jackrabbit/oak/query/QueryImpl.java     | 14 +++++++-------
 .../org/apache/jackrabbit/oak/query/SQL2Parser.java    |  4 ++--
 .../jackrabbit/oak/query/SimpleExcerptProvider.java    |  4 ++--
 .../apache/jackrabbit/oak/query/UnionQueryImpl.java    | 10 +++++-----
 .../org/apache/jackrabbit/oak/query/ast/AndImpl.java   | 10 +++++-----
 .../jackrabbit/oak/query/ast/AstElementFactory.java    |  2 +-
 .../apache/jackrabbit/oak/query/ast/CoalesceImpl.java  |  2 +-
 .../apache/jackrabbit/oak/query/ast/ColumnImpl.java    |  2 +-
 .../org/apache/jackrabbit/oak/query/ast/InImpl.java    |  4 ++--
 .../apache/jackrabbit/oak/query/ast/LowerCaseImpl.java |  4 ++--
 .../oak/query/ast/NotFullTextSearchImpl.java           |  6 +++---
 .../org/apache/jackrabbit/oak/query/ast/OrImpl.java    | 12 ++++++------
 .../apache/jackrabbit/oak/query/ast/SelectorImpl.java  |  8 ++++----
 .../apache/jackrabbit/oak/query/index/FilterImpl.java  |  4 ++--
 .../apache/jackrabbit/oak/query/xpath/Statement.java   |  2 +-
 .../jackrabbit/oak/security/SecurityProviderImpl.java  |  4 ++--
 .../authentication/token/TokenConfigurationImpl.java   |  6 +++---
 .../authentication/token/TokenLoginModule.java         |  2 +-
 .../authentication/token/TokenProviderImpl.java        |  2 +-
 .../authentication/token/TokenValidatorProvider.java   |  2 +-
 .../security/authentication/user/LoginModuleImpl.java  |  2 +-
 .../authorization/AuthorizationConfigurationImpl.java  |  2 +-
 .../security/authorization/AuthorizationContext.java   |  2 +-
 .../authorization/AuthorizationInitializer.java        |  2 +-
 .../oak/security/authorization/accesscontrol/ACL.java  |  6 +++---
 .../accesscontrol/AccessControlImporter.java           |  2 +-
 .../accesscontrol/AccessControlManagerImpl.java        | 18 +++++++++---------
 .../accesscontrol/AccessControlValidator.java          |  8 ++++----
 .../authorization/accesscontrol/PolicyComparator.java  |  2 +-
 .../authorization/accesscontrol/ValidationEntry.java   |  2 +-
 .../composite/CompositeAccessControlManager.java       |  8 ++++----
 .../composite/CompositeAuthorizationConfiguration.java |  2 +-
 .../authorization/permission/ChildOrderDiff.java       |  4 ++--
 .../permission/CompiledPermissionImpl.java             |  4 ++--
 .../authorization/permission/EntryPredicate.java       |  2 +-
 .../permission/MountPermissionProvider.java            |  2 +-
 .../security/authorization/permission/NumEntries.java  |  2 +-
 .../permission/PermissionCacheBuilder.java             |  2 +-
 .../authorization/permission/PermissionEntry.java      |  2 +-
 .../permission/PermissionEntryProviderImpl.java        |  2 +-
 .../permission/PermissionStoreEditor.java              |  8 ++++----
 .../authorization/permission/PermissionUtil.java       |  2 +-
 .../authorization/permission/PermissionValidator.java  |  2 +-
 .../permission/VersionTreePermission.java              |  2 +-
 .../authorization/permission/VersionablePathHook.java  |  2 +-
 .../authorization/restriction/CurrentPattern.java      |  4 ++--
 .../authorization/restriction/GlobPattern.java         |  4 ++--
 .../authorization/restriction/GlobsPattern.java        |  2 +-
 .../authorization/restriction/ItemNamePattern.java     |  2 +-
 .../authorization/restriction/NodeTypePattern.java     |  2 +-
 .../authorization/restriction/PrefixPattern.java       |  2 +-
 .../restriction/PrincipalRestrictionProvider.java      |  2 +-
 .../restriction/RestrictionProviderImpl.java           |  2 +-
 .../authorization/restriction/SubtreePattern.java      |  2 +-
 .../security/internal/InternalSecurityProvider.java    |  2 +-
 .../oak/security/internal/Preconditions.java           |  2 +-
 .../internal/SecurityProviderRegistration.java         |  6 +++---
 .../oak/security/principal/EveryoneFilter.java         |  4 ++--
 .../oak/security/principal/PrincipalProviderImpl.java  |  4 ++--
 .../oak/security/privilege/PrivilegeManagerImpl.java   |  2 +-
 .../oak/security/user/AbstractGroupPrincipal.java      |  4 ++--
 .../oak/security/user/AuthorizableBaseProvider.java    |  2 +-
 .../jackrabbit/oak/security/user/AuthorizableImpl.java |  2 +-
 .../oak/security/user/AuthorizableIterator.java        |  4 ++--
 .../oak/security/user/CacheValidatorProvider.java      |  2 +-
 .../oak/security/user/DeclaredMembershipPredicate.java |  6 +++---
 .../oak/security/user/DynamicMembershipTracker.java    |  2 +-
 .../oak/security/user/EveryoneMembershipProvider.java  |  4 ++--
 .../apache/jackrabbit/oak/security/user/GroupImpl.java |  8 ++++----
 .../oak/security/user/MembershipProvider.java          |  2 +-
 .../jackrabbit/oak/security/user/MembershipWriter.java |  6 +++---
 .../jackrabbit/oak/security/user/PasswordHistory.java  |  4 ++--
 .../oak/security/user/RepMembersConflictHandler.java   |  4 ++--
 .../oak/security/user/UserConfigurationImpl.java       |  2 +-
 .../jackrabbit/oak/security/user/UserImporter.java     | 12 ++++++------
 .../jackrabbit/oak/security/user/UserInitializer.java  |  4 ++--
 .../jackrabbit/oak/security/user/UserManagerImpl.java  |  6 +++---
 .../oak/security/user/UserPrincipalProvider.java       | 12 ++++++------
 .../jackrabbit/oak/security/user/UserProvider.java     |  4 ++--
 .../jackrabbit/oak/security/user/UserValidator.java    |  2 +-
 .../security/user/autosave/AuthorizableWrapper.java    |  4 ++--
 .../oak/security/user/query/GroupPredicate.java        |  2 +-
 .../security/user/query/ResultRowToAuthorizable.java   |  2 +-
 .../oak/security/user/query/UserQueryManager.java      |  6 +++---
 .../apache/jackrabbit/oak/AbstractSecurityTest.java    |  2 +-
 .../test/java/org/apache/jackrabbit/oak/OakTest.java   |  2 +-
 .../apache/jackrabbit/oak/core/ImmutableRootTest.java  |  2 +-
 .../jackrabbit/oak/core/SecureNodeBuilderTest.java     |  4 ++--
 .../oak/namepath/impl/GlobalNameMapperTest.java        |  2 +-
 .../oak/namepath/impl/NamePathMapperImplTest.java      |  2 +-
 .../oak/plugins/atomic/AtomicCounterEditorTest.java    |  8 ++++----
 .../jackrabbit/oak/plugins/cow/COWNodeStoreTest.java   |  4 ++--
 .../plugins/index/AsyncIndexInfoServiceImplTest.java   |  2 +-
 .../plugins/index/AsyncIndexUpdateLeaseRemoveTest.java |  2 +-
 .../oak/plugins/index/AsyncIndexUpdateTest.java        | 12 ++++++------
 .../oak/plugins/index/AsyncIndexerServiceTest.java     |  4 ++--
 .../oak/plugins/index/IndexInfoServiceImplTest.java    |  2 +-
 .../oak/plugins/index/IndexPathServiceImplTest.java    |  4 ++--
 .../jackrabbit/oak/plugins/index/IndexUpdateTest.java  | 10 +++++-----
 .../jackrabbit/oak/plugins/index/IndexUtilsTest.java   |  2 +-
 .../index/aggregate/SimpleNodeAggregatorTest.java      |  2 +-
 .../index/importer/ClusterNodeStoreLockTest.java       |  2 +-
 .../index/importer/IndexDefinitionUpdaterTest.java     |  4 ++--
 .../oak/plugins/index/importer/IndexImporterTest.java  | 10 +++++-----
 .../index/inventory/IndexDefinitionPrinterTest.java    |  2 +-
 .../plugins/index/nodetype/NodeTypeIndexQueryTest.java |  2 +-
 .../oak/plugins/index/nodetype/NodeTypeIndexTest.java  |  2 +-
 .../index/progress/NodeCounterMBeanEstimatorTest.java  |  4 ++--
 .../plugins/index/property/AsyncPropertyIndexTest.java |  8 ++++----
 .../plugins/index/property/MultiPropertyOrTest.java    |  6 +++---
 .../plugins/index/property/MultipleIndicesTest.java    |  2 +-
 .../OrderedPropertyIndexEditorProviderTest.java        |  2 +-
 .../index/property/PropertyIndexDeprecatedTest.java    |  2 +-
 .../index/property/PropertyIndexDisabledTest.java      |  2 +-
 .../index/property/PropertyIndexInfoProviderTest.java  |  2 +-
 .../index/property/PropertyIndexLookupTest.java        |  2 +-
 .../plugins/index/property/PropertyIndexQueryTest.java |  2 +-
 .../oak/plugins/index/property/PropertyIndexTest.java  |  8 ++++----
 .../oak/plugins/index/property/RelativePathTest.java   |  2 +-
 .../index/property/SinglePropertyIndexQueryTests.java  |  4 ++--
 .../index/property/ValuePatternPropertyIndexTests.java |  2 +-
 .../oak/plugins/index/property/ValuePatternTest.java   |  2 +-
 .../index/property/jmx/PropertyIndexStatsTest.java     |  4 ++--
 .../strategy/ContentMirrorStoreStrategyTest.java       |  8 ++++----
 .../strategy/UniqueEntryStoreStrategyTest.java         |  6 +++---
 .../plugins/index/reference/ReferenceIndexTest.java    |  4 ++--
 .../oak/plugins/index/upgrade/IndexDisablerTest.java   |  4 ++--
 .../plugins/metric/MetricStatisticsProviderTest.java   |  6 +++---
 .../plugins/metric/StatisticsProviderFactoryTest.java  |  2 +-
 .../oak/plugins/migration/FilteringNodeStateTest.java  |  8 ++++----
 .../oak/plugins/nodetype/TypeEditorTest.java           |  2 +-
 .../plugins/nodetype/write/NodeTypeRegistryTest.java   |  8 ++++----
 .../observation/ChangeCollectorProviderTest.java       |  4 ++--
 .../oak/plugins/observation/NodeObserverTest.java      |  8 ++++----
 .../observation/filter/ChangeSetFilterImplTest.java    |  4 ++--
 .../oak/plugins/tree/impl/ImmutableTreeTest.java       |  6 +++---
 .../jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java |  2 +-
 .../plugins/version/ReadOnlyVersionManagerNtTest.java  |  2 +-
 .../plugins/version/ReadOnlyVersionManagerTest.java    |  2 +-
 .../apache/jackrabbit/oak/query/AbstractQueryTest.java |  4 ++--
 .../org/apache/jackrabbit/oak/query/IteratorsTest.java |  2 +-
 .../oak/query/OrQueryOrderLimitWithoutIndexTest.java   |  2 +-
 .../jackrabbit/oak/query/PropertyInexistenceTest.java  |  2 +-
 .../jackrabbit/oak/query/QueryCostOverheadTest.java    |  2 +-
 .../oak/query/QueryEngineSettingsServiceTest.java      |  4 ++--
 .../apache/jackrabbit/oak/query/ResultRowImplTest.java |  2 +-
 .../jackrabbit/oak/query/SQL2OptimiseQueryTest.java    |  4 ++--
 .../oak/query/SimpleExcerptProviderTest.java           |  4 ++--
 .../jackrabbit/oak/query/TraversalAvoidanceTest.java   |  4 ++--
 .../apache/jackrabbit/oak/query/UnionQueryTest.java    |  2 +-
 .../apache/jackrabbit/oak/query/ast/AndImplTest.java   |  4 ++--
 .../apache/jackrabbit/oak/query/ast/OrImplTest.java    |  2 +-
 .../jackrabbit/oak/query/index/IndexSelectionTest.java |  2 +-
 .../oak/query/index/TraversingIndexQueryTest.java      |  6 +++---
 .../oak/query/stats/QuerySimilarCostTest.java          |  2 +-
 .../AuthenticationConfigurationImplOSGiTest.java       |  2 +-
 .../AuthenticationConfigurationImplTest.java           |  2 +-
 .../authentication/Jackrabbit2ConfigurationTest.java   |  2 +-
 .../authentication/LoginContextProviderImplTest.java   |  2 +-
 .../authentication/token/AbstractTokenTest.java        |  2 +-
 .../authentication/token/TestCredentialsSupport.java   |  6 +++---
 .../security/authentication/token/TestLoginModule.java |  2 +-
 .../authentication/token/TokenAuthenticationTest.java  |  2 +-
 .../authentication/token/TokenCleanupTest.java         |  2 +-
 .../token/TokenConfigurationImplOSGiTest.java          |  2 +-
 .../token/TokenConfigurationImplTest.java              |  4 ++--
 .../token/TokenLoginModuleCredentialsSupportTest.java  |  2 +-
 .../authentication/token/TokenLoginModuleTest.java     |  6 +++---
 .../token/TokenProviderImplReadOnlyTest.java           |  2 +-
 .../authentication/user/LoginModuleImplTest.java       |  6 +++---
 .../AuthorizationConfigurationImplOSGiTest.java        |  8 ++++----
 .../authorization/AuthorizationContextTest.java        |  4 ++--
 .../authorization/AuthorizationInitializerTest.java    |  2 +-
 .../security/authorization/accesscontrol/ACLTest.java  |  8 ++++----
 .../accesscontrol/AccessControlImporterAbortTest.java  |  2 +-
 .../accesscontrol/AccessControlImporterBaseTest.java   |  6 +++---
 .../AccessControlImporterBesteffortTest.java           |  2 +-
 .../accesscontrol/AccessControlImporterIgnoreTest.java |  2 +-
 .../accesscontrol/AccessControlManagerImplTest.java    | 14 +++++++-------
 .../AccessControlManagerLimitedPermissionsTest.java    |  4 ++--
 .../accesscontrol/AccessControlValidatorTest.java      |  6 +++---
 .../AccessControlWithUnknownPrincipalTest.java         |  2 +-
 .../EffectivePoliciesByPrincipalsAndPathsTest.java     |  4 ++--
 .../authorization/accesscontrol/EntryTest.java         |  4 ++--
 .../accesscontrol/PolicyComparatorTest.java            |  2 +-
 .../authorization/accesscontrol/PrincipalACLTest.java  |  2 +-
 .../authorization/accesscontrol/ReadPolicyTest.java    |  2 +-
 .../accesscontrol/RemappedPrivilegeNamesTest.java      |  6 +++---
 .../accesscontrol/RemappedRestrictionNamesTest.java    |  2 +-
 .../authorization/accesscontrol/TestUtility.java       |  2 +-
 .../accesscontrol/ValidationEntryTest.java             |  2 +-
 .../composite/AbstractCompositeProviderTest.java       |  6 +++---
 .../composite/CompositeAccessControlManagerTest.java   |  8 ++++----
 .../CompositeAuthorizationConfigurationTest.java       |  2 +-
 .../composite/CompositePermissionProviderOrTest.java   |  4 ++--
 .../composite/CompositeProviderAllTest.java            |  4 ++--
 .../composite/CompositeProviderCoverageTest.java       |  4 ++--
 .../composite/CompositeProviderCustomMixTest.java      |  8 ++++----
 .../composite/CompositeProviderEmptyTest.java          |  2 +-
 .../composite/CompositeProviderFullScopeTest.java      |  6 +++---
 .../CompositeProviderGetTreePermissionTest.java        |  2 +-
 .../composite/CompositeProviderNoScopeTest.java        |  6 +++---
 .../composite/CompositeProviderScopeTest.java          |  8 ++++----
 .../composite/CompositeProviderSupportedTest.java      |  2 +-
 .../authorization/composite/FullScopeProvider.java     |  2 +-
 .../authorization/composite/LimitedScopeProvider.java  |  4 ++--
 .../authorization/evaluation/AbstractOakCoreTest.java  |  2 +-
 .../authorization/evaluation/AbstractQueryTest.java    |  6 +++---
 .../evaluation/ChildOrderPropertyTest.java             |  8 ++++----
 .../authorization/evaluation/HiddenPropertyTest.java   |  2 +-
 .../authorization/evaluation/RepoLevelPolicyTest.java  |  2 +-
 .../security/authorization/evaluation/RootTest.java    |  2 +-
 .../authorization/evaluation/TraversingQueryTest.java  |  6 +++---
 .../security/authorization/evaluation/TreeTest.java    |  2 +-
 .../authorization/permission/AbstractCacheTest.java    |  2 +-
 .../permission/AbstractPermissionRandomTestIT.java     |  4 ++--
 .../AdministrativePermissionProviderTest.java          |  2 +-
 .../authorization/permission/ChildOrderDiffTest.java   |  2 +-
 .../permission/CompiledPermissionImplTest.java         |  4 ++--
 .../permission/EmptyPermissionCacheTest.java           |  2 +-
 .../MountPermissionProviderRandomTestIT.java           |  2 +-
 .../permission/MountPermissionStoreTest.java           |  2 +-
 .../permission/MoveAwarePermissionValidatorTest.java   |  2 +-
 .../permission/PermissionCacheBuilderTest.java         |  4 ++--
 .../permission/PermissionCacheDefaultTest.java         |  2 +-
 .../permission/PermissionCachePathMapTest.java         |  2 +-
 .../permission/PermissionEntryCacheTest.java           |  2 +-
 .../permission/PermissionEntryProviderImplTest.java    |  4 ++--
 .../authorization/permission/PermissionHookTest.java   |  8 ++++----
 .../permission/PermissionProviderImplTest.java         |  4 ++--
 .../permission/PermissionStoreEditorTest.java          |  2 +-
 .../authorization/permission/PermissionUtilTest.java   |  2 +-
 .../permission/PermissionValidatorTest.java            |  4 ++--
 .../permission/PrincipalPermissionEntriesTest.java     |  4 ++--
 .../permission/RepoPolicyTreePermissionTest.java       |  2 +-
 .../permission/VersionTreePermissionTest.java          |  4 ++--
 .../permission/VersionablePathHookTest.java            |  2 +-
 .../restriction/AbstractRestrictionProviderTest.java   |  4 ++--
 .../restriction/CompositeRestrictionProviderTest.java  |  6 +++---
 .../authorization/restriction/CurrentPatternTest.java  |  4 ++--
 .../restriction/CurrentRestrictionTest.java            |  2 +-
 .../restriction/CustomRestrictionProviderTest.java     |  2 +-
 .../authorization/restriction/GlobPatternTest.java     |  4 ++--
 .../authorization/restriction/GlobsPatternTest.java    |  2 +-
 .../authorization/restriction/ItemNamePatternTest.java |  4 ++--
 .../restriction/ItemNameRestrictionTest.java           |  4 ++--
 .../authorization/restriction/NodeTypePatternTest.java |  4 ++--
 .../authorization/restriction/PrefixPatternTest.java   |  4 ++--
 .../restriction/PrincipalRestrictionProviderTest.java  |  4 ++--
 .../restriction/RestrictionProviderImplTest.java       |  6 +++---
 .../authorization/restriction/SubtreePatternTest.java  |  4 ++--
 .../restriction/WhiteboardRestrictionProviderTest.java |  4 ++--
 .../internal/InternalSecurityProviderTest.java         |  2 +-
 .../internal/SecurityProviderRegistrationTest.java     | 10 +++++-----
 .../principal/AbstractPrincipalProviderTest.java       |  2 +-
 .../oak/security/principal/EveryoneFilterTest.java     |  4 ++--
 .../principal/PrincipalConfigurationImplTest.java      |  2 +-
 .../principal/PrincipalProviderImplErrorTest.java      |  4 ++--
 .../security/principal/PrincipalProviderImplTest.java  |  6 +++---
 .../oak/security/privilege/JcrAllCommitHookTest.java   |  4 ++--
 .../jackrabbit/oak/security/privilege/JcrAllTest.java  |  6 +++---
 .../security/privilege/PrivilegeBitsProviderTest.java  |  4 ++--
 .../privilege/PrivilegeConfigurationImplTest.java      |  2 +-
 .../oak/security/privilege/PrivilegeContextTest.java   |  2 +-
 .../privilege/PrivilegeDefinitionWriterTest.java       |  2 +-
 .../oak/security/privilege/PrivilegeImplTest.java      | 10 +++++-----
 .../security/privilege/PrivilegeManagerImplTest.java   |  4 ++--
 .../oak/security/privilege/PrivilegeValidatorTest.java |  6 +++---
 .../oak/security/user/AbstractAddMembersByIdTest.java  |  2 +-
 .../oak/security/user/AbstractGroupPrincipalTest.java  |  4 ++--
 .../security/user/AddMembersByIdBestEffortTest.java    |  6 +++---
 .../oak/security/user/AddMembersByIdIgnoreTest.java    |  2 +-
 .../oak/security/user/AuthorizableIteratorTest.java    |  6 +++---
 .../security/user/AuthorizablePropertiesImplTest.java  |  2 +-
 .../oak/security/user/CachedGroupPrincipalTest.java    |  4 ++--
 .../security/user/DeclaredMembershipPredicateTest.java |  2 +-
 .../oak/security/user/DuplicateMembershipTest.java     |  2 +-
 .../security/user/DynamicMembershipTrackerTest.java    |  2 +-
 .../oak/security/user/EveryoneGroupTest.java           |  4 ++--
 .../jackrabbit/oak/security/user/GroupImplTest.java    |  4 ++--
 .../oak/security/user/ImpersonationImplEmptyTest.java  |  2 +-
 .../oak/security/user/ImpersonationImplTest.java       |  6 +++---
 .../security/user/InheritedMembersIteratorTest.java    |  4 ++--
 .../oak/security/user/IntermediatePathTest.java        |  2 +-
 .../oak/security/user/MembershipBaseTest.java          |  4 ++--
 .../oak/security/user/MembershipProviderTest.java      |  6 +++---
 .../oak/security/user/MembershipWriterTest.java        |  4 ++--
 .../user/PasswordExpiryAndForceInitialChangeTest.java  |  2 +-
 .../oak/security/user/PasswordExpiryHistoryTest.java   |  4 ++--
 .../oak/security/user/PasswordHistoryTest.java         |  6 +++---
 .../security/user/RemoveMembersByIdBestEffortTest.java |  2 +-
 .../oak/security/user/RemoveMembersByIdIgnoreTest.java |  2 +-
 .../security/user/RepMembersConflictHandlerTest.java   |  2 +-
 .../oak/security/user/SystemUserImplTest.java          |  2 +-
 .../security/user/UserConfigurationImplOSGiTest.java   |  2 +-
 .../oak/security/user/UserConfigurationImplTest.java   |  2 +-
 .../jackrabbit/oak/security/user/UserContextTest.java  |  8 ++++----
 .../oak/security/user/UserImporterBaseTest.java        |  4 ++--
 .../user/UserImporterImpersonationBestEffortTest.java  |  2 +-
 .../user/UserImporterImpersonationIgnoreTest.java      |  4 ++--
 .../security/user/UserImporterMembershipAbortTest.java |  2 +-
 .../user/UserImporterMembershipBesteffortTest.java     |  2 +-
 .../user/UserImporterMembershipIgnoreTest.java         |  6 +++---
 .../security/user/UserImporterSessionAutosaveTest.java |  2 +-
 .../jackrabbit/oak/security/user/UserImporterTest.java |  4 ++--
 .../oak/security/user/UserInitializerTest.java         |  2 +-
 .../oak/security/user/UserManagerImplActionsTest.java  |  2 +-
 .../oak/security/user/UserManagerImplTest.java         |  2 +-
 .../oak/security/user/UserPrincipalProviderTest.java   |  4 ++--
 .../user/UserPrincipalProviderWithCacheTest.java       |  2 +-
 .../oak/security/user/UserValidatorTest.java           |  2 +-
 .../apache/jackrabbit/oak/security/user/UtilsTest.java |  2 +-
 .../user/action/GroupActionBestEffortTest.java         |  2 +-
 .../oak/security/user/action/GroupActionTest.java      |  6 +++---
 .../user/action/PasswordValidationActionTest.java      |  2 +-
 .../oak/security/user/action/UserActionTest.java       |  2 +-
 .../security/user/autosave/AuthorizableImplTest.java   |  2 +-
 .../user/autosave/AuthorizableWrapperTest.java         |  2 +-
 .../oak/security/user/autosave/GroupImplTest.java      |  2 +-
 .../oak/security/user/query/GroupPredicateTest.java    |  2 +-
 .../oak/security/user/query/QueryUtilTest.java         |  4 ++--
 .../oak/security/user/query/ResultIteratorTest.java    |  4 ++--
 .../oak/security/user/query/UserQueryManagerTest.java  |  6 +++---
 .../security/user/query/XPathConditionVisitorTest.java |  4 ++--
 .../WhiteboardAuthorizableActionProviderTest.java      |  4 ++--
 .../whiteboard/WhiteboardAuthorizableNodeNameTest.java |  2 +-
 .../oak/spi/commit/BackgroundObserverTest.java         |  2 +-
 .../oak/spi/whiteboard/WhiteboardUtilsTest.java        |  4 ++--
 .../java/org/apache/jackrabbit/oak/util/NodeUtil.java  |  6 +++---
 .../org/apache/jackrabbit/oak/util/NodeUtilTest.java   |  2 +-
 .../lucene/property/PropertyIndexUpdateCallback.java   |  2 +-
 469 files changed, 965 insertions(+), 966 deletions(-)