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 2025/01/07 08:08:49 UTC

(jackrabbit-oak) branch OAK-11286 updated (99cbbce925 -> a2b8992d43)

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

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


    from 99cbbce925 OAK-11286: blob-cloud, segment: update netty version to 4.1.115
     add b5c317af75 OAK-11278: Remove usage of Guava ImmutableMap.of() - multiple argument case (#1881)
     add ecfd1f6e12 OAK-11285 - Check if paths used in included/excluded Paths are absolute and fail if they are not (#1878)
     add 0d0303d57a OAK-11289: remove remaining elastiknn references in test (#1883)
     add b6432743d0 OAK-11221 : replaced guava evicting queue with LinkedhashMap
     add 981072eb59 Merge pull request #1875 from apache/OAK-11221_2
     add 753355cfab OAK-11288: remove usage of Immutable.Map.builder() (#1884)
     add cf4c063a63 OAK-11292: Remove usage of Guava ImmutableMap.copyOf() (#1886)
     add f82e1b8332 OAK-11294: fix broken logging in ClusterNodeInfo
     add 711d3fa389 OAK-11247: Migrated groovy test files to Java (#1851)
     add 0548176de7 OAK-11291 Tree store: speed up merging, and concurrent indexing (#1885)
     add e18d69cb91 OAK-11298 Fix test IncrementalStoreTest (#1888)
     add b74629c48a OAK-11290 - Improve logging of publish indexing job (#1887)
     add 6fa76f8760 OAK-11269 add dedicated workflow for checking commit messages (#1865)
     add 92e9020246 OAK-11297: remove usage of Guava Joiner (#1889)
     add 36789b06e6 OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml
     add 2dd56408e9 Revert "OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) - eventbus, html, xml"
     add 9237b75f66 OAK-11302: Remove usage of Guava annotations (#1896)
     add da01d4a5aa OAK-11303 - Add name of indexes to indexing reporter in import phase. (#1897)
     add 9bc52a54e0 OAK-10466: Allow to configure anonymous user disablement (#1882)
     add f0a5039a75 OAK-11266: add remote storage mode
     add 426f5fb5f3 OAK-11266: review changes
     add 2cfc5495c4 OAK-11266: add warn log
     add c410780683 Merge pull request #1894 from t-rana/issues/OAK-11266
     add ed078a0323 OAK-11265: replace s3.deleteObjects() with supported API for gcp
     add 50a82785b2 OAK-11265: revert import changes
     add 65c95fb68d OAK-11265: revert renameKeys() changes
     add 4092f42936 OAK-11265: revert renameKeys() changes
     add aecc2e54c7 Merge pull request #1900 from t-rana/issues/OAK-11265
     add 78451c4215 OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe… (#1877)
     add 7e52a01c4e OAK-11306: fix test cleanup
     add 85503352ac OAK-11306: import fix
     add c601a62f9b OAK-11306: review changes
     add 24f511ea53 OAK-11306: review changes
     add 5a0dbb9978 Merge pull request #1902 from t-rana/issues/OAK-11306
     add cd01131db4 OAK-11217: set existing object meta data for s3 only
     add 1a537f78b8 OAK-11217: review changes
     add 46666fbaf3 Merge pull request #1903 from t-rana/issues/OAK-11217
     add 5679e96f46 OAK-11304: Remove usage of Guava Collections2 (#1899)
     add a29bdfa227 OAK-11305: use single delete call for renameKeys()
     add 5c26126f13 OAK-11305: review changes
     add 8f74f3aa51 OAK-11305: review changes
     add 104c0b4043 Merge pull request #1901 from t-rana/issues/OAK-11305
     add 8c95416261 OAK-11310: add properties before datastore is initialized
     add cb77390a99 Merge pull request #1905 from t-rana/issues/OAK-11310
     add 3ff9dd8266 OAK-11308: Remove usage of org.apache.jackrabbit.guava.common.primitives.Longs (#1906)
     add a213da49cf OAK-11307: [oak-search-elastic] mixin filtered queries do not produce results (#1904)
     add d4dcc7e777 OAK-11194 : replaced usage of MoreObjects.ToStringHelper with StringJoiner
     add 0851aa24b6 Merge pull request #1907 from apache/OAK-11194
     add e2ce76ca09 OAK-11199: Java 23: getSubject is supported only if a security manager is allowed (#1891)
     add 141663a5db Revert "OAK-11269 add dedicated workflow for checking commit messages (#1865)"
     add c68af67fb9 OAK-11199: Java 23: getSubject is supported only if a security manager is allowed
     add 8157ffc8e8 OAK-11199: Java 23: getSubject is supported only if a security manager is allowed
     add 9652045051 OAK-6766: Convert oak-lucene to OSGi R7 annotations (#1352)
     add 807102ddb0 OAK-6772: Convert oak-solr-core to OSGi R7 annotations (#1365)
     add 437375bdc9 OAK-6767: Remove felix SCR annotation support from parent pom (#1910)
     add 166fc2aa19 OAK-11317 :removed usage of ImmutableSet from guava
     add 412cad0bd4 OAK-11317 : removed conversion to unmodifiableSet for test classes
     add b02f36f80b OAK-11317 : removed conversion to set twice for ExternalGroupPrincipalProviderTest
     add 47073558a4 OAK-11317 : removed unused imports
     add 81abf85d20 Merge pull request #1914 from apache/OAK-11317
     add 0116e9ea57 OAK-11321 : renoved usage of guava Sets.union
     add 9b0b5be72e Merge pull request #1917 from apache/OAK-11321
     add 7c2f6b2874 OAK-11327: Remove usage of Guava ImmutableListMultimap (#1918)
     add bd326d1911 OAK-11327: Remove usage of Guava ImmutableListMultimap - fix oak-store-composite ITs
     add 6d2996405f OAK-11317: Remove usage of Guava ImmutableSet - restore package version to previous value
     add c5222f71ee OAK-11328: Remove usage of Guava ImmutableList (test classes) (#1922)
     add f7e6e4b815 OAK-11322 : removed usage of guava Sets.intersection
     add eb518c8beb OAK-11322 : updated package version to 1.5.0
     add 2403944239 OAK-11322 : revert package update version
     add eed00e0230 Merge pull request #1919 from apache/OAK-11322
     add 09cf30ab3f OAK-11324 : removed usage of Guava's Sets.symmetricDifference
     add 78590cb471 OAK-11324 : replaced empty hashset constructor usage wth Set.of
     add 2d0834d410 Merge pull request #1924 from apache/OAK-11324
     add a758c65f68 OAK-11330: Remove usage of Guava ImmutableList (Builder) (#1926)
     add ca264ac43d OAK-11323 : removed usage of Guava's Sets.difference
     add 38a0dcb989 Merge pull request #1925 from apache/OAK-11323
     add 0b65f94f46 OAK-11325 : removed usage of Guava's Sets.powerSet
     add 8d6c904d13 Merge pull request #1927 from apache/OAK-11325
     add 10f5818806 OAK-11331 : removed usage of guava's Sets.filter
     add 002b5423e9 OAK-11331 : removed usage from LastRecoveryAgent file
     add 07c91e48f5 Merge pull request #1928 from apache/OAK-11331
     add e82f536ade OAK-11326 : removed the usage of Guava Sets
     add ec30fc3468 Merge pull request #1930 from apache/OAK-11326
     add ef83732307 OAK-11332: Remove usage of Guava ImmutableList (copyOf) (#1929)
     add 0466df2220 OAK-11337: Update (shaded) Guava to 33.4.0 (#1932)
     add c6561e53e6 OAK-11224: remove guava dependencies from POMs (ongoing) - oak-query-spi
     add acc60ccd68 OAK-11329: oak-auth-ldap: update mina dependency to 2.1.10 (#1933)
     add 29a7d8be5b OAK-11311: Remove usage of Guava ImmutableList.of() (#1923)
     add 30e4017ff0 OAK-11334 : removed usage of Guava Lists.reverse
     add 9eae47c6f6 Merge pull request #1931 from apache/OAK-11334
     add 8177f7a6b0 OAK-11319 Always execute apache-rat-plugin (#1912)
     add 26e6eeb249 OAK-11269 Commit Message Check (#1913)
     add 3816934056 OAK-11269: commit message check - allow format commonly used in this project (#1938)
     add 18acf67a38 OAK-11341: webapp: update Tomcat dependency to 9.0.98 (#1936)
     add 27efed7918 OAK-11342: update Tomcat JDBC dependency to 9.0.98 (#1940)
     add 28e5c03f67 OAK-11343: Update commons-io dependency to 2.18.0 (#1941)
     add c831560c5a OAK-11335 : removed usage of Guava's Lists.asList with Stream API
     add 179728b6aa Merge pull request #1934 from apache/OAK-11335
     add 786ddb4661 OAK-11300: shaded-guava: remove exports for packages that are not used (anymore) (#1898)
     add 1eaa89eaa5 OAK-11333 : removed usage of Guava's Lists.transform with Stream API
     add 3bbea540be Merge pull request #1942 from apache/OAK-11333
     add dccfdf9f34 OAK-11344: oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.27.1 (#1945)
     add fc6edc8fc3 OAK-11199: Java 23: getSubject is supported only if a security manager is allowed
     add a420a7731d OAK-11336 : removed usage of Guava's Lists
     add 0c77da0520 Merge pull request #1944 from apache/OAK-11336
     add d2ad0dfa9f OAK-11314: Deprecate oak-solr for eventual removal (#1943)
     add 486b78396e OAK-11348 : removed usage of Guava's MapS.unmodifiableNavigableMap
     add ea3f1961d2 Merge pull request #1946 from apache/OAK-11348
     add 129d0d16fd OAK-11349 : removed usage of Guava's Maps.newIdentityHashMap
     add 5d04e22363 Merge pull request #1947 from apache/OAK-11349
     add 01c6410aec OAK-11001: Update commons-lang3 dependency to 3.17.0 (#1952)
     add a2b8992d43 Merge branch 'trunk' into OAK-11286

No new revisions were added by this update.

Summary of changes:
 .../versions.properties => .commit-check.yml       |  26 +-
 .github/workflows/build.yml                        |   4 +-
 .github/workflows/commit-check.yml                 |  49 ++
 .github/workflows/stale.yml                        |   2 +-
 Jenkinsfile                                        |   2 +-
 .../external/basic/DefaultSyncConfig.java          |   8 +-
 .../external/impl/ExternalLoginModuleFactory.java  |   3 +-
 .../external/impl/jmx/Delegatee.java               |   4 +-
 .../impl/principal/AutoMembershipPrincipals.java   |   3 +-
 .../ExternalAuthorizableActionProvider.java        |   4 +-
 .../principal/ExternalGroupPrincipalProvider.java  |   4 +-
 .../ExternalIdentityRepositoryInitializer.java     |   6 +-
 .../ExternalIdentityValidatorProvider.java         |  15 +-
 .../principal/ExternalPrincipalConfiguration.java  |   6 +-
 .../principal/ExternalUserValidatorProvider.java   |   7 +-
 .../impl/principal/ProtectionConfigImpl.java       |   6 +-
 .../external/AbstractExternalAuthTest.java         |  25 +-
 .../external/ExternalIdentityRefTest.java          |   5 +-
 .../external/ExternalLoginAutoMembershipTest.java  |   9 +-
 .../external/TestIdentityProvider.java             |  10 +-
 .../external/basic/DefaultSyncConfigTest.java      |   8 +-
 .../external/basic/DefaultSyncContextTest.java     |   3 +-
 .../external/impl/AbstractDynamicTest.java         |  10 +-
 .../impl/CustomCredentialsSupportTest.java         |   3 +-
 .../external/impl/DefaultSyncConfigImplTest.java   |   3 +-
 .../external/impl/DynamicGroupsTest.java           |   6 +-
 .../external/impl/DynamicSyncContextTest.java      |   4 +-
 .../external/impl/ExternalLoginModuleTest.java     |  35 +-
 .../external/impl/jmx/DelegateeTest.java           |  44 +-
 .../external/impl/jmx/SyncMBeanImplTest.java       |  26 +-
 .../impl/principal/AbstractAutoMembershipTest.java |   5 +-
 .../principal/AbstractProtectionConfigTest.java    |   3 +-
 .../principal/AutoMembershipPrincipalsTest.java    |   3 +-
 .../impl/principal/AutoMembershipProviderTest.java |  20 +-
 .../impl/principal/AutomembershipServiceTest.java  |   5 +-
 .../DynamicGroupMembershipServiceTest.java         |   5 +-
 .../impl/principal/DynamicGroupValidatorTest.java  |   3 +-
 .../ExternalAuthorizableActionProviderTest.java    |   6 +-
 .../ExternalGroupPrincipalProviderDMTest.java      |   3 +-
 .../ExternalGroupPrincipalProviderTest.java        |  56 +--
 ...xternalGroupPrincipalProviderWithCacheTest.java |   8 +-
 .../impl/principal/ExternalGroupPrincipalTest.java |  12 +-
 .../principal/ExternalIdentityImporterTest.java    |   4 +-
 .../principal/ExternalIdentityValidatorTest.java   |  17 +-
 .../ExternalLoginCachedDynamicMembershipTest.java  |   5 +-
 .../ExternalPrincipalConfigurationTest.java        |   6 +-
 .../PrincipalProviderAutoMembershipTest.java       |  16 +-
 .../PrincipalProviderDeepNestingTest.java          |   7 +-
 .../impl/principal/SyncConfigTrackerTest.java      |  34 +-
 .../principal/SyncHandlerMappingTrackerTest.java   |  16 +-
 .../impl/principal/SystemPrincipalConfigTest.java  |   4 +-
 .../impl/principal/ValidatorNoProtectionTest.java  |   7 +-
 .../impl/principal/ValidatorNotDynamicTest.java    |   5 +-
 oak-auth-ldap/pom.xml                              |   2 +-
 .../ldap/impl/LdapIdentityProviderTest.java        |  16 +-
 .../cug/impl/CugAccessControlManager.java          |   3 +-
 .../authorization/cug/impl/CugConfiguration.java   |   3 +-
 .../authorization/cug/impl/CugExcludeImpl.java     |   7 +-
 .../authorization/cug/impl/AbstractCugTest.java    |  11 +-
 .../authorization/cug/impl/AccessControlTest.java  |   3 +-
 .../cug/impl/CugAccessControlManagerTest.java      |  34 +-
 .../cug/impl/CugConfigurationOsgiTest.java         |   7 +-
 .../cug/impl/CugConfigurationTest.java             |   9 +-
 .../authorization/cug/impl/CugContextTest.java     |   7 +-
 .../authorization/cug/impl/CugEvaluationTest.java  |  18 +-
 .../authorization/cug/impl/CugImportBaseTest.java  |   4 +-
 .../cug/impl/CugPermissionProviderTest.java        |   5 +-
 .../cug/impl/CugTreePermissionTest.java            |   5 +-
 .../authorization/cug/impl/CugValidatorTest.java   |  23 +-
 .../authorization/cug/impl/MoveRenameTest.java     |   4 +-
 .../authorization/cug/impl/NestedCugHookTest.java  |  10 +-
 .../security/authorization/cug/impl/NoCugTest.java |   3 +-
 .../authorization/cug/impl/SupportedPathsTest.java |   5 +-
 .../authorization/cug/impl/TopLevelPathTest.java   |   3 +-
 .../authorization/cug/impl/VersionTest.java        |   5 +-
 .../PrincipalBasedAuthorizationConfiguration.java  |   3 +-
 .../authorization/principalbased/impl/Utils.java   |   6 +-
 .../principalbased/impl/AbstractEntryTest.java     |   4 +-
 .../impl/AbstractPrincipalBasedTest.java           |  13 +-
 .../AccessControlManagerLimitedSystemUserTest.java |   3 +-
 .../impl/AccessControlManagerLimitedUserTest.java  |   8 +-
 .../principalbased/impl/EffectivePolicyTest.java   |   4 +-
 .../principalbased/impl/MockUtility.java           |   4 +-
 .../impl/PolicyValidatorLimitedUserTest.java       |   3 +-
 .../principalbased/impl/PolicyValidatorTest.java   |   7 +-
 .../PrincipalBasedAccessControlManagerTest.java    |  10 +-
 .../impl/PrincipalPolicyImplTest.java              |   7 +-
 .../impl/PrincipalPolicyImporterTest.java          |  11 +-
 .../impl/ReadablePathsAccessControlTest.java       |  18 +-
 .../impl/ReadablePathsPermissionTest.java          |   1 -
 .../jackrabbit/oak/benchmark/HybridIndexTest.java  |   3 +-
 .../suites/ScalabilityNodeRelationshipSuite.java   |   3 +-
 oak-benchmarks/pom.xml                             |   2 +-
 .../jackrabbit/oak/benchmark/AbstractTest.java     |  12 +-
 .../jackrabbit/oak/benchmark/BundlingNodeTest.java |  20 +-
 .../oak/benchmark/ConcurrentHasPermissionTest.java |   4 +-
 .../jackrabbit/oak/benchmark/CugOakTest.java       |   3 +-
 .../jackrabbit/oak/benchmark/FacetSearchTest.java  |   3 +-
 .../jackrabbit/oak/benchmark/LoginSystemTest.java  |   3 +-
 .../oak/benchmark/PropertyFullTextTest.java        |   6 +-
 .../jackrabbit/oak/benchmark/SearchTest.java       |   3 +-
 .../jackrabbit/oak/benchmark/SetPropertyTest.java  |   5 +-
 .../external/AbstractExternalTest.java             |   5 +-
 .../external/AutoMembershipTest.java               |   3 +-
 .../external/CachedMembershipLoginTest.java        |   3 +-
 .../authentication/external/ExternalLoginTest.java |   3 +-
 .../external/PrincipalNameResolutionTest.java      |   5 +-
 .../authorization/AbstractHasItemGetItemTest.java  |   3 +-
 .../GetPrivilegeCollectionIncludeNamesTest.java    |   5 +-
 .../principalbased/PermissionEvaluationTest.java   |   3 +-
 .../principalbased/PrinicipalBasedReadTest.java    |   5 +-
 .../java/org/apache/jackrabbit/oak/run/Main.java   |   5 +-
 .../blobstorage/AzureBlobStoreBackendTest.java     |   8 +-
 .../jackrabbit/oak/blob/cloud/s3/S3Backend.java    |  87 +++-
 .../jackrabbit/oak/blob/cloud/s3/S3Constants.java  |   5 +
 .../oak/blob/cloud/s3/S3DataStoreUtils.java        |  27 +-
 .../oak/blob/cloud/s3/TestS3DSWithSmallCache.java  |   2 +-
 .../oak/blob/cloud/s3/TestS3DataStore.java         |   2 +-
 .../jackrabbit/oak/blob/cloud/s3/TestS3Ds.java     |   4 +-
 .../oak/blob/cloud/s3/TestS3DsCacheOff.java        |   2 +-
 oak-blob-plugins/pom.xml                           |   4 +
 .../blob/AbstractSharedCachingDataStore.java       |   3 +-
 .../plugins/blob/DataStoreCacheUpgradeUtils.java   |   3 +-
 .../plugins/blob/MarkSweepGarbageCollector.java    |  39 +-
 .../oak/plugins/blob/UploadStagingCache.java       |  26 +-
 .../blob/datastore/SharedDataStoreUtils.java       |  11 +-
 .../directaccess/DataRecordDownloadOptions.java    |   4 +-
 .../directaccess/DataRecordUploadToken.java        |   8 +-
 .../blob/migration/DepthFirstNodeIterator.java     |   5 +-
 .../oak/plugins/blob/BlobGCCheckpointRefTest.java  |  10 +-
 .../jackrabbit/oak/plugins/blob/BlobGCTest.java    |  49 +-
 .../blob/ConsolidatedDataStoreStatsTest.java       |   1 -
 ...aredDataStoreMarkSweepGarbageCollectorTest.java |  10 +-
 .../datastore/ActiveDeletionTrackerStoreTest.java  |   1 -
 .../blob/datastore/BlobIdTrackerStoreTest.java     |   5 +-
 .../datastore/DataStoreBlobStoreStatsTest.java     |   1 -
 .../blob/datastore/DataStoreBlobStoreTest.java     |   4 +-
 .../AbstractDataRecordAccessProviderTest.java      |   1 -
 .../DataRecordDownloadOptionsTest.java             |   5 +-
 .../oak/spi/blob/AbstractBlobStoreTest.java        |   2 -
 oak-commons/pom.xml                                |  10 +-
 .../oak/commons/collections/CollectionUtils.java   | 112 ++++-
 .../oak/commons/jdkcompat/Java23Subject.java       | 115 +++++
 .../oak/commons/jdkcompat/package-info.java        |  25 +-
 .../jackrabbit/oak/commons/FileIOUtilsTest.java    |  15 +-
 .../commons/FileLineDifferenceIteratorTest.java    |  15 +-
 .../commons/collections/CollectionUtilsTest.java   | 286 ++++++++++++
 .../oak/commons/jdkcompat/Java23SubjectTest.java   |  74 +++
 .../oak/commons/sort/ExternalSortTest.java         |   3 +-
 .../oak/commons/sort/StringSortTest.java           |  21 +-
 .../jackrabbit/oak/cache/AbstractCacheStats.java   |  32 +-
 .../oak/commons/jmx/ManagementOperation.java       |  16 +-
 .../apache/jackrabbit/oak/spi/mount/MountInfo.java |   3 +-
 .../oak/spi/mount/SimpleMountInfoProvider.java     |   5 +-
 .../jackrabbit/oak/spi/observation/ChangeSet.java  |  12 +-
 .../oak/spi/whiteboard/WhiteboardUtils.java        |  23 +-
 .../jackrabbit/oak/spi/mount/MountInfoTest.java    |  15 +-
 .../oak/spi/whiteboard/DefaultWhiteboardTest.java  |   7 +-
 .../org/apache/jackrabbit/oak/InitialContent.java  |   7 +-
 .../main/java/org/apache/jackrabbit/oak/Oak.java   |  11 +-
 .../oak/cache/impl/CacheStatsMetrics.java          |   3 +-
 .../apache/jackrabbit/oak/core/MutableRoot.java    |  10 +-
 .../oak/plugins/commit/ConflictValidator.java      |   4 +-
 .../oak/plugins/commit/JcrConflictHandler.java     |   5 +-
 .../oak/plugins/commit/MergingNodeStateDiff.java   |   7 +-
 .../plugins/index/AsyncIndexInfoServiceImpl.java   |   7 +-
 .../oak/plugins/index/AsyncIndexUpdate.java        |   3 +-
 .../index/CompositeIndexEditorProvider.java        |   4 +-
 .../oak/plugins/index/IndexMBeanRegistration.java  |   3 +-
 .../jackrabbit/oak/plugins/index/IndexUtils.java   |   4 +-
 .../plugins/index/aggregate/AggregateIndex.java    |   9 +-
 .../oak/plugins/index/importer/IndexImporter.java  |  39 +-
 .../oak/plugins/index/importer/IndexerInfo.java    |   9 +-
 .../oak/plugins/index/inventory/IndexPrinter.java  |   4 +-
 .../index/nodetype/NodeTypeIndexProvider.java      |   3 +-
 .../index/property/PropertyIndexProvider.java      |   3 +-
 .../plugins/index/reference/ReferenceEditor.java   |   5 +-
 .../index/reference/ReferenceIndexProvider.java    |   3 +-
 .../oak/plugins/migration/NodeStateCopier.java     |  21 +-
 .../plugins/migration/report/LoggingReporter.java  |  15 +-
 .../migration/version/VersionHistoryUtil.java      |   3 +-
 .../oak/plugins/nodetype/TypeRegistration.java     |   3 +-
 .../plugins/observation/filter/FilterBuilder.java  |   3 +-
 .../observation/filter/GlobbingPathFilter.java     |   8 +-
 .../plugins/version/ReadWriteVersionManager.java   |   3 +-
 .../oak/plugins/version/VersionHook.java           |   5 +-
 .../oak/plugins/version/VersionStorageEditor.java  |   3 +-
 .../jackrabbit/oak/query/UnionQueryImpl.java       |   3 +-
 .../jackrabbit/oak/query/ast/CoalesceImpl.java     |   4 +-
 .../jackrabbit/oak/query/xpath/Statement.java      |   9 +-
 .../oak/security/SecurityProviderImpl.java         |   4 +-
 .../authentication/LoginContextProviderImpl.java   |   4 +-
 .../token/TokenConfigurationImpl.java              |   7 +-
 .../AuthorizationConfigurationImpl.java            |   7 +-
 .../authorization/AuthorizationInitializer.java    |   7 +-
 .../composite/CompositeAccessControlManager.java   |  50 +--
 .../CompositeAuthorizationConfiguration.java       |   6 +-
 .../permission/CompiledPermissionImpl.java         |   4 +-
 .../authorization/restriction/CurrentPattern.java  |   8 +-
 .../authorization/restriction/ItemNamePattern.java |   4 +-
 .../authorization/restriction/NodeTypePattern.java |   4 +-
 .../authorization/restriction/PrefixPattern.java   |   4 +-
 .../restriction/RestrictionProviderImpl.java       |  26 +-
 .../user/CachedPrincipalMembershipReader.java      |   4 +-
 .../security/user/RepMembersConflictHandler.java   |  16 +-
 .../oak/security/user/UserConfigurationImpl.java   |  11 +-
 .../jackrabbit/oak/security/user/UserImpl.java     |  22 +-
 .../jackrabbit/oak/AbstractSecurityTest.java       |   7 +
 .../jackrabbit/oak/core/SecureNodeBuilderTest.java |  13 +-
 .../oak/namepath/impl/GlobalNameMapperTest.java    |   4 +-
 .../oak/namepath/impl/NamePathMapperImplTest.java  |   5 +-
 .../plugins/atomic/AtomicCounterEditorTest.java    |   4 +-
 .../oak/plugins/cow/COWNodeStoreTest.java          |  13 +-
 .../plugins/index/AsyncCheckpointServiceTest.java  |   7 +-
 .../index/AsyncIndexInfoServiceImplTest.java       |   9 +-
 .../oak/plugins/index/AsyncIndexUpdateTest.java    |  18 +-
 .../oak/plugins/index/AsyncIndexerServiceTest.java |   9 +-
 .../plugins/index/IndexInfoServiceImplTest.java    |   1 -
 .../oak/plugins/index/IndexUpdateTest.java         |   8 +-
 .../index/importer/IndexDefinitionUpdaterTest.java |   5 +-
 .../index/nodetype/NodeTypeIndexQueryTest.java     |   7 +-
 .../plugins/index/nodetype/NodeTypeIndexTest.java  |   2 -
 .../progress/NodeCounterMBeanEstimatorTest.java    |   4 +-
 .../index/property/MultiPropertyOrTest.java        |  11 +-
 .../index/property/MultipleIndicesTest.java        |  19 +-
 .../OrderedPropertyIndexEditorProviderTest.java    |   3 +-
 .../index/property/PropertyIndexLookupTest.java    |   1 -
 .../plugins/index/property/RelativePathTest.java   |   7 +-
 .../property/SinglePropertyIndexQueryTests.java    |  11 +-
 .../property/ValuePatternPropertyIndexTests.java   |   5 +-
 .../index/property/jmx/PropertyIndexStatsTest.java |   1 -
 .../strategy/ContentMirrorStoreStrategyTest.java   |  13 +-
 .../index/reference/ReferenceIndexTest.java        |   9 +-
 .../oak/plugins/nodetype/TypeEditorTest.java       |  14 +-
 .../nodetype/write/NodeTypeRegistryTest.java       |   3 +-
 .../observation/ChangeCollectorProviderTest.java   |  10 +-
 .../filter/ChangeSetFilterImplTest.java            |   2 -
 .../jackrabbit/oak/query/AbstractQueryTest.java    |   2 -
 .../query/OrQueryOrderLimitWithoutIndexTest.java   |   1 -
 .../oak/query/PropertyInexistenceTest.java         |  22 +-
 .../oak/query/QueryCostOverheadTest.java           |  13 +-
 .../oak/query/SQL2OptimiseQueryTest.java           |  14 +-
 .../oak/query/TraversalAvoidanceTest.java          |   6 +-
 .../oak/query/index/IndexSelectionTest.java        |  10 +-
 .../oak/query/index/TraversingIndexQueryTest.java  | 114 +++--
 .../oak/query/stats/QuerySimilarCostTest.java      |   4 +-
 .../Jackrabbit2ConfigurationTest.java              |   5 +-
 .../LoginContextProviderImplTest.java              |   3 +-
 .../oak/security/authentication/PreAuthTest.java   |  13 +-
 .../token/TokenConfigurationImplOSGiTest.java      |   5 +-
 .../authentication/user/LoginModuleImplTest.java   |   8 +-
 .../AuthorizationConfigurationImplOSGiTest.java    |   5 +-
 .../authorization/AuthorizationContextTest.java    |   6 +-
 .../authorization/accesscontrol/ACLTest.java       |   6 +-
 .../AccessControlImporterAbortTest.java            |   5 +-
 .../AccessControlImporterBaseTest.java             |  50 +--
 .../AccessControlImporterBesteffortTest.java       |   7 +-
 .../AccessControlImporterIgnoreTest.java           |   7 +-
 .../AccessControlManagerImplTest.java              |  34 +-
 ...AccessControlManagerLimitedPermissionsTest.java |  12 +-
 .../accesscontrol/AccessControlValidatorTest.java  |  22 +-
 .../authorization/accesscontrol/EntryTest.java     |   7 +-
 .../accesscontrol/PrincipalACLTest.java            |   4 +-
 .../accesscontrol/RemappedPrivilegeNamesTest.java  |   6 +-
 .../RemappedRestrictionNamesTest.java              |   3 +-
 .../composite/AbstractCompositeProviderTest.java   | 101 +++--
 .../CompositeAccessControlManagerTest.java         |  13 +-
 .../CompositePermissionProviderOrTest.java         |   3 +-
 .../composite/CompositeProviderAllTest.java        |  85 ++--
 .../composite/CompositeProviderCoverageTest.java   |   7 +-
 .../composite/CompositeProviderCustomMixTest.java  |  54 ++-
 .../composite/CompositeProviderFullScopeTest.java  |  40 +-
 .../CompositeProviderGetTreePermissionTest.java    |   5 +-
 .../composite/CompositeProviderNoScopeTest.java    |  59 ++-
 .../composite/CompositeProviderScopeTest.java      |  38 +-
 .../composite/CompositeProviderSupportedTest.java  |   5 +-
 .../evaluation/ChildOrderPropertyTest.java         |   3 +-
 .../evaluation/RepoLevelPolicyTest.java            |   5 +-
 .../authorization/evaluation/RootTest.java         |  27 +-
 .../authorization/evaluation/TreeTest.java         |   3 +-
 .../permission/ChildOrderDiffTest.java             |   5 +-
 .../permission/PermissionHookTest.java             |   5 +-
 .../permission/PermissionValidatorTest.java        |   4 +-
 .../permission/PrincipalPermissionEntriesTest.java |   3 +-
 .../permission/RepoPolicyTreePermissionTest.java   |   3 +-
 .../permission/VersionablePathHookTest.java        |   4 +-
 .../AbstractRestrictionProviderTest.java           |   6 +-
 .../CompositeRestrictionProviderTest.java          |  29 +-
 .../restriction/CurrentPatternTest.java            |   7 +-
 .../restriction/ItemNamePatternTest.java           |   9 +-
 .../restriction/ItemNameRestrictionTest.java       |  16 +-
 .../restriction/NodeTypePatternTest.java           |   5 +-
 .../restriction/PrefixPatternTest.java             |   5 +-
 .../restriction/RestrictionProviderImplTest.java   |  25 +-
 .../restriction/SubtreePatternTest.java            |   5 +-
 .../internal/SecurityProviderRegistrationTest.java |  18 +-
 .../principal/PrincipalConfigurationImplTest.java  |   5 +-
 .../principal/PrincipalProviderImplTest.java       |   5 +-
 .../security/privilege/JcrAllCommitHookTest.java   |   4 +-
 .../privilege/PrivilegeBitsProviderTest.java       |  12 +-
 .../privilege/PrivilegeConfigurationImplTest.java  |   5 +-
 .../security/privilege/PrivilegeContextTest.java   |   6 +-
 .../oak/security/privilege/PrivilegeImplTest.java  |   9 +-
 .../privilege/PrivilegeManagerImplTest.java        |   7 +-
 .../security/privilege/PrivilegeValidatorTest.java |  27 +-
 .../security/user/AbstractGroupPrincipalTest.java  |   7 +-
 .../user/AddMembersByIdBestEffortTest.java         |   4 +-
 .../security/user/AddMembersByIdIgnoreTest.java    |   3 +-
 .../security/user/AuthorizableIteratorTest.java    |   5 +-
 .../user/AuthorizablePropertiesImplTest.java       |   6 +-
 .../security/user/CacheValidatorProviderTest.java  |   4 +-
 .../security/user/CachedGroupPrincipalTest.java    |   4 +-
 .../user/CachedPrincipalMembershipReaderTest.java  |   6 +-
 .../oak/security/user/EveryoneGroupTest.java       |  10 +-
 .../oak/security/user/GroupImplTest.java           |   6 +-
 .../security/user/ImpersonationImplEmptyTest.java  |   3 +-
 .../oak/security/user/ImpersonationImplTest.java   |  10 +-
 .../user/InheritedMembersIteratorTest.java         |   4 +-
 .../oak/security/user/IntermediatePathTest.java    |   5 +-
 .../oak/security/user/MembershipWriterTest.java    |   1 -
 .../oak/security/user/PasswordExpiryAdminTest.java |   4 +-
 .../security/user/PasswordExpiryHistoryTest.java   |   9 +-
 .../oak/security/user/PasswordHistoryTest.java     |   8 +-
 .../user/RemoveMembersByIdBestEffortTest.java      |   3 +-
 .../security/user/RemoveMembersByIdIgnoreTest.java |   3 +-
 .../user/RepMembersConflictHandlerTest.java        |   1 -
 .../oak/security/user/SystemUserImplTest.java      |   4 +-
 .../oak/security/user/UserContextTest.java         |   8 +-
 .../jackrabbit/oak/security/user/UserImplTest.java |  80 +++-
 .../oak/security/user/UserImporterBaseTest.java    |   5 +-
 .../UserImporterImpersonationBestEffortTest.java   |   6 +-
 .../user/UserImporterImpersonationIgnoreTest.java  |  22 +-
 .../user/UserImporterMembershipAbortTest.java      |   9 +-
 .../user/UserImporterMembershipBesteffortTest.java |   7 +-
 .../user/UserImporterMembershipIgnoreTest.java     |  35 +-
 .../user/UserImporterSessionAutosaveTest.java      |   5 +-
 .../oak/security/user/UserImporterTest.java        |  16 +-
 .../oak/security/user/UserInitializerTest.java     |   6 +-
 .../user/UserPrincipalProviderWithCacheTest.java   |  10 +-
 .../jackrabbit/oak/security/user/UtilsTest.java    |   3 +-
 .../oak/security/user/action/GroupActionTest.java  |   4 +-
 .../user/action/PasswordValidationActionTest.java  |   5 +-
 .../oak/security/user/action/UserActionTest.java   |   4 +-
 .../oak/security/user/query/QueryUtilTest.java     |  22 +-
 .../security/user/query/ResultIteratorTest.java    |  14 +-
 .../security/user/query/UserQueryManagerTest.java  |  10 +-
 .../WhiteboardAuthorizableActionProviderTest.java  |   3 +-
 .../org/apache/jackrabbit/oak/util/NodeUtil.java   |   4 +-
 .../apache/jackrabbit/oak/util/NodeUtilTest.java   |   4 +-
 oak-doc/src/site/markdown/query/property-index.md  |   2 +-
 .../security/authentication/externalloginmodule.md |   2 +-
 .../security/authentication/preauthentication.md   |   2 +-
 .../security/authentication/token/default.md       |   2 +-
 oak-doc/src/site/markdown/security/user/default.md |   2 +-
 .../oak/standalone/RepositoryInitializer.java      |   3 +-
 oak-examples/webapp/pom.xml                        |   2 +-
 .../apache/jackrabbit/j2ee/IndexInitializer.java   |   3 +-
 .../security/authentication/CustomCredentials.java |   4 +-
 .../ReadOnlyAuthorizationConfiguration.java        |   9 +-
 .../authorization/models/simplifiedroles/Role.java |  10 +-
 .../ThreeRolesAccessControlManager.java            |   5 +-
 .../ThreeRolesAuthorizationConfiguration.java      |   5 +-
 .../ThreeRolesPermissionProvider.java              |   6 +-
 .../principal/CustomPrincipalProvider.java         |   3 +-
 .../security/authentication/L9_NullLoginTest.java  |   3 +-
 .../accesscontrol/L4_EffectivePoliciesTest.java    |   3 +-
 .../L5_AccessControlListImplTest.java              |  19 +-
 .../L4_CustomAccessControlManagementTest.java      |   7 +-
 .../L5_CustomPermissionEvaluationTest.java         |  27 +-
 .../permission/L2_PermissionDiscoveryTest.java     |  15 +-
 .../L4_PrivilegesAndPermissionsTest.java           |  15 +-
 .../principalbased/AbstractPrincipalBasedTest.java |   8 +-
 .../privilege/L3_BuiltInPrivilegesTest.java        |   8 +-
 .../privilege/L7_PrivilegeDiscoveryTest.java       |  30 +-
 .../security/user/L3_UserVsPrincipalTest.java      |   3 +-
 .../security/user/L6_AuthorizableContentTest.java  |   5 +-
 .../user/L7_AuthorizablePropertiesTest.java        |   7 +-
 oak-it-osgi/src/test/resources/versions.properties |   2 +-
 .../java/org/apache/jackrabbit/oak/OakAssert.java  |   2 -
 .../org/apache/jackrabbit/oak/api/TreeTest.java    |   4 +-
 .../blob/datastore/DataStoreTrackerGCTest.java     |  15 +-
 .../index/AsyncIndexUpdateClusterTestIT.java       |   4 +-
 .../jackrabbit/oak/spi/state/CheckpointTest.java   |   6 +-
 .../jackrabbit/oak/jcr/delegate/NodeDelegate.java  |   6 +-
 .../oak/jcr/delegate/PropertyDelegate.java         |   9 +-
 .../oak/jcr/delegate/SessionDelegate.java          |   9 +-
 .../oak/jcr/delegate/WorkspaceDelegate.java        |   4 +-
 .../observation/ConsolidatedListenerMBeanImpl.java |   4 +-
 .../oak/jcr/observation/EventFactory.java          |  74 +--
 .../apache/jackrabbit/oak/jcr/query/RowImpl.java   |   6 +-
 .../oak/jcr/repository/RepositoryImpl.java         |   4 +-
 .../jackrabbit/oak/IndexCostEvaluationTest.java    |   3 +-
 .../oak/jcr/ConcurrentIndexUpdateIT.java           |   1 -
 .../jackrabbit/oak/jcr/LargeOperationIT.java       |   2 -
 .../apache/jackrabbit/oak/jcr/NamePathTest.java    |  26 +-
 .../jackrabbit/oak/jcr/ObservationQueueTest.java   |   2 -
 .../jackrabbit/oak/jcr/SameNameSiblingTest.java    |   9 +-
 .../oak/jcr/binary/BinaryAccessDSGCIT.java         |   1 -
 .../oak/jcr/observation/ObservationTest.java       |  13 +-
 .../security/authorization/HasPermissionTest.java  |   5 +-
 .../JackrabbitAccessControlManagerTest.java        |   5 +-
 .../security/authorization/UserManagementTest.java |   1 -
 .../privilege/PrivilegeRegistrationTest.java       |   3 +-
 .../jcr/security/user/FindAuthorizablesTest.java   |   1 -
 .../user/GroupImportWithActionsBestEffortTest.java |  10 +-
 .../security/user/GroupImportWithActionsTest.java  |   4 +-
 .../oak/jcr/security/user/RemappingTest.java       |  12 +-
 .../oak/jcr/security/user/UserQueryTest.java       |   6 +-
 .../oak/jcr/version/VersionableTest.java           |  20 +-
 oak-lucene/pom.xml                                 |  24 +-
 .../index/lucene/IndexAugmentorFactory.java        |  55 +--
 .../oak/plugins/index/lucene/IndexTracker.java     |  18 +-
 .../index/lucene/LuceneIndexDefinition.java        |   3 +-
 .../plugins/index/lucene/LuceneIndexProvider.java  |   3 +-
 .../index/lucene/LuceneIndexProviderService.java   | 459 +++++++++----------
 .../plugins/index/lucene/LucenePropertyIndex.java  |  17 +-
 .../ActiveDeletedBlobCollectorFactory.java         |   3 +-
 .../lucene/directory/CopyOnReadDirectory.java      |   4 +-
 .../index/lucene/directory/IndexRootDirectory.java |   4 +-
 .../index/lucene/directory/OakDirectory.java       |   5 +-
 .../oak/plugins/index/lucene/hybrid/NRTIndex.java  |   4 +-
 .../property/UniquenessConstraintValidator.java    |   4 +-
 .../lucene/reader/DefaultIndexReaderFactory.java   |   9 +-
 .../index/lucene/util/IndexDefinitionBuilder.java  |   5 +-
 .../index/lucene/writer/DefaultIndexWriter.java    |  13 +-
 .../oak/composite/blueGreen/Persistence.java       |   4 +-
 .../apache/jackrabbit/oak/jcr/AtomicCounterIT.java |   6 +-
 .../index/lucene/IndexAugmentorFactoryTest.java    |   1 -
 .../plugins/index/lucene/IndexNodeManagerTest.java |   9 +-
 .../oak/plugins/index/lucene/IndexPlannerTest.java |  16 +-
 .../lucene/IndexlaneRepositoryTraversalTest.java   |   5 +-
 .../index/lucene/LuceneIndexAugmentTest.java       |   1 -
 .../index/lucene/LuceneIndexDefinitionTest.java    |  10 +-
 .../index/lucene/LuceneIndexEditorTest.java        |   4 +-
 .../index/lucene/LuceneIndexPlannerCommonTest.java |   1 -
 .../oak/plugins/index/lucene/LuceneIndexTest.java  |  54 ++-
 .../index/lucene/LucenePropertyIndexTest.java      | 451 +++++++------------
 .../index/lucene/LuceneTestRepositoryBuilder.java  |   8 +
 .../MultiplexingLucenePropertyIndexTest.java       |   7 +-
 .../index/lucene/NodeStateAnalyzerFactoryTest.java |   7 +-
 .../index/lucene/ResultCountingIndexProvider.java  |  17 +-
 .../directory/ActiveDeletedBlobCollectorTest.java  |   1 -
 .../directory/IndexConsistencyCheckerTest.java     |   1 -
 .../index/lucene/hybrid/HybridIndexTest.java       |  34 +-
 .../index/lucene/hybrid/ReaderRefCountIT.java      |   4 +-
 .../index/lucene/property/BucketSwitcherTest.java  |  25 +-
 .../property/HybridPropertyIndexLookupTest.java    |  11 +-
 .../property/HybridPropertyIndexStorageTest.java   |   5 +-
 .../lucene/property/PropertyIndexCleanerTest.java  |   5 +-
 .../lucene/property/UniqueIndexCleanerTest.java    |   8 +-
 oak-parent/pom.xml                                 | 103 +----
 oak-pojosr/pom.xml                                 |  37 --
 .../jackrabbit/oak/run/osgi/ConfigTracker.java     |   4 +-
 .../run/osgi/AbstractRepositoryFactoryTest.groovy  | 253 -----------
 .../jackrabbit/oak/run/osgi/ConfigTest.groovy      | 151 -------
 .../run/osgi/DocumentNodeStoreConfigTest.groovy    | 458 -------------------
 .../oak/run/osgi/JaasConfigSpiTest.groovy          | 129 ------
 .../oak/run/osgi/JsonConfigRepFactoryTest.groovy   |  65 ---
 .../oak/run/osgi/LuceneSupportTest.groovy          | 114 -----
 .../oak/run/osgi/MBeanIntegrationTest.groovy       |  49 --
 .../oak/run/osgi/NodeStoreConfigTest.groovy        |  50 ---
 .../run/osgi/PropertyIndexReindexingTest.groovy    |  82 ----
 .../oak/run/osgi/RepositoryClosedTest.groovy       |  72 ---
 .../oak/run/osgi/RepositoryShutdownTest.groovy     |  84 ----
 .../oak/run/osgi/SecondaryStoreConfigIT.groovy     |  83 ----
 .../osgi/SecurityProviderRegistrationTest.groovy   | 390 ----------------
 .../oak/run/osgi/SegmentNodeStoreConfigTest.groovy | 158 -------
 .../run/osgi/TarSegmentNodeStoreConfigTest.groovy  |  70 ---
 .../oak/run/osgi/TokenAuthenticationTest.groovy    | 153 -------
 .../oak/run/osgi/TrackerSupportTest.groovy         |  54 ---
 .../run/osgi/AbstractRepositoryFactoryTest.java    | 285 ++++++++++++
 .../apache/jackrabbit/oak/run/osgi/ConfigTest.java | 168 +++++++
 .../oak/run/osgi/DocumentNodeStoreConfigTest.java  | 498 +++++++++++++++++++++
 .../oak/run/osgi/HybridIndexDisabledTest.java}     |  88 ++--
 .../jackrabbit/oak/run/osgi/JaasConfigSpiTest.java | 129 ++++++
 .../oak/run/osgi/JsonConfigRepFactoryTest.java     |  68 +++
 .../jackrabbit/oak/run/osgi/LuceneSupportTest.java | 144 ++++++
 .../oak/run/osgi/MBeanIntegrationTest.java         |  51 +++
 .../oak/run/osgi/NodeStoreConfigTest.java          |  51 +++
 .../oak/run/osgi/OakOSGiRepositoryFactoryTest.java |  20 +-
 .../oak/run/osgi/PropertyIndexReindexingTest.java  |  89 ++++
 .../oak/run/osgi/RepositoryClosedTest.java         |  68 +++
 .../oak/run/osgi/RepositoryShutdownTest.java       |  83 ++++
 .../oak/run/osgi/SecondaryStoreConfigIT.java       |  85 ++++
 .../run/osgi/SecurityProviderRegistrationTest.java | 392 ++++++++++++++++
 .../oak/run/osgi/SegmentNodeStoreConfigTest.java   | 164 +++++++
 .../oak/run/osgi/SimpleRepositoryFactoryTest.java  |  16 +-
 .../run/osgi/TarSegmentNodeStoreConfigTest.java    |  66 +++
 .../oak/run/osgi/TokenAuthenticationTest.java      | 168 +++++++
 .../oak/run/osgi/TrackerSupportTest.java           |  63 +++
 oak-query-spi/pom.xml                              |   5 -
 .../oak/spi/query/CompositeQueryIndexProvider.java |   6 +-
 .../jackrabbit/oak/index/IndexerMetrics.java       |  24 +-
 .../jackrabbit/oak/index/IndexerSupport.java       |  61 ++-
 .../jackrabbit/oak/index/OutOfBandIndexerBase.java |  64 ++-
 .../indexer/document/DocumentStoreIndexerBase.java |  23 +-
 .../flatfile/FlatFileNodeStoreBuilder.java         |  14 -
 .../document/flatfile/NodeStateEntryWriter.java    |   5 +-
 .../document/flatfile/PathElementComparator.java   |   4 +-
 .../document/flatfile/SimpleFlatFileUtil.java      |   4 +-
 .../document/flatfile/SimpleNodeStateHolder.java   |   6 +-
 .../document/flatfile/StateInBytesHolder.java      |   6 +-
 .../flatfile/pipelined/PipelinedTreeStoreTask.java |   2 +-
 .../oak/indexversion/PurgeOldIndexVersion.java     |   3 +-
 .../plugins/document/DocumentNodeStoreHelper.java  |   3 +-
 .../org/apache/jackrabbit/oak/run/cli/Options.java |   4 +-
 .../flatfile/ChildNodeStateProviderTest.java       |  22 +-
 .../flatfile/FlatFileStoreIteratorTest.java        |   1 -
 .../flatfile/NodeStateEntryWriterTest.java         |  13 +-
 .../index/indexer/document/flatfile/TestUtils.java |   9 +-
 .../jackrabbit/oak/index/ElasticIndexCommand.java  |  12 +-
 .../jackrabbit/oak/run/AvailableElasticModes.java  |  10 +-
 .../console/commands/PrintDocumentCommand.groovy   |   1 -
 .../jackrabbit/oak/explorer/NodeStoreTree.java     |   3 +-
 .../apache/jackrabbit/oak/index/IndexCommand.java  |  18 +-
 .../tika/CSVFileBinaryResourceProvider.java        |   4 +-
 .../apache/jackrabbit/oak/run/AvailableModes.java  | 106 ++---
 .../jackrabbit/oak/run/CreateGarbageCommand.java   |   3 +-
 .../jackrabbit/oak/run/DataStoreCheckCommand.java  |  10 +-
 .../jackrabbit/oak/run/DataStoreCommand.java       |  20 +-
 .../org/apache/jackrabbit/oak/run/HelpCommand.java |   4 +-
 .../jackrabbit/oak/run/RevisionsCommand.java       |   3 +-
 .../oak/index/DocumentStoreIndexerIT.java          |   1 -
 .../jackrabbit/oak/index/IncrementalStoreTest.java |  42 +-
 .../oak/plugins/document/RevisionsCommandTest.java |  14 +-
 .../jackrabbit/oak/run/DataStoreCheckTest.java     |  28 +-
 .../oak/run/DataStoreCommandMetadataTest.java      |  17 +-
 .../jackrabbit/oak/run/DataStoreCommandTest.java   |  43 +-
 .../oak/run/DataStoreCopyCommandTest.java          |   3 +-
 .../oak/run/DocumentStoreCheckCommandTest.java     |   4 +-
 oak-search-elastic/pom.xml                         |   5 -
 .../index/elastic/query/ElasticRequestHandler.java |   2 +-
 .../index/elastic/ElasticConnectionRule.java       |  11 +
 .../index/elastic/ElasticDynamicBoostTest.java     |   3 +-
 .../plugins/index/elastic/ElasticExcerptTest.java  |   4 +-
 .../plugins/index/elastic/ElasticFacetTest.java    |   3 +-
 .../index/elastic/ElasticFullTextAnalyzerTest.java |   3 +-
 .../index/elastic/ElasticFullTextIndexTest.java    |   3 +-
 .../elastic/ElasticFunctionIndexCommonTest.java    |   3 +-
 .../elastic/ElasticIndexAggregation2Test.java      |   3 +-
 .../index/elastic/ElasticIndexAggregationTest.java |   3 +-
 ...ndTraversalQueriesSimilarResultsCommonTest.java |   3 +-
 ...ElasticIndexDescendantSpellcheckCommonTest.java |   3 +-
 ...ElasticIndexDescendantSuggestionCommonTest.java |   3 +-
 .../ElasticIndexExclusionQueryCommonTest.java      |   3 +-
 .../ElasticIndexImproperUsageCommonTest.java       |   3 +-
 .../ElasticIndexPathRestrictionCommonTest.java     |   5 +-
 .../elastic/ElasticIndexPlannerCommonTest.java     |   3 +-
 .../elastic/ElasticIndexProviderServiceTest.java   |   2 +-
 .../index/elastic/ElasticIndexQueryCommonTest.java |   3 +-
 ...lasticIndexQuerySQL2OptimisationCommonTest.java |   7 +-
 .../elastic/ElasticIndexSuggestionCommonTest.java  |   3 +-
 .../plugins/index/elastic/ElasticOrderByTest.java  |   3 +-
 .../elastic/ElasticPropertyIndexCommonTest.java    |   3 +-
 .../plugins/index/elastic/ElasticReindexTest.java  |   3 +-
 .../index/elastic/ElasticSpellcheckCommonTest.java |   3 +-
 ...asticStrictPathRestrictionEnableCommonTest.java |   3 +-
 .../plugins/index/elastic/ElasticTestServer.java   |   6 +-
 .../plugins/index/elastic/ElasticTestUtils.java    |  11 -
 .../oak/plugins/index/search/Aggregate.java        |   5 +-
 .../oak/plugins/index/search/IndexDefinition.java  |  10 +-
 .../plugins/index/search/PropertyDefinition.java   |   4 +-
 .../search/spi/query/FulltextIndexTracker.java     |  18 +-
 .../index/search/util/IndexDefinitionBuilder.java  |   5 +-
 ...ndTraversalQueriesSimilarResultsCommonTest.java |   5 +-
 .../index/IndexExclusionQueryCommonTest.java       |  13 +-
 .../jackrabbit/oak/plugins/index/IndexOptions.java |   9 +-
 .../oak/plugins/index/IndexPlannerCommonTest.java  |  13 +-
 .../oak/plugins/index/OrderByCommonTest.java       |  10 +-
 .../oak/plugins/index/PropertyIndexCommonTest.java | 192 +++++---
 .../oak/plugins/index/search/AggregateTest.java    |  42 +-
 .../jackrabbit/oak/plugins/tree/TreeLocation.java  |   7 +-
 .../oak/spi/security/CompositeConfiguration.java   |  42 +-
 .../oak/spi/security/ConfigurationParameters.java  |  12 +-
 .../oak/spi/security/OpenSecurityProvider.java     |   5 +-
 .../authentication/AbstractLoginModule.java        |  10 +-
 .../spi/security/authentication/AuthInfoImpl.java  |  15 +-
 .../credentials/SimpleCredentialsSupport.java      |   6 +-
 .../token/CompositeTokenConfiguration.java         |   7 +-
 .../token/CompositeTokenProvider.java              |   4 +-
 .../security/authorization/accesscontrol/ACE.java  |   6 +-
 .../accesscontrol/AbstractAccessControlList.java   |   8 +-
 .../authorization/accesscontrol/ImmutableACL.java  |   3 +-
 .../restriction/AbstractRestrictionProvider.java   |  14 +-
 .../privilege/ImmutablePrivilegeDefinition.java    |  10 +-
 .../oak/spi/security/privilege/PrivilegeBits.java  |   6 +-
 .../security/privilege/PrivilegeBitsProvider.java  |  31 +-
 .../spi/security/privilege/PrivilegeConstants.java |   3 +-
 .../oak/spi/security/user/UserConstants.java       |   7 +
 .../action/DefaultAuthorizableActionProvider.java  |   4 +-
 .../oak/spi/security/user/package-info.java        |   2 +-
 .../apache/jackrabbit/oak/spi/xml/PropInfo.java    |   5 +-
 .../jackrabbit/oak/plugins/tree/TreeUtilTest.java  |  88 ++--
 .../spi/security/CompositeConfigurationTest.java   |  16 +-
 .../spi/security/ConfigurationParametersTest.java  |  24 +-
 .../authentication/AbstractLoginModuleTest.java    |  15 +-
 .../security/authentication/AuthInfoImplTest.java  |   3 +-
 .../CompositeCredentialsSupportTest.java           |   6 +-
 .../credentials/SimpleCredentialsSupportTest.java  |   5 +-
 .../token/CompositeTokenProviderTest.java          |   9 +-
 .../OpenAuthorizationConfigurationTest.java        |   5 +-
 .../authorization/accesscontrol/ACETest.java       |   7 +-
 .../AbstractAccessControlListTest.java             |   3 +-
 .../accesscontrol/AbstractAccessControlTest.java   |   3 +-
 .../accesscontrol/ImmutableACLTest.java            |   1 -
 .../authorization/accesscontrol/TestACL.java       |   1 -
 .../authorization/permission/PermissionsTest.java  |  35 +-
 .../AbstractRestrictionProviderTest.java           |   3 +-
 .../restriction/CompositePatternTest.java          |  16 +-
 .../CompositeRestrictionProviderTest.java          |  21 +-
 .../restriction/RestrictionImplTest.java           |   5 +-
 .../principal/CompositePrincipalProviderTest.java  |  17 +-
 .../principal/PrincipalManagerImplTest.java        |   4 +-
 .../security/principal/TestPrincipalProvider.java  |  22 +-
 .../ImmutablePrivilegeDefinitionTest.java          |  16 +-
 .../oak/spi/security/privilege/JcrAllUtilTest.java |   5 +-
 .../privilege/PrivilegeBitsProviderTest.java       |  58 +--
 .../spi/security/privilege/PrivilegeBitsTest.java  |   3 +-
 .../user/action/AccessControlActionTest.java       |   9 +-
 .../user/action/CompositeActionProviderTest.java   |   8 +-
 .../spi/security/user/util/PasswordUtilTest.java   |   5 +-
 .../oak/spi/security/user/util/UserUtilTest.java   |  38 +-
 .../jackrabbit/oak/spi/xml/NodeInfoTest.java       |   7 +-
 .../jackrabbit/oak/spi/xml/PropInfoTest.java       |  57 ++-
 .../oak/spi/xml/ReferenceChangeTrackerTest.java    |   3 +-
 .../oak/segment/azure/AzureJournalFile.java        |  10 +-
 .../oak/segment/azure/AzureJournalFileTest.java    |   6 +-
 .../azure/AzureSegmentStoreServiceTest.java        |   8 +-
 .../oak/segment/SegmentNodeStoreStats.java         |  17 +-
 .../file/CleanupFirstCompactionStrategy.java       |   4 +-
 .../oak/segment/file/DefaultCleanupStrategy.java   |   4 +-
 .../jackrabbit/oak/segment/file/FileReaper.java    |   3 +-
 .../jackrabbit/oak/segment/file/GCJournal.java     |  19 +-
 .../jackrabbit/oak/segment/file/proc/TarNode.java  |   5 +-
 .../codec/GetReferencesResponseEncoder.java        |   4 +-
 .../jackrabbit/oak/segment/tool/Compact.java       |   5 +-
 .../apache/jackrabbit/oak/segment/tool/Diff.java   |   4 +-
 .../segment/tool/iotrace/BreadthFirstTrace.java    |   3 +-
 .../oak/segment/tool/iotrace/DepthFirstTrace.java  |   4 +-
 .../oak/segment/tool/iotrace/IOTraceMonitor.java   |   3 +-
 .../segment/tool/iotrace/RandomAccessTrace.java    |   4 +-
 .../oak/segment/DefaultSegmentWriterTest.java      |   4 +-
 .../jackrabbit/oak/segment/InitializerTest.java    |   3 +-
 .../jackrabbit/oak/segment/MapRecordTest.java      |   9 +-
 .../oak/segment/SegmentBufferWriterPoolTest.java   |   6 +-
 .../oak/segment/SegmentDataStoreBlobGCIT.java      |  19 +-
 .../jackrabbit/oak/segment/SegmentParserTest.java  |   5 +-
 .../oak/segment/file/ReclaimersTest.java           |  42 +-
 .../spi/monitor/CompositeIOMonitorTest.java        |  11 +-
 .../tool/iotrace/BreadthFirstTraceTest.java        |  19 +-
 .../segment/tool/iotrace/DepthFirstTraceTest.java  |  19 +-
 .../oak/segment/tool/iotrace/IOTracerTest.java     |   3 +-
 .../oak/segment/tool/iotrace/RandomTraceTest.java  |   7 +-
 oak-shaded-guava/pom.xml                           |  24 +-
 oak-solr-core/pom.xml                              |  13 +-
 .../configuration/DefaultSolrConfiguration.java    |   3 +
 .../DefaultSolrConfigurationProvider.java          |   3 +
 .../solr/configuration/OakSolrConfiguration.java   |  21 +
 .../OakSolrConfigurationDefaults.java              |   3 +
 .../OakSolrConfigurationProvider.java              |   3 +
 .../RemoteSolrServerConfiguration.java             |   3 +
 .../configuration/SolrServerConfiguration.java     |   3 +
 .../SolrServerConfigurationDefaults.java           |   3 +
 .../SolrServerConfigurationProvider.java           |   3 +
 .../NodeStateSolrServerConfigurationProvider.java  |   1 +
 .../nodestate/NodeStateSolrServerProvider.java     |   3 +
 .../nodestate/NodeStateSolrServersObserver.java    |   3 +
 .../nodestate/OakSolrNodeStateConfiguration.java   |   3 +
 .../plugins/index/solr/index/SolrIndexEditor.java  |   3 +
 .../index/solr/index/SolrIndexEditorProvider.java  |   3 +
 .../osgi/NodeStateSolrServersObserverService.java  |  48 +-
 .../osgi/OakSolrConfigurationProviderService.java  | 242 ++++++----
 .../RemoteSolrServerConfigurationProvider.java     | 101 +++--
 .../solr/osgi/SolrIndexEditorProviderService.java  |  16 +-
 .../solr/osgi/SolrQueryIndexProviderService.java   |  56 ++-
 .../index/solr/osgi/SolrServerProviderService.java |  98 ++--
 .../index/solr/query/FilterQueryParser.java        |   3 +
 .../plugins/index/solr/query/SolrIndexLookup.java  |   3 +
 .../plugins/index/solr/query/SolrQueryIndex.java   |   3 +
 .../index/solr/query/SolrQueryIndexProvider.java   |   6 +-
 .../solr/server/DefaultSolrServerProvider.java     |   1 +
 .../plugins/index/solr/server/OakSolrServer.java   |   3 +
 .../solr/server/RemoteSolrServerProvider.java      |   3 +
 .../index/solr/server/SolrServerProvider.java      |   3 +
 .../index/solr/server/SolrServerRegistry.java      |   3 +
 .../index/solr/util/NodeTypeIndexingUtils.java     |   3 +
 .../index/solr/util/SolrIndexInitializer.java      |   3 +
 .../oak/plugins/index/solr/util/SolrUtils.java     |   3 +
 .../jackrabbit/oak/jcr/SolrOakRepositoryStub.java  |   1 +
 .../apache/jackrabbit/oak/jcr/query/FacetTest.java |   5 +-
 .../oak/jcr/query/QueryFulltextTest.java           |   3 +
 .../jackrabbit/oak/jcr/query/QueryJcrTest.java     |   3 +
 .../jackrabbit/oak/jcr/query/SpellcheckTest.java   |   5 +-
 .../jackrabbit/oak/jcr/query/SuggestTest.java      |   5 +-
 .../oak/jcr/query/TextExtractionQueryTest.java     |   1 +
 .../oak/plugins/index/solr/SolrBaseTest.java       |   5 +-
 .../oak/plugins/index/solr/TestUtils.java          |   3 +
 .../DefaultAnalyzersConfigurationTest.java         |   3 +
 .../EmbeddedSolrServerConfiguration.java           |   3 +
 .../configuration/SolrServerConfigurationTest.java |   3 +
 .../OakSolrNodeStateConfigurationTest.java         |   5 +-
 .../index/solr/index/SolrIndexEditorIT.java        |   3 +
 .../index/solr/index/SolrIndexEditorTest.java      |   3 +
 .../EmbeddedSolrServerConfigurationProvider.java   |  53 ++-
 .../index/solr/query/FilterQueryParserTest.java    |   3 +
 .../oak/plugins/index/solr/query/SolrIndexIT.java  |  31 +-
 .../index/solr/query/SolrIndexLookupTest.java      |   3 +
 .../index/solr/query/SolrQueryIndexTest.java       |   3 +
 .../index/solr/query/SubtreeSolrIndexIT.java       |   3 +
 .../solr/server/EmbeddedSolrServerProvider.java    |   3 +
 .../server/EmbeddedSolrServerProviderTest.java     |   3 +
 .../solr/server/RemoteSolrServerProviderIT.java    |   3 +
 .../index/solr/util/NodeTypeIndexingUtilsTest.java |   3 +
 oak-solr-osgi/pom.xml                              |   8 -
 .../oak/composite/CompositeNodeStore.java          |  10 +-
 .../oak/composite/CompositionContext.java          |   7 +-
 .../oak/composite/InitialContentMigrator.java      |   6 +-
 .../apache/jackrabbit/oak/composite/NodeMap.java   |  19 +-
 .../checks/NodeTypeMountedNodeStoreChecker.java    |   7 +-
 .../composite/CompositeNodeStoreServiceTest.java   |  12 +-
 .../it/BackwardCompatibleMountCompositeIT.java     |   5 +-
 .../oak/composite/it/CompositeTestSupport.java     |   3 +-
 .../oak/composite/it/MultiMountCompositeIT.java    |   5 +-
 .../document/CachingCommitValueResolver.java       |   3 +-
 .../oak/plugins/document/ClusterNodeInfo.java      |   3 +-
 .../plugins/document/ClusterNodeInfoDocument.java  |   3 +-
 .../oak/plugins/document/CommitQueue.java          |   5 +-
 .../jackrabbit/oak/plugins/document/Document.java  |   4 +-
 .../oak/plugins/document/DocumentNodeState.java    |   7 +-
 .../oak/plugins/document/DocumentNodeStore.java    |   7 +-
 .../plugins/document/DocumentNodeStoreBranch.java  |   5 +-
 .../DocumentNodeStoreServiceConfiguration.java     |  17 +-
 .../oak/plugins/document/FormatVersion.java        |   3 +-
 .../oak/plugins/document/LastRevRecoveryAgent.java |  21 +-
 .../oak/plugins/document/NodeDocument.java         |  16 +-
 .../oak/plugins/document/SplitOperations.java      |   4 +-
 .../plugins/document/VersionGarbageCollector.java  |   6 +-
 .../oak/plugins/document/bundlor/BundlorUtils.java |   4 +-
 .../plugins/document/bundlor/DocumentBundlor.java  |   3 +-
 .../oak/plugins/document/bundlor/Include.java      |   4 +-
 .../document/memory/MemoryDocumentStore.java       |  12 +-
 .../oak/plugins/document/mongo/MongoDBConfig.java  |   7 +-
 .../plugins/document/mongo/MongoDocumentStore.java |  34 +-
 .../document/mongo/MongoDocumentStoreMetrics.java  |   4 +-
 ...MongoDocumentStoreThrottlingMetricsUpdater.java |   4 +-
 .../oak/plugins/document/mongo/MongoStatus.java    |   7 +-
 .../document/mongo/MongoVersionGCSupport.java      |   4 +-
 .../persistentCache/PersistentCacheStats.java      |  22 +-
 .../oak/plugins/document/rdb/RDBDocumentStore.java |  35 +-
 .../oak/plugins/document/rdb/RDBJDBCTools.java     |  12 +-
 .../document/secondary/SecondaryStoreBuilder.java  |   4 +-
 .../document/secondary/SecondaryStoreCache.java    |  16 +-
 .../oak/plugins/document/util/MongoConnection.java |  23 +-
 .../oak/plugins/document/AbstractJournalTest.java  |   2 -
 .../plugins/document/BasicDocumentStoreTest.java   |   1 -
 .../document/BlobReferenceIteratorTest.java        |   5 +-
 .../document/BulkCreateOrUpdateClusterTest.java    |   2 -
 .../plugins/document/CacheConsistencyTestBase.java |   4 -
 .../oak/plugins/document/ClusterConflictTest.java  |   2 -
 .../oak/plugins/document/ClusterNodeInfoTest.java  |   1 -
 .../oak/plugins/document/CommitQueueTest.java      |   4 +-
 .../document/ConcurrentPrefetchAndUpdateIT.java    |   1 -
 .../plugins/document/DocumentNodeStoreTest.java    |  25 +-
 .../oak/plugins/document/DocumentSplitTest.java    |  16 +-
 .../document/DocumentStoreExceptionTest.java       |   2 -
 .../oak/plugins/document/DocumentStoreStatsIT.java |   2 -
 .../plugins/document/DocumentStoreStatsTest.java   |  31 +-
 .../oak/plugins/document/ExternalChangesTest.java  |   3 +-
 .../oak/plugins/document/FailingDocumentStore.java |   2 -
 .../oak/plugins/document/FormatVersionTest.java    |   4 +-
 .../oak/plugins/document/InitializerTest.java      |   5 +-
 .../oak/plugins/document/JournalEntryTest.java     |   2 -
 .../oak/plugins/document/JournalTest.java          |   2 -
 .../oak/plugins/document/MongoBlobGCTest.java      |  25 +-
 .../plugins/document/MongoDocumentStoreTest.java   |   1 -
 .../plugins/document/MultiDocumentStoreTest.java   |   2 -
 .../document/NodeDocumentIdComparatorTest.java     |   1 -
 .../oak/plugins/document/NodeDocumentTest.java     |  20 +-
 .../oak/plugins/document/PathComparatorTest.java   |   3 -
 .../oak/plugins/document/RevisionTest.java         |   2 -
 .../plugins/document/SharedBlobStoreGCTest.java    |  24 +-
 .../document/ThrottlingStatsCollectorImplTest.java |  34 +-
 .../oak/plugins/document/ValueMapTest.java         |   1 -
 .../oak/plugins/document/VersionGCTest.java        |   2 -
 .../plugins/document/VersionGCWithSplitTest.java   |   5 +-
 .../document/VersionGarbageCollectorIT.java        |  18 +-
 .../plugins/document/blob/RDBBlobStoreTest.java    |   7 +-
 .../bundlor/BundledDocumentDifferTest.java         |   7 +-
 .../document/bundlor/DocumentBundlingTest.java     |   5 +-
 .../document/mongo/MongodProcessFactory.java       |   3 +-
 .../plugins/document/rdb/RDBDocumentStoreTest.java |   2 -
 .../secondary/SecondaryStoreCacheTest.java         |  16 +-
 .../secondary/SecondaryStoreObserverTest.java      |  10 +-
 .../oak/plugins/document/util/BaseUpdaterTest.java |   5 +-
 .../document/util/CreateMetricUpdaterTest.java     |  17 +-
 .../document/util/MergeSortedIteratorsTest.java    |   2 -
 .../util/ReadOnlyDocumentStoreWrapperTest.java     |   1 -
 .../document/util/UpsertMetricUpdaterTest.java     |  15 +-
 .../oak/plugins/document/util/UtilsTest.java       |  13 +-
 .../apache/jackrabbit/oak/json/JsonSerializer.java |   4 +-
 .../oak/plugins/memory/MemoryNodeBuilder.java      |  14 +-
 .../oak/plugins/value/jcr/BinaryImpl.java          |   7 +-
 .../jackrabbit/oak/spi/commit/CommitInfo.java      |  14 +-
 .../jackrabbit/oak/spi/commit/MoveTracker.java     |   8 +-
 .../jackrabbit/oak/spi/filter/PathFilter.java      |  12 +-
 .../oak/plugins/memory/MemoryNodeBuilderTest.java  |   4 +-
 .../jackrabbit/oak/spi/commit/MoveTrackerTest.java |   5 +-
 .../jackrabbit/oak/spi/filter/PathFilterTest.java  |  26 ++
 .../jackrabbit/oak/spi/state/MoveDetectorTest.java |   5 +-
 .../oak/upgrade/JackrabbitNodeState.java           |   6 +-
 .../jackrabbit/oak/upgrade/PersistingDiff.java     |   4 +-
 .../oak/upgrade/RepositorySidegrade.java           |  19 +-
 .../jackrabbit/oak/upgrade/RepositoryUpgrade.java  |  26 +-
 .../oak/upgrade/cli/MigrationFactory.java          |  14 +-
 .../oak/upgrade/CopyCheckpointsTest.java           |   3 +-
 .../oak/upgrade/IgnoreMissingBinariesTest.java     |   3 +-
 .../oak/upgrade/PrivilegeUpgradeTest.java          |   5 +-
 .../oak/upgrade/cli/AbstractOak2OakTest.java       |  21 +-
 .../oak/upgrade/cli/blob/CopyBinariesTest.java     |   3 +-
 .../oak/upgrade/util/VersionCopyTestUtils.java     |   3 +-
 820 files changed, 7854 insertions(+), 7250 deletions(-)
 copy oak-it-osgi/src/test/resources/versions.properties => .commit-check.yml (51%)
 create mode 100644 .github/workflows/commit-check.yml
 create mode 100644 oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jdkcompat/Java23Subject.java
 copy oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/run/AvailableElasticModes.java => oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jdkcompat/package-info.java (50%)
 create mode 100644 oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/jdkcompat/Java23SubjectTest.java
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/PropertyIndexReindexingTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/RepositoryClosedTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/RepositoryShutdownTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TarSegmentNodeStoreConfigTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
 delete mode 100644 oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/ConfigTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.java
 rename oak-pojosr/src/test/{groovy/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.groovy => java/org/apache/jackrabbit/oak/run/osgi/HybridIndexDisabledTest.java} (51%)
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/PropertyIndexReindexingTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/RepositoryClosedTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/RepositoryShutdownTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SecurityProviderRegistrationTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/TarSegmentNodeStoreConfigTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.java
 create mode 100644 oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.java
 copy oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/run/AvailableElasticModes.java => oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerMetrics.java (50%)