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/08 14:12:05 UTC
[jackrabbit-oak] branch trunk updated: OAK-10283: switch oak-examples to shaded guava (#970)
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 1909b7cc06 OAK-10283: switch oak-examples to shaded guava (#970)
1909b7cc06 is described below
commit 1909b7cc068ae38a2759323af03ccfde66cfcc85
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Jun 8 16:11:58 2023 +0200
OAK-10283: switch oak-examples to shaded guava (#970)
---
.../org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java | 6 +++---
.../webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java b/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
index b0db1be219..3d01fe3d26 100644
--- a/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
+++ b/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RepositoryInitializer.java
@@ -32,9 +32,9 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.servlet.ServletContext;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.felix.connect.launch.PojoServiceRegistry;
diff --git a/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java b/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
index d1b7cf8e43..9f52c34ed9 100644
--- a/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
+++ b/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
@@ -37,7 +37,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlInput;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.google.common.io.Files;
+import org.apache.jackrabbit.guava.common.io.Files;
public class TomcatIT extends TestCase {