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/04 05:17:25 UTC
[jackrabbit-oak] 01/01: OAK-10179: switch oak-commons to shaded guava
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10179
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 6445a2c0af8f42ca34f939ebd30979287d6f33e1
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Apr 4 06:17:09 2023 +0100
OAK-10179: switch oak-commons to shaded guava
---
oak-commons/pom.xml | 5 +++
.../apache/jackrabbit/oak/commons/FileIOUtils.java | 45 +++++++++++----------
.../apache/jackrabbit/oak/commons/PathUtils.java | 7 ++--
.../apache/jackrabbit/oak/commons/StringUtils.java | 4 +-
.../oak/commons/TimeDurationFormatter.java | 7 ++--
.../apache/jackrabbit/oak/commons/UUIDUtils.java | 4 +-
.../oak/commons/io/FileLineDifferenceIterator.java | 8 ++--
.../jackrabbit/oak/commons/sort/EscapeUtils.java | 2 +-
.../jackrabbit/oak/commons/sort/StringSort.java | 18 ++++-----
.../apache/jackrabbit/oak/commons/CIHelper.java | 4 +-
.../jackrabbit/oak/commons/FileIOUtilsTest.java | 46 +++++++++++-----------
.../commons/FileLineDifferenceIteratorTest.java | 10 ++---
.../apache/jackrabbit/oak/commons/IOUtilsTest.java | 2 +-
.../jackrabbit/oak/commons/PathUtilsTest.java | 2 +-
.../jackrabbit/oak/commons/StringUtilsTest.java | 2 +-
.../oak/commons/junit/LogCustomizer.java | 2 +-
.../oak/commons/sort/ExternalSortTest.java | 12 +++---
.../oak/commons/sort/StringSortTest.java | 8 ++--
18 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
index 1646f5c011..97a526ec86 100644
--- a/oak-commons/pom.xml
+++ b/oak-commons/pom.xml
@@ -106,6 +106,11 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-shaded-guava</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
index f45409c60c..e0143a1994 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
@@ -16,6 +16,22 @@
*/
package org.apache.jackrabbit.oak.commons;
+import static java.io.File.createTempFile;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.io.FileUtils.forceDelete;
+import static org.apache.commons.io.IOUtils.closeQuietly;
+import static org.apache.commons.io.IOUtils.copyLarge;
+import static org.apache.commons.io.LineIterator.closeQuietly;
+import static org.apache.jackrabbit.guava.common.io.Closeables.close;
+import static org.apache.jackrabbit.guava.common.io.FileWriteMode.APPEND;
+import static org.apache.jackrabbit.guava.common.io.Files.asByteSink;
+import static org.apache.jackrabbit.guava.common.io.Files.move;
+import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
+import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.mergeSortedFiles;
+import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.sortInBatch;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.Closeable;
@@ -26,39 +42,22 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
-import com.google.common.base.Charsets;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.guava.common.collect.PeekingIterator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.io.Closeables.close;
-import static com.google.common.io.FileWriteMode.APPEND;
-import static com.google.common.io.Files.asByteSink;
-import static com.google.common.io.Files.move;
-import static com.google.common.io.Files.newWriter;
-import static java.io.File.createTempFile;
-import static org.apache.commons.io.FileUtils.forceDelete;
-import static org.apache.commons.io.IOUtils.closeQuietly;
-import static org.apache.commons.io.IOUtils.copyLarge;
-import static org.apache.commons.io.LineIterator.closeQuietly;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
-import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.mergeSortedFiles;
-import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.sortInBatch;
-
/**
* Simple File utils
*/
@@ -291,11 +290,11 @@ public final class FileIOUtils {
*/
public static Set<String> readStringsAsSet(InputStream stream, boolean unescape) throws IOException {
BufferedReader reader = null;
- Set<String> set = newHashSet();
+ Set<String> set = new HashSet<>();
boolean threw = true;
try {
- reader = new BufferedReader(new InputStreamReader(stream, Charsets.UTF_8));
+ reader = new BufferedReader(new InputStreamReader(stream, UTF_8));
String line = null;
while ((line = reader.readLine()) != null) {
if (unescape) {
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
index 03822fb155..a97ae5012d 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
@@ -16,8 +16,7 @@
*/
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.collect.Sets.newHashSet;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Set;
@@ -497,8 +496,8 @@ public final class PathUtils {
* @param excludedPaths set of paths to be excluded
*/
public static void unifyInExcludes(Set<String> includePaths, Set<String> excludedPaths) {
- Set<String> retain = newHashSet();
- Set<String> includesRemoved = newHashSet();
+ Set<String> retain = new HashSet<>();
+ Set<String> includesRemoved = new HashSet<>();
for (String include : includePaths) {
for (String exclude : excludedPaths) {
if (exclude.equals(include) || isAncestor(exclude, include)) {
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
index 287fa6aa3a..db9c766a1a 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
index 8b8de10730..8040f93d2f 100755
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
@@ -22,8 +22,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
/**
* Format a time duration as human-readable string, inspired by
@@ -41,7 +40,7 @@ public class TimeDurationFormatter {
private static Map<TimeUnit, String> DISPLAYUNIT_ASCII;
static {
- HashMap<TimeUnit, String> t = Maps.newHashMap();
+ HashMap<TimeUnit, String> t = new HashMap<>();
t.put(TimeUnit.DAYS, "d");
t.put(TimeUnit.HOURS, "h");
t.put(TimeUnit.MINUTES, "min");
@@ -50,7 +49,7 @@ public class TimeDurationFormatter {
t.put(TimeUnit.MICROSECONDS, "us");
t.put(TimeUnit.NANOSECONDS, "ns");
DISPLAYUNIT_ASCII = Collections.unmodifiableMap(t);
- t = Maps.newHashMap(t);
+ t = new HashMap<>(t);
// Unicode "MICRO SIGN"
t.put(TimeUnit.MICROSECONDS, "\u00b5s");
DISPLAYUNIT = Collections.unmodifiableMap(t);
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
index bf7969b085..8fddd9314c 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.commons;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
-import com.google.common.base.Charsets;
import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ public final class UUIDUtils {
@NotNull
public static String generateUUID(String hint) {
- UUID uuid = UUID.nameUUIDFromBytes(hint.getBytes(Charsets.UTF_8));
+ UUID uuid = UUID.nameUUIDFromBytes(hint.getBytes(StandardCharsets.UTF_8));
return uuid.toString();
}
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
index 733c36fdc6..633653aab8 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.commons.io;
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import java.io.BufferedWriter;
@@ -32,9 +32,9 @@ import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.jetbrains.annotations.Nullable;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
+import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.guava.common.collect.PeekingIterator;
/**
* FileLineDifferenceIterator class which iterates over the difference of 2 files line by line.
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
index 5c13bf2efd..2e178bb840 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.commons.sort;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
index 04216e321a..f213bd19c0 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
@@ -19,6 +19,9 @@
package org.apache.jackrabbit.oak.commons.sort;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.Closeable;
@@ -31,24 +34,19 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
-
/**
* Utility class to store a list of string and perform sort on that. For small size
* the list would be maintained in memory. If the size crosses the required threshold then
@@ -61,10 +59,10 @@ public class StringSort implements Iterable<String>, Closeable {
private final int overflowToDiskThreshold;
private final Comparator<String> comparator;
- private final List<String> ids = Lists.newArrayList();
+ private final List<String> ids = new ArrayList<>();
private long size;
- private final List<String> inMemBatch = Lists.newArrayList();
+ private final List<String> inMemBatch = new ArrayList<>();
private boolean useFile;
private PersistentState persistentState;
@@ -167,13 +165,13 @@ public class StringSort implements Iterable<String>, Closeable {
*/
private static final int TEMP_DIR_ATTEMPTS = 10000;
- private final Charset charset = Charsets.UTF_8;
+ private final Charset charset = StandardCharsets.UTF_8;
private final File workDir;
private final Comparator<String> comparator;
private File idFile;
private File sortedFile;
private BufferedWriter writer;
- private List<CloseableIterator> openedIterators = Lists.newArrayList();
+ private List<CloseableIterator> openedIterators = new ArrayList<>();
public PersistentState(Comparator<String> comparator) {
this(comparator, createTempDir("oak-sorter-"));
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
index 4eaf7826a8..bcf707b71b 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.base.Objects.equal;
+import static org.apache.jackrabbit.guava.common.base.Objects.equal;
import static java.lang.Boolean.parseBoolean;
import static java.lang.System.getenv;
-import com.google.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
/**
* Utility class for ITs to determine the environment running in.
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
index 493eb8a070..3d4ffbc642 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
@@ -18,6 +18,26 @@
*/
package org.apache.jackrabbit.oak.commons;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.collect.Sets.union;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.append;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.copy;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.lexComparator;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.lineBreakAwareComparator;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.merge;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.readStringsAsSet;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort;
+import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings;
+import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
+import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -39,10 +59,10 @@ import java.util.Locale;
import java.util.Random;
import java.util.Set;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Longs;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.collect.Sets;
+import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.apache.jackrabbit.oak.commons.FileIOUtils.BurnOnCloseFileIterator;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
@@ -50,26 +70,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.collect.Sets.union;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.append;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.copy;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.lexComparator;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.lineBreakAwareComparator;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.merge;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.readStringsAsSet;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort;
-import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings;
-import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
-import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
/**
* Tests for {@link FileIOUtils}
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
index f7f8681871..f7dc371937 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
@@ -29,11 +29,11 @@ import java.util.Random;
import java.util.TreeSet;
import java.util.function.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.base.StandardSystemProperty;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
index 2292870b83..919b85fcfc 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import junit.framework.TestCase;
/**
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
index ffe6d8c151..417db72cb0 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.junit.Assert;
import org.junit.Test;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
/**
* Test the PathUtils class.
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
index 059f229a15..176cf75ee6 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.fail;
import java.util.Map;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.collect.Maps;
import org.junit.Test;
/**
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
index 2593c98650..8d55ffef4c 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
@@ -31,7 +31,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.AppenderBase;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
/**
* The LogCustomizer allows to enable log level for a specific logger and/or
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
index 629c29eb66..37fd07047f 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.commons.sort;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.io.Files;
-import com.google.common.primitives.Ints;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.io.Files;
+import org.apache.jackrabbit.guava.common.primitives.Ints;
import net.jpountz.lz4.LZ4FrameInputStream;
import net.jpountz.lz4.LZ4FrameOutputStream;
import org.apache.jackrabbit.oak.commons.Compression;
@@ -39,6 +38,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -47,7 +47,7 @@ import java.util.List;
import java.util.Scanner;
import java.util.function.Function;
-import static com.google.common.collect.Iterables.transform;
+import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -470,7 +470,7 @@ public class ExternalSortTest {
Collections.shuffle(testLines);
Comparator<TestLine> cmp = Comparator.naturalOrder();
- Charset charset = Charsets.UTF_8;
+ Charset charset = StandardCharsets.UTF_8;
Function<String, TestLine> stringToType = line -> line != null ? new TestLine(line) : null;
Function<TestLine, String> typeToString = tl -> tl != null ? tl.line : null;
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
index fd15c880d1..2e59ebca20 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
@@ -29,10 +29,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.collect.Collections2;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.Lists;
import org.junit.Test;
import static org.junit.Assert.assertEquals;