You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/04/12 15:42:47 UTC
[jackrabbit-oak] branch OAK-10186 created (now 68e1061c69)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10186
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 68e1061c69 OAK-10186: switch oak-core-spi to shaded guava
This branch includes the following new commits:
new 68e1061c69 OAK-10186: switch oak-core-spi to shaded guava
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-10186: switch oak-core-spi to shaded guava
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10186
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 68e1061c696108fade3e8e8fcca1ba4b766eb4e1
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Apr 12 16:42:08 2023 +0100
OAK-10186: switch oak-core-spi to shaded guava
---
.../oak/composite/CompositeNodeStoreTest.java | 15 ++++++++-------
oak-store-spi/pom.xml | 11 +++++------
.../jackrabbit/oak/json/Base64BlobSerializer.java | 2 +-
.../jackrabbit/oak/json/JsonDeserializer.java | 6 +++---
.../apache/jackrabbit/oak/json/JsonSerializer.java | 8 ++++----
.../org/apache/jackrabbit/oak/json/TypeCodes.java | 2 +-
.../oak/plugins/memory/AbstractBlob.java | 6 +++---
.../oak/plugins/memory/AbstractPropertyState.java | 4 ++--
.../oak/plugins/memory/BinaryPropertyState.java | 2 +-
.../oak/plugins/memory/DecimalPropertyState.java | 2 +-
.../oak/plugins/memory/EmptyPropertyState.java | 4 ++--
.../oak/plugins/memory/GenericPropertyState.java | 4 ++--
.../oak/plugins/memory/MemoryChildNodeEntry.java | 6 +++---
.../oak/plugins/memory/MemoryNodeBuilder.java | 10 +++++-----
.../oak/plugins/memory/MemoryNodeState.java | 2 +-
.../oak/plugins/memory/MemoryNodeStore.java | 16 ++++++++--------
.../oak/plugins/memory/ModifiedNodeState.java | 22 +++++++++++-----------
.../plugins/memory/MultiBinaryPropertyState.java | 2 +-
.../plugins/memory/MultiGenericPropertyState.java | 2 +-
.../oak/plugins/memory/MultiLongPropertyState.java | 2 +-
.../oak/plugins/memory/MultiPropertyState.java | 10 +++++-----
.../oak/plugins/memory/MutableNodeState.java | 4 ++--
.../oak/plugins/memory/PropertyBuilder.java | 8 ++++----
.../oak/plugins/memory/PropertyStates.java | 4 ++--
.../oak/plugins/memory/PropertyValues.java | 2 +-
.../oak/plugins/memory/SinglePropertyState.java | 2 +-
.../oak/plugins/memory/StringBasedBlob.java | 2 +-
.../oak/plugins/memory/StringPropertyState.java | 2 +-
.../jackrabbit/oak/plugins/value/Conversions.java | 4 ++--
.../oak/plugins/value/jcr/BinaryImpl.java | 4 ++--
.../oak/plugins/value/jcr/PartialValueFactory.java | 4 ++--
.../oak/plugins/value/jcr/ValueFactoryImpl.java | 2 +-
.../oak/plugins/value/jcr/ValueImpl.java | 8 ++++----
.../oak/spi/cluster/ClusterRepositoryInfo.java | 2 +-
.../oak/spi/commit/BackgroundObserver.java | 12 ++++++------
.../oak/spi/commit/ChangeDispatcher.java | 2 +-
.../jackrabbit/oak/spi/commit/CommitInfo.java | 6 +++---
.../oak/spi/commit/CompositeConflictHandler.java | 4 ++--
.../jackrabbit/oak/spi/commit/CompositeEditor.java | 4 ++--
.../oak/spi/commit/CompositeEditorProvider.java | 4 ++--
.../oak/spi/commit/CompositeObserver.java | 6 +++---
.../jackrabbit/oak/spi/commit/DiffObserver.java | 2 +-
.../jackrabbit/oak/spi/commit/EditorDiff.java | 2 +-
.../jackrabbit/oak/spi/commit/EditorHook.java | 2 +-
.../jackrabbit/oak/spi/commit/MoveTracker.java | 4 ++--
.../jackrabbit/oak/spi/commit/ObserverTracker.java | 6 +++---
.../oak/spi/commit/ProgressNotificationEditor.java | 2 +-
.../oak/spi/commit/ResetCommitAttributeHook.java | 2 +-
.../oak/spi/commit/SimpleCommitContext.java | 4 ++--
.../jackrabbit/oak/spi/commit/SubtreeEditor.java | 4 ++--
.../oak/spi/commit/SubtreeExcludingValidator.java | 4 ++--
.../oak/spi/commit/SubtreeValidator.java | 4 ++--
.../jackrabbit/oak/spi/commit/VisibleEditor.java | 2 +-
.../jackrabbit/oak/spi/filter/PathFilter.java | 4 ++--
.../oak/spi/state/AbstractNodeState.java | 4 ++--
.../jackrabbit/oak/spi/state/ChildNodeEntry.java | 2 +-
.../apache/jackrabbit/oak/spi/state/NodeState.java | 2 +-
.../jackrabbit/oak/spi/state/NodeStateUtils.java | 4 ++--
.../jackrabbit/oak/spi/state/ReadOnlyBuilder.java | 2 +-
.../jackrabbit/oak/spi/state/RevisionGC.java | 2 +-
.../jackrabbit/oak/json/JsonDeserializerTest.java | 2 +-
.../jackrabbit/oak/json/JsonSerializerTest.java | 2 +-
.../oak/plugins/memory/AbstractBlobTest.java | 2 +-
.../oak/plugins/memory/MemoryNodeBuilderTest.java | 4 ++--
.../oak/plugins/memory/PropertyStatesTest.java | 2 +-
.../jackrabbit/oak/spi/commit/MoveTrackerTest.java | 2 +-
.../oak/spi/commit/ObserverTrackerTest.java | 4 ++--
.../jackrabbit/oak/spi/filter/PathFilterTest.java | 2 +-
.../jackrabbit/oak/spi/state/MoveDetectorTest.java | 4 ++--
69 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
index 3893f06178..ec75525a36 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.jackrabbit.oak.composite;
-import static com.google.common.base.Predicates.compose;
-import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.base.Predicates.compose;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
import static org.apache.jackrabbit.oak.spi.state.ChildNodeEntry.GET_NAME;
@@ -46,12 +46,10 @@ import java.util.concurrent.TimeUnit;
import javax.sql.DataSource;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.guava.common.base.Predicate;
+import org.apache.jackrabbit.guava.common.base.Predicates;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Type;
@@ -88,6 +86,9 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+
@RunWith(Parameterized.class)
public class CompositeNodeStoreTest {
diff --git a/oak-store-spi/pom.xml b/oak-store-spi/pom.xml
index ab260ae603..1b4286a145 100644
--- a/oak-store-spi/pom.xml
+++ b/oak-store-spi/pom.xml
@@ -36,7 +36,6 @@
<configuration>
<instructions>
<Import-Package>
- <!-- OAK-7182 -->${guava.osgi.import},
*
</Import-Package>
<Export-Package>
@@ -90,6 +89,11 @@
<artifactId>oak-commons</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-shaded-guava</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core-spi</artifactId>
@@ -109,11 +113,6 @@
</dependency>
<!-- General utility libraries -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/Base64BlobSerializer.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/Base64BlobSerializer.java
index 2548ff2229..42d9bd4ef0 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/Base64BlobSerializer.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/Base64BlobSerializer.java
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.util.Base64;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
public class Base64BlobSerializer extends BlobSerializer implements BlobDeserializer {
private static final int DEFAULT_LIMIT = Integer.getInteger("oak.serializer.maxBlobSize", (int)FileUtils.ONE_MB);
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonDeserializer.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonDeserializer.java
index ccdfc87c17..99ac2958e0 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonDeserializer.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonDeserializer.java
@@ -24,8 +24,8 @@ import java.util.Set;
import javax.jcr.PropertyType;
-import com.google.common.base.CharMatcher;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.CharMatcher;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static java.util.Collections.emptyList;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
index 24d5e47215..449b2faa60 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.json;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
import static org.apache.jackrabbit.oak.api.Type.DOUBLE;
@@ -33,8 +33,8 @@ import java.util.regex.Pattern;
import org.jetbrains.annotations.NotNull;
import javax.jcr.PropertyType;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/TypeCodes.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/TypeCodes.java
index da78c13f61..4b1e51a49c 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/TypeCodes.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/TypeCodes.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.json;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.util.HashMap;
import java.util.Locale;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
index 8759fec451..6415a3d269 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
@@ -21,9 +21,9 @@ package org.apache.jackrabbit.oak.plugins.memory;
import java.io.IOException;
import java.io.InputStream;
-import com.google.common.hash.HashCode;
-import com.google.common.hash.Hashing;
-import com.google.common.io.ByteSource;
+import org.apache.jackrabbit.guava.common.hash.HashCode;
+import org.apache.jackrabbit.guava.common.hash.Hashing;
+import org.apache.jackrabbit.guava.common.io.ByteSource;
import org.apache.jackrabbit.oak.api.Blob;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
index 119d67ebf1..c4d2f12919 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
@@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.plugins.memory;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.base.Objects;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java
index e146b03b9f..eb01997de6 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BinaryPropertyState.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java
index c25b517fe3..dcc76ea963 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/DecimalPropertyState.java
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.api.Type.DECIMAL;
public class DecimalPropertyState extends SinglePropertyState<BigDecimal> {
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java
index a5706e7f00..56f3f51886 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
/**
* Abstract base class for {@link PropertyState} implementations
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java
index 8fdd7618aa..81155b5c9a 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/GenericPropertyState.java
@@ -22,8 +22,8 @@ import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.api.Type.DATE;
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.PATH;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
index d36432ed1e..dcb3a92aaf 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
@@ -18,12 +18,12 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.util.Map.Entry;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.base.Function;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
index 170b1b6513..eb7ab76534 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
@@ -26,17 +26,17 @@ package org.apache.jackrabbit.oak.plugins.memory;
// //
// WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! //
-import static com.google.common.base.Objects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
import java.io.IOException;
import java.io.InputStream;
-import com.google.common.base.Objects;
-import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.guava.common.base.Objects;
+import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
index f4c6f00566..58219be8cf 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
index 262edf5bde..31a4210b9f 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
@@ -32,10 +32,10 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
index 0d9d60b647..3ae7072f62 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
@@ -16,14 +16,14 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.in;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.base.Predicates.notNull;
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Maps.filterValues;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Predicates.in;
+import static org.apache.jackrabbit.guava.common.base.Predicates.not;
+import static org.apache.jackrabbit.guava.common.base.Predicates.notNull;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
+import static org.apache.jackrabbit.guava.common.collect.Maps.filterValues;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry.iterable;
@@ -31,7 +31,7 @@ import static org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry.iter
import java.util.Map;
import java.util.Map.Entry;
-import com.google.common.base.Function;
+import org.apache.jackrabbit.guava.common.base.Function;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -41,8 +41,8 @@ import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
+import org.apache.jackrabbit.guava.common.base.Predicate;
+import org.apache.jackrabbit.guava.common.base.Predicates;
/**
* Immutable snapshot of a mutable node state.
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiBinaryPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiBinaryPropertyState.java
index 9342e1c59b..3584dc7152 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiBinaryPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiBinaryPropertyState.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.memory;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiGenericPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiGenericPropertyState.java
index ef852aff28..937dd19a5c 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiGenericPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiGenericPropertyState.java
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.oak.api.Type.DATES;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.api.Type.PATHS;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiLongPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiLongPropertyState.java
index 948adb5f86..96f753e390 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiLongPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiLongPropertyState.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.value.Conversions;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
index 6750442ff9..1d286c4e77 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
@@ -18,17 +18,17 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import java.math.BigDecimal;
import java.util.List;
import javax.jcr.PropertyType;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Function;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
index b986671348..2ef1c60ba5 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import java.util.Map;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
index 6f0cae3075..f13520f6da 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import java.math.BigDecimal;
import java.util.List;
import javax.jcr.PropertyType;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java
index 36357d2cf6..51078e21dc 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStates.java
@@ -26,8 +26,8 @@ import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java
index 20c5c4ec92..e8ebb995c6 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyValues.java
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static com.google.common.collect.Iterables.contains;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
/**
* Utility class for creating {@link PropertyValue} instances.
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java
index 1e5c6481de..e1410db577 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Collections.singleton;
import javax.jcr.PropertyType;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java
index b710074ce7..b533149255 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringBasedBlob.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.memory;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import com.google.common.base.Charsets;
+import org.apache.jackrabbit.guava.common.base.Charsets;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java
index bf935fd397..31251c42aa 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/StringPropertyState.java
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.plugins.value.Conversions;
import org.apache.jackrabbit.oak.plugins.value.Conversions.Converter;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.api.Type.STRING;
public class StringPropertyState extends SinglePropertyState<String> {
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/Conversions.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/Conversions.java
index 2a2cbeeb9b..39209f426e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/Conversions.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/Conversions.java
@@ -24,8 +24,8 @@ import java.math.BigDecimal;
import java.util.Calendar;
import java.util.TimeZone;
-import com.google.common.base.Charsets;
-import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.guava.common.base.Charsets;
+import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
index eddc22649b..99d4e7238e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.value.jcr;
-import static com.google.common.base.Objects.toStringHelper;
+import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
import java.io.IOException;
import java.io.InputStream;
@@ -25,7 +25,7 @@ import java.net.URI;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import com.google.common.base.Objects;
+import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.ReferenceBinary;
import org.apache.jackrabbit.api.binary.BinaryDownload;
import org.apache.jackrabbit.api.binary.BinaryDownloadOptions;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/PartialValueFactory.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/PartialValueFactory.java
index 4c6e859058..fbd9dd8fc5 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/PartialValueFactory.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/PartialValueFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.value.jcr;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.plugins.value.jcr.ValueImpl.newValue;
import java.math.BigDecimal;
@@ -33,7 +33,7 @@ import javax.jcr.Value;
import javax.jcr.ValueFormatException;
import javax.jcr.nodetype.NodeType;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.blob.BlobAccessProvider;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
index 64ffe24e19..ac005c28ef 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueFactoryImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.value.jcr;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.InputStream;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
index 005d7f2625..bc56515d5c 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.value.jcr;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -31,7 +31,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
-import com.google.common.base.Objects;
+import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.JackrabbitValue;
import org.apache.jackrabbit.api.binary.BinaryDownloadOptions;
import org.apache.jackrabbit.oak.api.Blob;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
index a3edf86365..13ac97f299 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.cluster;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.util.UUID;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
index a60904b8cf..909a4a0f1d 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.size;
-import static com.google.common.collect.Queues.newArrayBlockingQueue;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
+import static org.apache.jackrabbit.guava.common.collect.Queues.newArrayBlockingQueue;
import java.io.Closeable;
import java.lang.Thread.UncaughtExceptionHandler;
@@ -32,7 +32,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Predicate;
+import org.apache.jackrabbit.guava.common.base.Predicate;
import org.apache.jackrabbit.oak.commons.concurrent.NotifyingFutureTask;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java
index 09c21591a3..933f97f6bf 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.io.Closeable;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
index d315845fa6..3ceb8cc47a 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
@@ -18,13 +18,13 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Objects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.util.Collections;
import java.util.Map;
-import com.google.common.base.Objects;
+import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.Root;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
index 518d4b063f..11449586ec 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Lists.newLinkedList;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newLinkedList;
import static org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.IGNORED;
import static org.apache.jackrabbit.oak.spi.state.ConflictType.ADD_EXISTING_NODE;
import static org.apache.jackrabbit.oak.spi.state.ConflictType.ADD_EXISTING_PROPERTY;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
index b3ee712afa..df4a2bc871 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static java.util.Arrays.asList;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import java.util.Collection;
import java.util.List;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
index cec9fd883d..fa400f057e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static java.util.Arrays.asList;
import java.util.Collection;
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
/**
* Aggregation of a list of editor providers into a single provider.
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
index bb80603ff2..308f3d01b3 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Sets.newIdentityHashSet;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newIdentityHashSet;
import java.util.Set;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
index 864951fb39..21895f418f 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
index d1d71399ec..81eb917bae 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java
index 72492710e1..8f426a05d1 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
/**
* This commit hook implementation processes changes to be committed
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java
index 1cac486109..db419cfee0 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
index 5b9f7afec5..5dcf1eb96b 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
@@ -19,9 +19,9 @@
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import java.io.Closeable;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java
index f3384bc6d9..393618e5da 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.spi.commit;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
-import com.google.common.base.Function;
+import org.apache.jackrabbit.guava.common.base.Function;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java
index 3d5b873b6a..929809d2b5 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
public enum ResetCommitAttributeHook implements CommitHook {
INSTANCE;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SimpleCommitContext.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SimpleCommitContext.java
index 07c5de41e3..8616a3ae5c 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SimpleCommitContext.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SimpleCommitContext.java
@@ -21,9 +21,9 @@ package org.apache.jackrabbit.oak.spi.commit;
import java.util.Map;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Maps;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
public class SimpleCommitContext implements CommitContext {
private final Map<String, Object> attrs = Maps.newHashMap();
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java
index 3b3f9ec502..a67f92cbb4 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkElementIndex;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeExcludingValidator.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeExcludingValidator.java
index 466fe4e7d5..577ff74db9 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeExcludingValidator.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeExcludingValidator.java
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
/**
* Validator that excludes a subtree from the validation process and delegates
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeValidator.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeValidator.java
index 5f34a3184f..4ecb3beac1 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeValidator.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeValidator.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.util.Arrays;
import java.util.List;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
index fda30d9941..489ff81864 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java
index 367883f9ce..439b71382a 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java
@@ -31,8 +31,8 @@ import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAncestor;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
index 4b359df384..d015779ff4 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
@@ -33,8 +33,8 @@ import org.apache.jackrabbit.oak.api.PropertyState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.base.Function;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
/**
* Abstract base class for {@link NodeState} implementations.
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java
index a4b47b019e..c032e83104 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.spi.state;
-import com.google.common.base.Function;
+import org.apache.jackrabbit.guava.common.base.Function;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeState.java
index baa34d2c74..bd04c6a140 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeState.java
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.api.PropertyState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import com.google.common.base.Predicate;
+import org.apache.jackrabbit.guava.common.base.Predicate;
/**
* A node in a content tree consists of child nodes and properties, each
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
index a99270f0f4..98ff6e2a67 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.state;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.repeat;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java
index f15dda3f89..99129302c8 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.state;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.InputStream;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
index 1cd89814a4..b1b7a48d79 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.spi.state;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.failed;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.initiated;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.done;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonDeserializerTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonDeserializerTest.java
index a3c775b571..81d0c45d99 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonDeserializerTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonDeserializerTest.java
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
import java.util.Collections;
import java.util.Random;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonSerializerTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonSerializerTest.java
index 4ac1e91164..3710481c23 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonSerializerTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/json/JsonSerializerTest.java
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.json;
import java.util.Arrays;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlobTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlobTest.java
index 02aee478f7..1a1f365fd8 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlobTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlobTest.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.Blob;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
index c772822218..95ddb82c06 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
@@ -25,8 +25,8 @@ import static org.junit.Assert.fail;
import java.util.Collection;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java
index 544c7e6576..bff0d3df8b 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.util.ISO8601;
import org.junit.Test;
import org.mockito.Mockito;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
public class PropertyStatesTest {
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/MoveTrackerTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/MoveTrackerTest.java
index cbe43f41bd..fcb794cb41 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/MoveTrackerTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/MoveTrackerTest.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.spi.commit;
import java.util.LinkedHashMap;
import java.util.Map;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/ObserverTrackerTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/ObserverTrackerTest.java
index 7e01f974b5..75ea7680c7 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/ObserverTrackerTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/commit/ObserverTrackerTest.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.spi.commit;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
import java.io.Closeable;
import java.util.Set;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.commit.Observable;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.commit.ObserverTracker;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/filter/PathFilterTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/filter/PathFilterTest.java
index b0a03837c0..315e93cdf9 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/filter/PathFilterTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/filter/PathFilterTest.java
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.Test;
-import static com.google.common.collect.ImmutableList.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_EXCLUDED_PATHS;
diff --git a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
index 60e5c912d8..c8e3af5f62 100644
--- a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
+++ b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/spi/state/MoveDetectorTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertTrue;
import java.util.Map;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;