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 11:05:44 UTC
[jackrabbit-oak] branch trunk updated: OAK-10290: switch oak-benchmarks-elastic to shaded guava (#976)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3796f984ab OAK-10290: switch oak-benchmarks-elastic to shaded guava (#976)
3796f984ab is described below
commit 3796f984abea54d883879b7c25dc0463c6e209e0
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Jun 9 13:05:37 2023 +0200
OAK-10290: switch oak-benchmarks-elastic to shaded guava (#976)
---
.../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;