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/09 09:22:26 UTC

[jackrabbit-oak] 01/01: OAK-10290: switch oak-benchmarks-elastic to shaded guava

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-10290
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit 7dec5c9aa7d37ef065ca14fb90a07d73443b4785
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Jun 9 10:22:08 2023 +0100

    OAK-10290: switch oak-benchmarks-elastic to shaded guava
---
 .../oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java      | 2 +-
 .../apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java  | 2 +-
 .../src/main/java/org/apache/jackrabbit/oak/run/ElasticMain.java        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java
index 82730e3287..989ee8e22f 100644
--- a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java
+++ b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import javax.jcr.Repository;
 import java.io.File;
 
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
 
 public class ElasticFullTextWithoutGlobalIndexSearchTest extends SearchTest {
 
diff --git a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
index 152df35b6f..645d43e2d0 100644
--- a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
+++ b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 
-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.index.IndexConstants.INDEX_DEFINITIONS_NAME;
 
 public class ElasticGlobalInitializer implements RepositoryInitializer {
diff --git a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/run/ElasticMain.java b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/run/ElasticMain.java
index 0fe6bea67d..bc3d247fc9 100644
--- a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/run/ElasticMain.java
+++ b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/run/ElasticMain.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;