This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-10199 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 16d3eb8e5ce555e192b5db60ed13d23b0f526c93 Author: Julian Reschke <[email protected]> AuthorDate: Fri Apr 21 13:06:38 2023 +0200 OAK-10205: switch oak-http to shaded guava (#908) --- oak-http/pom.xml | 14 +++++--------- .../java/org/apache/jackrabbit/oak/http/AcceptHeader.java | 2 +- .../org/apache/jackrabbit/oak/http/HtmlRepresentation.java | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/oak-http/pom.xml b/oak-http/pom.xml index 4b48a6bcad..e9296b435d 100644 --- a/oak-http/pom.xml +++ b/oak-http/pom.xml @@ -38,10 +38,6 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package> - <!-- OAK-7182 -->${guava.osgi.import}, - * - </Import-Package> <Export-Package> !* </Export-Package> @@ -64,6 +60,11 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-shaded-guava</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-core</artifactId> @@ -92,11 +93,6 @@ <version>2.5</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> <!-- Nullability annotations --> <dependency> diff --git a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/AcceptHeader.java b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/AcceptHeader.java index 158700e3a2..6e7b38e3d9 100644 --- a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/AcceptHeader.java +++ b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/AcceptHeader.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MediaTypeRegistry; -import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; public class AcceptHeader { diff --git a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java index 315a0c04e2..8e9aed2a0d 100644 --- a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java +++ b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java @@ -35,7 +35,7 @@ import org.apache.tika.mime.MediaType; import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.SAXException; -import com.google.common.base.Charsets; +import org.apache.jackrabbit.guava.common.base.Charsets; import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS;
