[jackrabbit-oak] branch OAK-10292 created (now 3938343d38)

[re...@apache.org]

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

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


      at 3938343d38 OAK-10292: switch oak-benchmarks-solr to shaded guava

This branch includes the following new commits:

     new 3938343d38 OAK-10292: switch oak-benchmarks-solr 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-10292: switch oak-benchmarks-solr to shaded guava

[re...@apache.org]

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

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

commit 3938343d3833b890ebf33ac9e50f38b2afa83cce
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Jun 9 12:27:25 2023 +0100

    OAK-10292: switch oak-benchmarks-solr to shaded guava
---
 .../src/main/java/org/apache/jackrabbit/oak/run/SolrMain.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oak-benchmarks-solr/src/main/java/org/apache/jackrabbit/oak/run/SolrMain.java b/oak-benchmarks-solr/src/main/java/org/apache/jackrabbit/oak/run/SolrMain.java
index f5215d0815..74f8083402 100644
--- a/oak-benchmarks-solr/src/main/java/org/apache/jackrabbit/oak/run/SolrMain.java
+++ b/oak-benchmarks-solr/src/main/java/org/apache/jackrabbit/oak/run/SolrMain.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;