[jackrabbit-oak] branch trunk updated (91a58d6bc8 -> f351538733)

[re...@apache.org]

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 91a58d6bc8 OAK-10240: switch oak-solr to shaded guava (#938)
     add f351538733 OAK-10237 Switch oak-blob modules to shaded Guava (#934)

No new revisions were added by this update.

Summary of changes:
 oak-blob-cloud-azure/pom.xml                       | 10 ++--
 .../azure/blobstorage/AzureBlobStoreBackend.java   | 18 +++----
 .../oak/blob/cloud/azure/blobstorage/Utils.java    |  2 +-
 .../blobstorage/AzureBlobStoreBackendTest.java     | 34 ++++++------
 .../AzureDataRecordAccessProviderCDNTest.java      |  2 +-
 .../AzureDataRecordAccessProviderIT.java           |  2 +-
 .../azure/blobstorage/AzureDataStoreTest.java      | 10 ++--
 .../azure/blobstorage/AzureDataStoreUtils.java     |  8 +--
 oak-blob-cloud/pom.xml                             | 10 ++--
 .../jackrabbit/oak/blob/cloud/s3/S3Backend.java    | 22 ++++----
 .../apache/jackrabbit/oak/blob/cloud/s3/Utils.java |  2 +-
 .../cloud/s3/S3DataRecordAccessProviderIT.java     |  2 +-
 .../oak/blob/cloud/s3/S3DataStoreServiceTest.java  |  4 +-
 .../oak/blob/cloud/s3/S3DataStoreUtils.java        | 10 ++--
 .../blob/cloud/s3/TestS3DSWithSSEKMSwithKey.java   |  2 +-
 .../oak/blob/cloud/s3/TestS3DataStore.java         |  6 +--
 .../jackrabbit/oak/blob/cloud/s3/TestS3Ds.java     |  2 +-
 oak-blob-plugins/pom.xml                           | 10 ++--
 .../blob/AbstractSharedCachingDataStore.java       | 14 ++---
 .../apache/jackrabbit/oak/plugins/blob/BlobGC.java |  2 +-
 .../oak/plugins/blob/BlobStoreStats.java           |  2 +-
 .../oak/plugins/blob/CompositeDataStoreCache.java  |  4 +-
 .../blob/ConsolidatedDataStoreCacheStats.java      |  4 +-
 .../plugins/blob/DataStoreCacheUpgradeUtils.java   | 53 +++++++++---------
 .../jackrabbit/oak/plugins/blob/FileCache.java     | 47 ++++++++--------
 .../plugins/blob/MarkSweepGarbageCollector.java    | 32 +++++------
 .../plugins/blob/SameThreadExecutorService.java    |  2 +-
 .../oak/plugins/blob/UploadStagingCache.java       | 24 ++++-----
 .../oak/plugins/blob/cloud/CloudBlobStore.java     |  6 +--
 .../blob/datastore/AbstractDataStoreService.java   |  4 +-
 .../oak/plugins/blob/datastore/BlobIdTracker.java  | 38 +++++++------
 .../plugins/blob/datastore/DataStoreBlobStore.java | 20 +++----
 .../oak/plugins/blob/datastore/FSBackend.java      | 44 ++++++---------
 .../blob/datastore/FileDataStoreService.java       |  2 +-
 .../plugins/blob/datastore/OakFileDataStore.java   | 55 +++++++------------
 .../blob/datastore/SharedDataStoreUtils.java       | 12 ++---
 .../directaccess/DataRecordDownloadOptions.java    |  8 +--
 .../directaccess/DataRecordUploadToken.java        |  2 +-
 .../blob/migration/DepthFirstNodeIterator.java     |  6 +--
 .../blob/AbstractBlobTrackerRegistrationTest.java  | 16 ++----
 .../plugins/blob/AbstractDataStoreCacheTest.java   | 17 +++---
 .../oak/plugins/blob/BlobGCCheckpointRefTest.java  |  4 +-
 .../jackrabbit/oak/plugins/blob/BlobGCTest.java    |  8 +--
 .../oak/plugins/blob/CachingDataStoreTest.java     | 10 ++--
 .../plugins/blob/CompositeDataStoreCacheTest.java  | 14 ++---
 .../blob/ConsolidatedDataStoreStatsTest.java       |  8 +--
 .../blob/DataStoreCacheUpgradeUtilsTest.java       |  4 +-
 .../jackrabbit/oak/plugins/blob/FileCacheTest.java | 14 ++---
 ...aredDataStoreMarkSweepGarbageCollectorTest.java |  2 +-
 .../oak/plugins/blob/SharedDataStoreUtilsTest.java | 12 ++---
 .../oak/plugins/blob/TimeLapsedDataStore.java      |  6 +--
 .../oak/plugins/blob/UploadStagingCacheTest.java   | 26 ++++-----
 .../blob/datastore/AbstractDataStoreTest.java      |  2 +-
 .../datastore/ActiveDeletionTrackerStoreTest.java  |  8 +--
 .../datastore/BlobIdTrackerClusterSharedTest.java  |  6 +--
 .../blob/datastore/BlobIdTrackerStoreTest.java     |  6 +--
 .../plugins/blob/datastore/BlobIdTrackerTest.java  |  8 +--
 .../blob/datastore/CachingFileDataStoreTest.java   |  2 +-
 .../datastore/DataStoreBlobStoreStatsTest.java     |  2 +-
 .../blob/datastore/DataStoreBlobStoreTest.java     | 10 ++--
 .../blob/datastore/DataStoreServiceTest.java       |  2 +-
 .../oak/plugins/blob/datastore/DataStoreUtils.java |  2 +-
 .../oak/plugins/blob/datastore/FSBackendIT.java    | 12 ++---
 .../blob/datastore/OakFileDataStoreTest.java       |  6 +--
 .../blob/datastore/SharedDataStoreTest.java        | 12 ++---
 .../AbstractDataRecordAccessProviderIT.java        |  4 +-
 .../AbstractDataRecordAccessProviderTest.java      | 10 ++--
 .../DataRecordDownloadOptionsTest.java             |  8 +--
 .../blob/serializer/FSBlobSerializerTest.java      |  4 +-
 oak-blob/pom.xml                                   | 10 ++--
 .../jackrabbit/oak/spi/blob/AbstractBlobStore.java |  8 +--
 .../jackrabbit/oak/spi/blob/FileBlobStore.java     | 39 ++++----------
 .../jackrabbit/oak/spi/blob/MemoryBlobStore.java   |  4 +-
 .../jackrabbit/oak/spi/blob/split/BlobIdSet.java   | 10 ++--
 .../oak/spi/blob/stats/StatsCollectingStreams.java |  2 +-
 .../oak/spi/blob/AbstractBlobStoreTest.java        |  4 +-
 .../oak/spi/blob/split/SplitBlobStoreTest.java     |  4 +-
 .../oak/commons/io/FileTreeTraverser.java          | 62 ++++++++++++++++++++++
 .../jackrabbit/oak/commons/io/package-info.java    |  4 +-
 79 files changed, 456 insertions(+), 473 deletions(-)
 create mode 100644 oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileTreeTraverser.java