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/06/08 10:45:57 UTC
[jackrabbit-oak] branch OAK-10282 created (now c76034d394)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10282
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at c76034d394 OAK-10282: switch oak-it to shaded guava
This branch includes the following new commits:
new c76034d394 OAK-10282: switch oak-it 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-10282: switch oak-it 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-10282
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c76034d39469f9314918e0d19e2754a78245c63c
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jun 8 11:45:35 2023 +0100
OAK-10282: switch oak-it to shaded guava
---
.../src/test/java/org/apache/jackrabbit/oak/OakAssert.java | 2 +-
.../test/java/org/apache/jackrabbit/oak/api/TreeTest.java | 6 +++---
.../jackrabbit/oak/composite/AtomicCompositeMergeTest.java | 6 +++---
.../composite/CompositeNodeStoreClusterObservationTest.java | 2 +-
.../jackrabbit/oak/composite/CompositeNodeStoreTest.java | 6 +++---
.../java/org/apache/jackrabbit/oak/core/MutableTreeTest.java | 2 +-
.../oak/plugins/blob/DocumentBlobGCRegistrationTest.java | 2 +-
.../plugins/blob/DocumentBlobTrackerRegistrationTest.java | 2 +-
.../oak/plugins/blob/datastore/DataStoreTrackerGCTest.java | 12 ++++++------
.../plugins/document/DocumentCachingDataStoreStatsTest.java | 2 +-
.../oak/plugins/index/AsyncIndexUpdateClusterTestIT.java | 6 +++---
.../oak/plugins/index/AsyncIndexUpdateLeaseTest.java | 4 ++--
.../oak/plugins/name/ReadWriteNamespaceRegistryTest.java | 2 +-
.../oak/segment/SegmentAzureDataStoreBlobGCIT.java | 2 +-
.../oak/segment/SegmentBlobGCRegistrationTest.java | 2 +-
.../oak/segment/SegmentCachingDataStoreStatsTest.java | 2 +-
.../jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java | 2 +-
.../apache/jackrabbit/oak/spi/commit/CommitContextTest.java | 2 +-
.../org/apache/jackrabbit/oak/spi/state/CheckpointTest.java | 2 +-
.../org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java | 8 ++++----
20 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/OakAssert.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/OakAssert.java
index ef676f35e5..f2435e7d86 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/OakAssert.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/OakAssert.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.jackrabbit.oak.api.Tree;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
public final class OakAssert {
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java
index 16e37b83f1..67ea339757 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Set;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.OakBaseTest;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
index 7ad27a10e1..86252ac115 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.composite;
-import com.google.common.io.Closer;
+import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.Oak;
@@ -56,8 +56,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS;
import static org.junit.Assert.assertEquals;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
index a67a36193e..7f3c57564c 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreClusterObservationTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.composite;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
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 a52800bfff..52494fd01a 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
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.composite;
import static org.apache.jackrabbit.guava.common.base.Predicates.compose;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
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;
@@ -48,9 +48,9 @@ import javax.sql.DataSource;
import org.apache.jackrabbit.guava.common.base.Predicate;
import org.apache.jackrabbit.guava.common.collect.Iterables;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.base.Predicates;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
index 82624093b8..efb15d2f99 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/core/MutableTreeTest.java
@@ -29,7 +29,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.Blob;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
index c4f71fd3e5..58dc2c8a90 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
@@ -27,7 +27,7 @@ import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.junit.After;
import org.junit.BeforeClass;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.junit.Assume.assumeTrue;
/**
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
index 83dc56b914..9353181d48 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
@@ -28,7 +28,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assume.assumeTrue;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
index 7d06d613bc..328ac6c93f 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
@@ -31,8 +31,8 @@ import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import ch.qos.logback.classic.Level;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
@@ -61,10 +61,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.collect.Sets.union;
+import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.collect.Sets.union;
import static java.lang.String.valueOf;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
index e81960745a..228f878cb7 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
@@ -41,7 +41,7 @@ import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.osgi.framework.ServiceRegistration;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
index f9960b76f5..fc85806ad7 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
@@ -52,9 +52,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Closer;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.io.Closer;
public class AsyncIndexUpdateClusterTestIT {
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
index dbf378ec2c..1a95f7843d 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
@@ -28,7 +28,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
@@ -44,7 +44,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
public class AsyncIndexUpdateLeaseTest extends OakBaseTest {
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java
index 52caf68567..9764a12c09 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.name;
-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;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentAzureDataStoreBlobGCIT.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentAzureDataStoreBlobGCIT.java
index c663b28c89..9c6c49d01c 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentAzureDataStoreBlobGCIT.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentAzureDataStoreBlobGCIT.java
@@ -23,7 +23,7 @@ import static org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_T
import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
import static org.junit.Assume.assumeTrue;
-import com.google.common.base.Strings;
+import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureConstants;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureDataStoreUtils;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobGCRegistrationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobGCRegistrationTest.java
index f2ef716b34..0bf439afb2 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobGCRegistrationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobGCRegistrationTest.java
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.plugins.blob.AbstractBlobGCRegistrationTest;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
public class SegmentBlobGCRegistrationTest extends AbstractBlobGCRegistrationTest {
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
index 38a892ccaa..088f32dd20 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static com.google.common.collect.Maps.newHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
index 58d9f63f32..859b4283a3 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
@@ -28,7 +28,7 @@ import java.util.Date;
import java.util.List;
import java.util.Properties;
-import com.google.common.base.Strings;
+import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants;
import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
index 99976e5267..6b50bbc794 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
index 756ba9ea5b..0651603ba5 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
index c8a9a12a01..52291baa54 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
@@ -18,7 +18,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.JcrConstants.JCR_LASTMODIFIED;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.junit.Assert.assertEquals;
@@ -59,9 +59,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Sets;
public class NodeStoreTest extends OakBaseTest {
private NodeState root;