This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10368 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7950714a4360422ce6ad7ceb8bcf32b0c5cda336 Author: Julian Reschke <resc...@apache.org> AuthorDate: Wed Jul 26 17:32:09 2023 +0100 OAK-10368: convert groovy sources to shaded guava --- .../org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy | 2 +- .../org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy | 2 +- .../apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy | 4 ++-- .../org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy | 2 +- .../org/apache/jackrabbit/oak/console/commands/CdCommand.groovy | 4 ++-- .../org/apache/jackrabbit/oak/console/commands/LsCommand.groovy | 2 +- .../org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy | 4 ++-- .../jackrabbit/oak/console/commands/PrintDocumentCommand.groovy | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy index e59e14dcb5..24c83bf656 100644 --- a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy +++ b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.run.osgi -import com.google.common.collect.ImmutableSet +import org.apache.jackrabbit.guava.common.collect.ImmutableSet import org.apache.felix.jaas.LoginModuleFactory import org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule import org.apache.jackrabbit.oak.spi.security.authentication.AuthenticationConfiguration diff --git a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy index 1357f71b6b..d0ebbbffdb 100644 --- a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy +++ b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy @@ -37,7 +37,7 @@ import javax.jcr.Node import javax.jcr.Session import javax.jcr.query.* -import static com.google.common.collect.Lists.newArrayList +import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT import static org.apache.jackrabbit.JcrConstants.NT_FILE import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME diff --git a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy index d55b90bb51..acd3944e84 100644 --- a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy +++ b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.run.osgi -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.felix.connect.launch.PojoServiceRegistry import org.apache.jackrabbit.oak.spi.state.NodeState import org.apache.jackrabbit.oak.spi.state.NodeStore diff --git a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy index e184373272..d3f2dc10a8 100644 --- a/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy +++ b/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.run.osgi -import com.google.common.collect.Sets +import org.apache.jackrabbit.guava.common.collect.Sets import groovy.util.logging.Slf4j import org.apache.felix.jaas.LoginModuleFactory import org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy index 6db30ace07..f28061d0bf 100644 --- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy +++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy @@ -18,8 +18,8 @@ */ package org.apache.jackrabbit.oak.console.commands -import com.google.common.collect.Iterables -import com.google.common.collect.Lists +import org.apache.jackrabbit.guava.common.collect.Iterables +import org.apache.jackrabbit.guava.common.collect.Lists import jline.console.completer.Completer import org.apache.jackrabbit.oak.commons.PathUtils import org.apache.jackrabbit.oak.console.ConsoleSession diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy index 16874116d2..baffaffc71 100644 --- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy +++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.console.commands -import com.google.common.collect.Iterables +import org.apache.jackrabbit.guava.common.collect.Iterables import groovy.transform.CompileStatic import org.apache.jackrabbit.oak.console.ConsoleSession import org.codehaus.groovy.tools.shell.CommandSupport diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy index 53fe18b9c5..d4caa7f578 100644 --- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy +++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.console.commands -import com.google.common.base.Stopwatch +import org.apache.jackrabbit.guava.common.base.Stopwatch import org.apache.jackrabbit.oak.commons.PathUtils import org.apache.jackrabbit.oak.console.ConsoleSession import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition @@ -40,7 +40,7 @@ import org.codehaus.groovy.tools.shell.Groovysh import org.apache.jackrabbit.oak.spi.state.NodeBuilder as OakNodeBuilder -import static com.google.common.base.Preconditions.checkNotNull +import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull class LuceneCommand extends ComplexCommandSupport { public static final String COMMAND_NAME = 'lucene' diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy index 490108f459..f75eaf182b 100644 --- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy +++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.console.commands -import com.google.common.collect.Sets +import org.apache.jackrabbit.guava.common.collect.Sets import groovy.transform.CompileStatic import org.apache.jackrabbit.oak.console.ConsoleSession import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore