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 12:35:26 UTC
[jackrabbit-oak] branch OAK-10283 created (now 73b8557de7)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10283
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 73b8557de7 OAK-10283: switch oak-examples to shaded guava
This branch includes the following new commits:
new 73b8557de7 OAK-10283: switch oak-examples 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-10283: switch oak-examples to shaded guava
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10283
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 73b8557de761950a4b40352a9548f6a869f6d1bc
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jun 8 13:35:09 2023 +0100
OAK-10283: switch oak-examples to shaded guava
---
.../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 {