Merge branch 'trunk' into OAK-11399

reschke · reschke · commit dc72b46c6a85 · 2025-01-17T16:07:57.000+01:00
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
@@ -19,9 +19,9 @@
 
 package org.apache.jackrabbit.oak.plugins.index.importer;
 
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
@@ -79,7 +79,7 @@ public class IndexImporter {
     private final Map<String, IndexImporterProvider> importers = new HashMap<>();
     private final IndexerInfo indexerInfo;
     private final Map<String, File> indexes;
-    private final ListMultimap<String, IndexInfo> asyncLaneToIndexMapping;
+    private final ListValuedMap<String, IndexInfo> asyncLaneToIndexMapping;
     private final NodeState indexedState;
     private final IndexEditorProvider indexEditorProvider;
     private final AsyncIndexerLock indexerLock;
@@ -378,9 +378,9 @@ private IndexImporterProvider getImporter(String type) {
         return requireNonNull(provider, "No IndexImporterProvider found for type [" + type + "]");
     }
 
-    private ListMultimap<String, IndexInfo> mapIndexesToLanes(Map<String, File> indexes) {
+    private ListValuedMap<String, IndexInfo> mapIndexesToLanes(Map<String, File> indexes) {
         NodeState rootState = nodeStore.getRoot();
-        ListMultimap<String, IndexInfo> map = ArrayListMultimap.create();
+        ListValuedMap<String, IndexInfo> map = new ArrayListValuedHashMap<>();
         for (Map.Entry<String, File> e : indexes.entrySet()) {
             String indexPath = e.getKey();
 
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
@@ -30,8 +30,8 @@
 import javax.jcr.PropertyType;
 import javax.jcr.Session;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.oak.api.PropertyValue;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.spi.query.QueryLimits;
@@ -97,8 +97,7 @@ public class FilterImpl implements Filter {
      * restrictions must apply, for example x=1 and x=2. For this case, only
      * multi-valued properties match if it contains both the values 1 and 2.
      */
-    private final ListMultimap<String, PropertyRestriction> propertyRestrictions =
-            ArrayListMultimap.create();
+    private final ListValuedMap<String, PropertyRestriction> propertyRestrictions = new ArrayListValuedHashMap<>();
 
     /**
      * Only return distinct values.
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
@@ -213,6 +213,10 @@
       <artifactId>jcr</artifactId>
       <version>2.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java
@@ -25,6 +25,8 @@
 
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.jcr.session.SessionContext;
 import org.apache.jackrabbit.oak.namepath.impl.LocalNameMapper;
@@ -35,9 +37,6 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
-
 /**
  * {@code TargetImportHandler} serves as the base class for the concrete
  * classes {@code {@link DocViewImportHandler}} and
@@ -47,7 +46,7 @@ public abstract class TargetImportHandler extends DefaultHandler {
 
     protected final Importer importer;
     protected final SessionContext sessionContext;
-    private final ListMultimap<String, String> documentContext = ArrayListMultimap.create();
+    private final ListValuedMap<String, String> documentContext = new ArrayListValuedHashMap<>();
     private Map<String, String> documentPrefixMap = Collections.emptyMap();
 
     protected TargetImportHandler(Importer importer, SessionContext sessionContext) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
@@ -30,9 +30,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
 import org.apache.jackrabbit.guava.common.hash.Hashing;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.commons.IOUtils;
@@ -220,7 +220,7 @@ static String getPathHash(String indexPath) {
     private Map<String, List<LocalIndexDir>> getIndexesPerPath() throws IOException {
         File[] dirs = indexRootDir.listFiles(LOCAL_DIR_FILTER);
 
-        ListMultimap<String, LocalIndexDir> pathToDirMap = ArrayListMultimap.create();
+        ListValuedMap<String, LocalIndexDir> pathToDirMap = new ArrayListValuedHashMap<>();
         for (File indexDir : dirs){
             LocalIndexDir localIndexDir = new LocalIndexDir(indexDir);
             pathToDirMap.get(localIndexDir.getJcrPath()).add(localIndexDir);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
@@ -34,9 +34,9 @@
 import org.apache.lucene.store.DataInput;
 import org.jetbrains.annotations.NotNull;
 
+import static java.util.Objects.checkFromToIndex;
 import static java.util.Objects.checkIndex;
 import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
 import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
 import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
 import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -237,7 +237,7 @@ public void seek(long pos) throws IOException {
     @Override
     public void readBytes(byte[] b, int offset, int len)
             throws IOException {
-        checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
+        checkFromToIndex(offset, offset + len, requireNonNull(b).length);
 
         if (len < 0 || position + len > length) {
             String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
@@ -33,7 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
+import static java.util.Objects.checkFromToIndex;
 import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
 import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
 import static org.apache.jackrabbit.oak.api.Type.BINARY;
@@ -222,7 +222,7 @@ public void seek(long pos) throws IOException {
     @Override
     public void readBytes(byte[] b, int offset, int len)
             throws IOException {
-        checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
+        checkFromToIndex(offset, offset + len, requireNonNull(b).length);
 
         if (len < 0 || position + len > length) {
             String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java
@@ -33,8 +33,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.util.concurrent.Striped;
 import org.apache.jackrabbit.oak.commons.PerfLogger;
 import org.apache.jackrabbit.oak.commons.concurrent.NotifyingFutureTask;
@@ -100,7 +100,7 @@ public Void call() throws Exception {
                     long start = PERF_LOGGER.start();
                     int maxSize = docsQueue.size();
                     List<LuceneDoc> docs = new ArrayList<>(maxSize);
-                    ListMultimap<String, LuceneDoc> docsPerIndex = ArrayListMultimap.create();
+                    ListValuedMap<String, LuceneDoc> docsPerIndex = new ArrayListValuedHashMap<>();
 
                     //Do the processing in batches
                     int count = docsQueue.drainTo(docs, maxSize);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
@@ -21,9 +21,9 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
 import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -35,10 +35,10 @@ public class LuceneDocumentHolder implements JournalProperty {
     private static final Logger log = LoggerFactory.getLogger(LuceneDocumentHolder.class);
     public static final String NAME = "luceneDocs";
 
-    private final ListMultimap<String, LuceneDoc> nrtIndexedList = ArrayListMultimap.create();
-    private final ListMultimap<String, LuceneDoc> syncIndexedList = ArrayListMultimap.create();
-    private final ListMultimap<String, String> queuedNrtIndexedPath = ArrayListMultimap.create();
-    private final ListMultimap<String, LuceneDoc> queuedSyncIndexedPath = ArrayListMultimap.create();
+    private final ListValuedMap<String, LuceneDoc> nrtIndexedList = new ArrayListValuedHashMap<>();
+    private final ListValuedMap<String, LuceneDoc> syncIndexedList = new ArrayListValuedHashMap<>();
+    private final ListValuedMap<String, String> queuedNrtIndexedPath = new ArrayListValuedHashMap<>();
+    private final ListValuedMap<String, LuceneDoc> queuedSyncIndexedPath = new ArrayListValuedHashMap<>();
     private final int inMemoryDocsLimit;
     private final IndexingQueue documentQueue;
     private boolean limitWarningLogged;
@@ -114,7 +114,7 @@ private boolean queueSizeWithinLimits(){
         return true;
     }
 
-    private static Iterable<? extends LuceneDocInfo> asLuceneDocInfo(ListMultimap<String, String> docs) {
+    private static Iterable<? extends LuceneDocInfo> asLuceneDocInfo(ListValuedMap<String, String> docs) {
         return Iterables.transform(docs.entries(), input -> {
                 return new LuceneDocInfo() {
                     @Override
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java
@@ -27,10 +27,10 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
 
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
 import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
@@ -220,7 +220,7 @@ public void indexRefresh() throws Exception{
 
     @Test
     public void addAllSync() throws Exception{
-        ListMultimap<String, LuceneDoc> docs = ArrayListMultimap.create();
+        ListValuedMap<String, LuceneDoc> docs = new ArrayListValuedHashMap<>();
         tracker = createTracker();
         NodeState indexed = createAndPopulateAsyncIndex(FulltextIndexConstants.IndexingMode.SYNC);
         tracker.update(indexed);
@@ -285,7 +285,7 @@ public void benchMarkIndexWriter() throws Exception{
 
         w = Stopwatch.createStarted();
         for (int i = 0; i < numDocs; i++) {
-            ListMultimap<String, LuceneDoc> docs = ArrayListMultimap.create();
+            ListValuedMap<String, LuceneDoc> docs = new ArrayListValuedHashMap<>();
             docs.get("/oak:index/fooIndex").add(doc);
             queue.addAllSynchronously(docs.asMap());
         }
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolderTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolderTest.java
@@ -22,8 +22,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -61,16 +61,16 @@ public void unprocessedSyncQueuedDocs() throws Exception{
         assertThat(asMultiMap(holder.getSyncIndexedDocs()).values(), containsInAnyOrder("/a", "/b"));
     }
 
-    private static ListMultimap<String, String> asMultiMap(Iterable<? extends LuceneDocInfo> itr){
-        ListMultimap<String, String> docs = ArrayListMultimap.create();
+    private static ListValuedMap<String, String> asMultiMap(Iterable<? extends LuceneDocInfo> itr){
+        ListValuedMap<String, String> docs = new ArrayListValuedHashMap<>();
         for (LuceneDocInfo d : itr){
             docs.put(d.getIndexPath(), d.getDocPath());
         }
         return docs;
     }
 
-    private static ListMultimap<String, String> asMultiMap(Map<String, Collection<LuceneDoc>> map){
-        ListMultimap<String, String> docs = ArrayListMultimap.create();
+    private static ListValuedMap<String, String> asMultiMap(Map<String, Collection<LuceneDoc>> map){
+        ListValuedMap<String, String> docs = new ArrayListValuedHashMap<>();
         for (Collection<LuceneDoc> lds : map.values()){
             for (LuceneDoc d : lds){
                 docs.put(d.getIndexPath(), d.getDocPath());
@@ -81,7 +81,7 @@ private static ListMultimap<String, String> asMultiMap(Map<String, Collection<Lu
 
     private static class DummyQueue implements IndexingQueue {
         boolean enabled;
-        ListMultimap<String, String> docs = ArrayListMultimap.create();
+        ListValuedMap<String, String> docs = new ArrayListValuedHashMap<>();
         Map<String, LuceneDoc> luceneDocs = new HashMap<>();
 
         @Override
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
@@ -29,9 +29,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Multimap;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.api.PropertyValue;
 import org.apache.jackrabbit.oak.api.StrictPathRestriction;
@@ -637,7 +637,7 @@ private void visitTerm(String propertyName) {
      * @return list of properties which are included in query issued to Lucene
      */
     private List<String> planForRelativeProperties(Map<String, PropertyDefinition> relativePropDefns) {
-        Multimap<String, Map.Entry<String, PropertyDefinition>> relpaths = ArrayListMultimap.create();
+        MultiValuedMap<String, Map.Entry<String, PropertyDefinition>> relpaths = new ArrayListValuedHashMap<>();
         int maxSize = 0;
         String maxCountedParent = null;
 
diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/AggregateTest.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/AggregateTest.java
@@ -27,9 +27,9 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
+import org.apache.commons.collections4.ListValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.ListMultimap;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -486,7 +486,7 @@ private Aggregate.Include ni(String type, String pattern, boolean relativeNode){
     }
 
     private static class TestCollector implements Aggregate.ResultCollector {
-        final ListMultimap<String, NodeIncludeResult> nodeResults = ArrayListMultimap.create();
+        final ListValuedMap<String, NodeIncludeResult> nodeResults = new ArrayListValuedHashMap<>();
         final Map<String, PropertyIncludeResult> propResults = new HashMap<>();
         @Override
         public void onResult(NodeIncludeResult result) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
@@ -18,9 +18,9 @@
  */
 package org.apache.jackrabbit.oak.segment;
 
+import static java.util.Objects.checkFromToIndex;
 import static java.util.Objects.checkIndex;
 import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
 
 /**
  * A record of type "BLOCK".
@@ -48,7 +48,7 @@ class BlockRecord extends Record {
     public int read(int position, byte[] buffer, int offset, int length) {
         checkIndex(position, size);
         requireNonNull(buffer);
-        checkPositionIndexes(offset, offset + length, buffer.length);
+        checkFromToIndex(offset, offset + length, buffer.length);
 
         if (position + length > size) {
             length = size - position;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
@@ -23,12 +23,12 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.nCopies;
+import static java.util.Objects.checkFromToIndex;
 import static java.util.Objects.checkIndex;
 import static java.util.Objects.requireNonNull;
 
 import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
 import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
 import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
 import static org.apache.jackrabbit.guava.common.io.ByteStreams.read;
 import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -619,7 +619,7 @@ private RecordId writeBlobId(String blobId) throws IOException {
         private RecordId writeBlock(@NotNull byte[] bytes, int offset, int length)
                 throws IOException {
             requireNonNull(bytes);
-            checkPositionIndexes(offset, offset + length, bytes.length);
+            checkFromToIndex(offset, offset + length, bytes.length);
             return writeOperationHandler.execute(gcGeneration, newWriteOperation(
                 RecordWriters.newBlockWriter(bytes, offset, length)));
         }
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
@@ -18,9 +18,9 @@
  */
 package org.apache.jackrabbit.oak.segment;
 
+import static java.util.Objects.checkFromToIndex;
 import static java.util.Objects.checkIndex;
 import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -95,7 +95,7 @@ public List<RecordId> getEntries(int index, int count) {
     }
 
     private void getEntries(int index, int count, List<RecordId> ids) {
-        checkPositionIndexes(index, index + count, size);
+        checkFromToIndex(index, index + count, size);
         Segment segment = getSegment();
         if (size == 1) {
             ids.add(getRecordId());
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledDocumentDifferTest.java
