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 14:18:04 UTC
[jackrabbit-oak] 01/01: OAK-10284: switch oak-benchmarks to shaded guava
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10284
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit f1ed5796ee1188ce58531bec9738a74aa14d755c
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jun 8 15:17:17 2023 +0100
OAK-10284: switch oak-benchmarks to shaded guava
---
.../org/apache/jackrabbit/oak/benchmark/AbstractTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java | 6 +++---
.../apache/jackrabbit/oak/benchmark/BundlingNodeTest.java | 4 ++--
.../jackrabbit/oak/benchmark/CompositeAuthorizationTest.java | 2 +-
.../jackrabbit/oak/benchmark/ConcurrentFileWriteTest.java | 2 +-
.../oak/benchmark/ConcurrentHasPermissionTest.java | 2 +-
.../jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java | 2 +-
.../java/org/apache/jackrabbit/oak/benchmark/CugTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java | 8 ++++----
.../oak/benchmark/IsCheckedOutAddMixinSetPropertyTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/ObservationTest.java | 2 +-
.../jackrabbit/oak/benchmark/PropertyFullTextTest.java | 4 ++--
.../org/apache/jackrabbit/oak/benchmark/ReadManyTest.java | 2 +-
.../apache/jackrabbit/oak/benchmark/ReadPropertyTest.java | 2 +-
.../org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java | 2 +-
.../java/org/apache/jackrabbit/oak/benchmark/SearchTest.java | 6 +++---
.../org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java | 2 +-
.../apache/jackrabbit/oak/benchmark/SmallFileReadTest.java | 2 +-
.../authentication/external/AbstractExternalTest.java | 6 +++---
.../benchmark/authentication/external/ExternalLoginTest.java | 2 +-
.../authentication/external/PrincipalNameResolutionTest.java | 2 +-
.../benchmark/authorization/AbstractHasItemGetItemTest.java | 4 ++--
.../oak/benchmark/authorization/AceCreationTest.java | 2 +-
.../GetPrivilegeCollectionIncludeNamesTest.java | 4 ++--
.../authorization/HasPermissionHasItemGetItemTest.java | 2 +-
.../authorization/permission/EagerCacheSizeTest.java | 4 ++--
.../principalbased/PermissionEvaluationTest.java | 2 +-
.../principalbased/PrinicipalBasedReadTest.java | 12 ++++++------
.../apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java | 4 ++--
.../jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java | 2 +-
.../src/main/java/org/apache/jackrabbit/oak/run/Main.java | 2 +-
.../apache/jackrabbit/oak/scalability/ScalabilityRunner.java | 10 +++++-----
.../oak/scalability/benchmarks/search/ConcurrentReader.java | 2 +-
.../segment/standby/StandbyBulkTransferBenchmark.java | 2 +-
.../oak/scalability/suites/ScalabilityAbstractSuite.java | 12 ++++++------
37 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
index 0da405a523..9a3311031c 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
@@ -33,7 +33,7 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.security.auth.Subject;
-import com.google.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
index ac4d571c74..7632630e5e 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
@@ -22,9 +22,9 @@ import com.codahale.metrics.Counting;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import org.apache.commons.io.FileUtils;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
index 669dfb4b7e..c75ccc510b 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
@@ -41,8 +41,8 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
-import com.google.common.base.Joiner;
-import com.google.common.collect.EvictingQueue;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.collect.EvictingQueue;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.commons.cnd.CndImporter;
import org.apache.jackrabbit.commons.cnd.ParseException;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
index 4ac775e310..d74187e7fe 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
@@ -59,7 +59,7 @@ import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
/**
* Test the effect of multiple authorization configurations on the general read
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentFileWriteTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentFileWriteTest.java
index 11457ec34e..fb42ab98b0 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentFileWriteTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentFileWriteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.benchmark;
-import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import java.util.List;
import java.util.Random;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentHasPermissionTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentHasPermissionTest.java
index 8698a0e287..35f744e5a8 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentHasPermissionTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentHasPermissionTest.java
@@ -20,7 +20,7 @@ import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
/**
* Concurrently calls Session#hasPermission on the deep tree:
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java
index 4d3dd4f7f2..e1d2af7366 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java
@@ -23,7 +23,7 @@ import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.Session;
-import com.google.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
index d9eedbd408..01893b38a9 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfigu
import org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConfiguration;
import org.jetbrains.annotations.NotNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
/**
* Test the effect of multiple authorization configurations on the general read
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java
index 4b2b5ec603..eb9afacd7d 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.oak.benchmark;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -45,8 +45,8 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
-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.commons.JcrUtils.getOrCreateByPath;
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
import static org.apache.jackrabbit.oak.api.Type.LONG;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsCheckedOutAddMixinSetPropertyTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsCheckedOutAddMixinSetPropertyTest.java
index f24bbf461a..41438f1e50 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsCheckedOutAddMixinSetPropertyTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsCheckedOutAddMixinSetPropertyTest.java
@@ -27,7 +27,7 @@ import javax.jcr.Session;
import java.util.List;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
public class IsCheckedOutAddMixinSetPropertyTest extends ReadDeepTreeTest {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
index d38f5832f4..de063e30ab 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginSystemTest.java
@@ -23,7 +23,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.security.auth.Subject;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.core.security.SystemPrincipal;
import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
index 4ca7a44aff..b600f893fc 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
@@ -24,7 +24,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import com.google.common.collect.ObjectArrays;
+import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
index 3b3b503c5e..5eda8b38a5 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
@@ -47,7 +47,7 @@ import javax.jcr.observation.EventIterator;
import javax.jcr.observation.EventListener;
import javax.jcr.observation.ObservationManager;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.oak.Oak;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
index 68a89a797b..0f5884c338 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.benchmark;
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-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.BOOLEAN;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.NAME;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
index f87b04f876..68cb0297a8 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
@@ -28,7 +28,7 @@ import javax.jcr.Session;
import org.apache.jackrabbit.commons.JcrUtils;
-import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.guava.common.io.ByteStreams;
abstract class ReadManyTest extends AbstractTest {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
index de2fcbdede..7f4a16c7cd 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
@@ -30,7 +30,7 @@ import javax.management.MBeanServer;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.Slf4jReporter;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.fixture.JcrCreator;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java
index e72a2000bb..ec14dc9940 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import com.google.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
/**
* A benchmark to run RevisionGC.
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SearchTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SearchTest.java
index 1c63b852d3..bfe3a7074d 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SearchTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SearchTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.jackrabbit.oak.benchmark;
-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.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import java.io.File;
@@ -40,7 +40,7 @@ import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java
index 43b5522c2f..5ed125b8df 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SetPropertyTest.java
@@ -27,7 +27,7 @@ import javax.jcr.nodetype.NodeTypeManager;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Maps;
/**
* Test for measuring the performance of setting a single property and
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
index b7ee11afca..ab52697236 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
@@ -23,7 +23,7 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.guava.common.io.ByteStreams;
public class SmallFileReadTest extends AbstractTest {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
index f1cfebb39d..8859f285b0 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
@@ -30,8 +30,8 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.security.auth.login.Configuration;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.Oak;
@@ -70,7 +70,7 @@ import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
/**
* Base benchmark test for external authentication.
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
index 83d6f70e38..ad2ab2e5df 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.benchmark.authentication.external;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate;
import org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/PrincipalNameResolutionTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/PrincipalNameResolutionTest.java
index d244d6f997..338bb1e1f6 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/PrincipalNameResolutionTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/PrincipalNameResolutionTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.benchmark.authentication.external;
import javax.security.auth.login.Configuration;
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AbstractHasItemGetItemTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AbstractHasItemGetItemTest.java
index 448866ecce..7856c479ef 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AbstractHasItemGetItemTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AbstractHasItemGetItemTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.user.Group;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AceCreationTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AceCreationTest.java
index 27af567b2b..ba91d8f72a 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AceCreationTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/AceCreationTest.java
@@ -24,7 +24,7 @@ import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.Privilege;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.oak.benchmark.AbstractTest;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/GetPrivilegeCollectionIncludeNamesTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/GetPrivilegeCollectionIncludeNamesTest.java
index 70b774add9..bd26398e8c 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/GetPrivilegeCollectionIncludeNamesTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/GetPrivilegeCollectionIncludeNamesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Sets;
import joptsimple.internal.Strings;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.authorization.PrivilegeCollection;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/HasPermissionHasItemGetItemTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/HasPermissionHasItemGetItemTest.java
index 698a979b75..13e4a3010a 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/HasPermissionHasItemGetItemTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/HasPermissionHasItemGetItemTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
index 97410cb7bd..8d34247441 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization.permission;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.user.User;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PermissionEvaluationTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PermissionEvaluationTest.java
index 90293d56e1..f9b41678e3 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PermissionEvaluationTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PermissionEvaluationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization.principalbased;
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
index 137a48fe9d..4c9954cdd4 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.oak.benchmark.authorization.principalbased;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
@@ -59,7 +59,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static javax.jcr.security.Privilege.JCR_ALL;
public class PrinicipalBasedReadTest extends ReadDeepTreeTest {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
index b1eb2f7f55..26b0f12394 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.benchmark.util;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
index e66d83cddc..82c10b70d8 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.benchmark.wikipedia;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static java.lang.Math.min;
import java.io.BufferedInputStream;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/run/Main.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/run/Main.java
index 5597efb373..2bf039528b 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/run/Main.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/run/Main.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.run;
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.run.commons.Command;
import org.apache.jackrabbit.oak.run.commons.Modes;
import org.apache.jackrabbit.oak.run.commons.Utils;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
index d38f251106..478843837e 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Charsets;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.base.Charsets;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+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 joptsimple.OptionParser;
import joptsimple.OptionSet;
import org.apache.commons.io.FileUtils;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/ConcurrentReader.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/ConcurrentReader.java
index f2338634c7..bbb496c838 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/ConcurrentReader.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/ConcurrentReader.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.scalability.benchmarks.search;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java
index b64d140f78..ff3ea233b8 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java
@@ -23,7 +23,7 @@ import java.lang.management.ManagementFactory;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.management.MBeanServer;
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
index 150ef661d9..d50f069c64 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
@@ -18,9 +18,9 @@
*/
package org.apache.jackrabbit.oak.scalability.suites;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Maps.newConcurrentMap;
-import static com.google.common.collect.Maps.newLinkedHashMap;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
+import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import java.io.PrintStream;
import java.util.LinkedList;
@@ -37,9 +37,9 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Preconditions;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;