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/20 12:22:44 UTC
(jackrabbit-oak) 01/01: Merge branch 'trunk' into OAK-11406
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11406
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b002654c9a6524941e168e53bd7f80bd537d51a7
Merge: c27ada0bd3 10416ebceb
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Jan 20 13:22:24 2025 +0100
Merge branch 'trunk' into OAK-11406
.../authorization/cug/impl/CugPolicyImpl.java | 3 +-
.../principalbased/impl/FilterProviderImpl.java | 3 +-
.../impl/PrincipalBasedAccessControlManager.java | 3 +-
.../authorization/principalbased/impl/Utils.java | 3 +-
.../oak/benchmark/util/OakLuceneIndexUtils.java | 3 +-
.../suites/ScalabilityBlobSearchSuite.java | 7 +--
.../scalability/suites/ScalabilityNodeSuite.java | 3 +-
.../GetPrivilegeCollectionIncludeNamesTest.java | 3 +-
.../authorization/MvGlobsAndSubtreesTest.java | 3 +-
.../azure/blobstorage/AzureBlobStoreBackend.java | 19 ++++----
.../oak/blob/cloud/azure/blobstorage/Utils.java | 6 +--
.../AzureDataRecordAccessProviderCDNTest.java | 3 +-
.../AzureDataRecordAccessProviderIT.java | 3 +-
.../azure/blobstorage/AzureDataStoreTest.java | 5 ++-
.../azure/blobstorage/AzureDataStoreUtils.java | 9 ++--
.../jackrabbit/oak/blob/cloud/s3/S3Backend.java | 21 +++++----
.../apache/jackrabbit/oak/blob/cloud/s3/Utils.java | 8 ++--
.../oak/blob/cloud/s3/S3DataStoreUtils.java | 7 +--
.../blob/cloud/s3/TestS3DSWithSSEKMSwithKey.java | 3 +-
.../oak/blob/cloud/s3/TestS3DataStore.java | 5 ++-
oak-blob-plugins/pom.xml | 4 ++
.../blob/ConsolidatedDataStoreCacheStats.java | 6 +--
.../blob/datastore/AbstractDataStoreService.java | 4 +-
.../plugins/blob/datastore/DataStoreBlobStore.java | 3 +-
.../oak/plugins/blob/datastore/FSBackend.java | 12 +++---
.../plugins/blob/datastore/OakFileDataStore.java | 20 ++++-----
.../directaccess/DataRecordDownloadOptions.java | 17 ++++----
.../blob/datastore/SharedDataStoreTest.java | 5 ++-
.../AbstractDataRecordAccessProviderTest.java | 3 +-
.../DataRecordDownloadOptionsTest.java | 15 +++----
.../jackrabbit/oak/spi/blob/AbstractBlobStore.java | 13 ++++--
.../oak/commons/collections/CollectionUtils.java | 34 ---------------
.../{StreamUtils.java => IteratorUtils.java} | 50 +++++++++++-----------
.../oak/commons/collections/StreamUtils.java | 2 +-
.../commons/collections/CollectionUtilsTest.java | 19 --------
.../oak/commons/collections/IteratorUtilsTest.java | 47 ++++++++++++++++++++
.../oak/plugins/atomic/AtomicCounterEditor.java | 3 +-
.../org/apache/jackrabbit/oak/query/QueryImpl.java | 3 +-
.../accesscontrol/AccessControlValidator.java | 3 +-
.../security/privilege/PrivilegeManagerImpl.java | 4 +-
.../oak/security/user/CacheConfiguration.java | 4 +-
.../user/CachedPrincipalMembershipReader.java | 4 +-
.../jackrabbit/oak/security/user/GroupImpl.java | 3 +-
.../oak/security/user/UserManagerImpl.java | 5 ++-
.../nodetype/write/NodeTypeRegistryTest.java | 3 +-
.../oak/segment/SegmentAzureDataStoreBlobGCIT.java | 3 +-
.../oak/segment/SegmentS3DataStoreBlobGCIT.java | 3 +-
.../jackrabbit/oak/jcr/AtomicCounterClusterIT.java | 3 +-
.../jackrabbit/oak/jcr/ReferenceBinaryIT.java | 5 +--
.../index/lucene/LuceneIndexProviderService.java | 3 +-
.../jackrabbit/oak/fixture/BlobStoreFixture.java | 3 +-
.../jackrabbit/oak/fixture/DataStoreUtils.java | 4 +-
.../jackrabbit/oak/run/DataStoreCheckTest.java | 3 +-
.../oak/run/DataStoreCommandMetadataTest.java | 3 +-
.../jackrabbit/oak/run/DataStoreCommandTest.java | 21 ++++-----
oak-security-spi/pom.xml | 5 +++
.../oak/spi/security/user/util/PasswordUtil.java | 6 +--
.../segment/ReadOnlyStoreBlobReferencesTest.java | 4 +-
.../oak/composite/it/CompositeTestSupport.java | 3 +-
.../oak/plugins/document/DocumentNodeStore.java | 3 +-
.../plugins/document/DocumentNodeStoreService.java | 13 +++---
.../oak/plugins/document/MongoBlobGCTest.java | 3 +-
.../oak/plugins/document/RdbConnectionUtils.java | 4 +-
63 files changed, 269 insertions(+), 229 deletions(-)