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/04/17 10:00:21 UTC
[jackrabbit-oak] 01/01: OAK-10192: switch oak-query-spi to shaded guava
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10192
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c13748bc818436fb0ff3ab4b2cb241b7e0e1a057
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Apr 17 11:00:04 2023 +0100
OAK-10192: switch oak-query-spi to shaded guava
---
oak-query-spi/pom.xml | 13 +++++--------
.../org/apache/jackrabbit/oak/query/facet/FacetResult.java | 4 ++--
.../oak/spi/query/CompositeQueryIndexProvider.java | 4 ++--
.../org/apache/jackrabbit/oak/spi/query/QueryIndex.java | 2 +-
.../apache/jackrabbit/oak/query/facet/FacetResultTest.java | 2 +-
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/oak-query-spi/pom.xml b/oak-query-spi/pom.xml
index 5db1c545a3..848a4692dc 100644
--- a/oak-query-spi/pom.xml
+++ b/oak-query-spi/pom.xml
@@ -39,7 +39,6 @@
<configuration>
<instructions>
<Import-Package>
- <!-- OAK-7182 -->${guava.osgi.import},
*
</Import-Package>
<Export-Package>
@@ -79,20 +78,18 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-core-spi</artifactId>
+ <artifactId>oak-shaded-guava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-spi</artifactId>
+ <artifactId>oak-core-spi</artifactId>
<version>${project.version}</version>
</dependency>
-
- <!-- General utility libraries -->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-store-spi</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Nullability annotations -->
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
index 1f54da1fb3..7b0e3eb896 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.query.facet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
index eefcaa65f2..05f41fc791 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/CompositeQueryIndexProvider.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Lists;
/**
* This {@code QueryIndexProvider} aggregates a list of query index providers
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
index d74d9ca38d..34f9adff06 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.slf4j.event.Level;
diff --git a/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java b/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
index 097b3c56ac..26ca9af125 100644
--- a/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
+++ b/oak-query-spi/src/test/java/org/apache/jackrabbit/oak/query/facet/FacetResultTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query.facet;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.query.facet.FacetResult.Facet;
import org.apache.jackrabbit.oak.query.facet.FacetResult.FacetResultRow;