hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [8/8] hbase git commit: HBASE-17908 Upgrade guava
Date Fri, 21 Jul 2017 14:28:49 GMT
HBASE-17908 Upgrade guava

Pull in guava 22.0 by using the shaded version up in new hbase-thirdparty project.

In poms, exclude guava everywhere except on hadoop-common. Do this so
we minimize transitive includes. hadoop-common is needed because hadoop
Configuration uses guava doing preconditions.

Everywhere we used guava, instead use shaded so fix a load of imports.

Stopwatch API changed as did hashing and toStringHelper which is now
in MoreObjects class. Otherwise, minimal changes to come up on 22.0


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/890d92a9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/890d92a9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/890d92a9

Branch: refs/heads/master
Commit: 890d92a90cb5ef8d17e6c3e4036c8077dea4dc86
Parents: 7941b83
Author: Michael Stack <stack@apache.org>
Authored: Thu Jul 6 22:43:46 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Fri Jul 21 15:28:08 2017 +0100

----------------------------------------------------------------------
 hbase-assembly/pom.xml                          |  6 ++
 hbase-client/pom.xml                            | 15 +++-
 .../apache/hadoop/hbase/MetaTableAccessor.java  |  2 +-
 .../hbase/client/AsyncConnectionImpl.java       |  2 +-
 .../hadoop/hbase/client/AsyncHBaseAdmin.java    |  6 ++
 .../hadoop/hbase/client/AsyncProcess.java       |  2 +-
 .../hbase/client/AsyncRequestFutureImpl.java    |  2 +-
 .../client/AsyncRpcRetryingCallerFactory.java   |  6 +-
 .../AsyncScanSingleRegionRpcRetryingCaller.java |  2 +-
 .../hadoop/hbase/client/AsyncTableBase.java     |  2 +-
 .../hbase/client/AsyncTableResultScanner.java   |  4 +-
 .../hbase/client/BufferedMutatorImpl.java       |  2 +-
 .../client/ClientAsyncPrefetchScanner.java      |  2 +-
 .../hadoop/hbase/client/ClientScanner.java      |  2 +-
 .../client/ColumnFamilyDescriptorBuilder.java   |  2 +-
 .../hbase/client/ConnectionConfiguration.java   |  2 +-
 .../hbase/client/ConnectionImplementation.java  |  2 +-
 .../hadoop/hbase/client/ConnectionUtils.java    |  4 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |  2 +-
 .../hadoop/hbase/client/HRegionLocator.java     |  2 +-
 .../org/apache/hadoop/hbase/client/HTable.java  |  4 +-
 .../hadoop/hbase/client/HTableMultiplexer.java  |  4 +-
 .../hadoop/hbase/client/MetricsConnection.java  |  2 +-
 .../hbase/client/MultiServerCallable.java       |  2 +-
 .../apache/hadoop/hbase/client/Mutation.java    | 10 +--
 .../client/PreemptiveFastFailInterceptor.java   |  2 +-
 .../org/apache/hadoop/hbase/client/Query.java   |  6 +-
 .../hadoop/hbase/client/RawAsyncTableImpl.java  |  2 +-
 .../client/RegionCoprocessorRpcChannel.java     |  2 +-
 .../client/RegionCoprocessorServiceExec.java    |  2 +-
 .../apache/hadoop/hbase/client/RowAccess.java   |  2 +-
 .../client/ScannerCallableWithReplicas.java     |  2 +-
 .../hbase/client/ServerStatisticTracker.java    |  2 +-
 .../hbase/client/SimpleRequestController.java   |  2 +-
 .../backoff/ExponentialClientBackoffPolicy.java |  2 +-
 .../client/metrics/ServerSideScanMetrics.java   |  2 +-
 .../client/replication/ReplicationAdmin.java    |  4 +-
 .../replication/ReplicationSerDeHelper.java     |  2 +-
 .../hbase/filter/ColumnCountGetFilter.java      |  2 +-
 .../hbase/filter/ColumnPaginationFilter.java    |  2 +-
 .../hadoop/hbase/filter/ColumnPrefixFilter.java |  2 +-
 .../hadoop/hbase/filter/ColumnRangeFilter.java  |  2 +-
 .../hadoop/hbase/filter/CompareFilter.java      |  2 +-
 .../hbase/filter/DependentColumnFilter.java     |  2 +-
 .../hadoop/hbase/filter/FirstKeyOnlyFilter.java |  2 +-
 .../hadoop/hbase/filter/FuzzyRowFilter.java     |  2 +-
 .../hbase/filter/InclusiveStopFilter.java       |  2 +-
 .../hadoop/hbase/filter/KeyOnlyFilter.java      |  2 +-
 .../apache/hadoop/hbase/filter/PageFilter.java  |  2 +-
 .../hadoop/hbase/filter/PrefixFilter.java       |  2 +-
 .../hbase/filter/SingleColumnValueFilter.java   |  2 +-
 .../hadoop/hbase/filter/TimestampsFilter.java   |  2 +-
 .../hadoop/hbase/ipc/AbstractRpcClient.java     | 10 +--
 .../hadoop/hbase/ipc/BlockingRpcClient.java     |  2 +-
 .../hadoop/hbase/ipc/CoprocessorRpcUtils.java   |  2 +-
 .../org/apache/hadoop/hbase/ipc/IPCUtil.java    |  2 +-
 .../hbase/ipc/NettyRpcClientConfigHelper.java   |  2 +-
 .../hadoop/hbase/ipc/RpcClientFactory.java      |  4 +-
 .../ReplicationQueuesClientZKImpl.java          |  4 +-
 .../replication/ReplicationStateZKBase.java     |  2 +-
 .../hbase/replication/ReplicationTableBase.java |  2 +-
 .../security/AbstractHBaseSaslRpcClient.java    |  2 +-
 .../security/access/AccessControlUtil.java      |  8 +-
 .../hbase/security/access/Permission.java       |  2 +-
 .../access/ShadedAccessControlUtil.java         |  4 +-
 .../hbase/zookeeper/MetricsZooKeeper.java       |  2 +-
 .../hadoop/hbase/zookeeper/ZNodePaths.java      |  2 +-
 .../hbase/TestInterfaceAudienceAnnotations.java | 10 +--
 .../hbase/client/TestClientNoCluster.java       | 12 ++-
 .../hbase/security/TestHBaseSaslRpcClient.java  |  2 +-
 hbase-common/pom.xml                            |  5 +-
 .../apache/hadoop/hbase/ByteBufferKeyValue.java |  2 +-
 .../org/apache/hadoop/hbase/CellComparator.java |  2 +-
 .../org/apache/hadoop/hbase/ChoreService.java   |  2 +-
 .../java/org/apache/hadoop/hbase/KeyValue.java  |  2 +-
 .../apache/hadoop/hbase/KeyValueTestUtil.java   |  2 +-
 .../org/apache/hadoop/hbase/KeyValueUtil.java   |  4 +-
 .../org/apache/hadoop/hbase/ScheduledChore.java |  2 +-
 .../org/apache/hadoop/hbase/ServerName.java     |  2 +-
 .../java/org/apache/hadoop/hbase/TableName.java |  6 +-
 .../apache/hadoop/hbase/io/ByteBufferPool.java  |  2 +-
 .../hadoop/hbase/io/LimitInputStream.java       |  4 +-
 .../apache/hadoop/hbase/io/crypto/Context.java  |  2 +-
 .../apache/hadoop/hbase/io/crypto/aes/AES.java  |  4 +-
 .../hbase/io/crypto/aes/AESDecryptor.java       |  2 +-
 .../hbase/io/crypto/aes/AESEncryptor.java       |  2 +-
 .../hbase/io/crypto/aes/CommonsCryptoAES.java   |  4 +-
 .../crypto/aes/CommonsCryptoAESDecryptor.java   |  2 +-
 .../crypto/aes/CommonsCryptoAESEncryptor.java   |  2 +-
 .../hbase/io/encoding/EncodedDataBlock.java     |  4 +-
 .../HFileBlockDefaultEncodingContext.java       |  2 +-
 .../io/hadoopbackport/ThrottledInputStream.java |  2 +-
 .../hadoop/hbase/io/util/LRUDictionary.java     |  2 +-
 .../hadoop/hbase/io/util/StreamUtils.java       |  2 +-
 .../org/apache/hadoop/hbase/net/Address.java    |  4 +-
 .../apache/hadoop/hbase/nio/MultiByteBuff.java  |  2 +-
 .../apache/hadoop/hbase/nio/SingleByteBuff.java |  2 +-
 .../org/apache/hadoop/hbase/security/User.java  |  2 +-
 .../hadoop/hbase/security/UserProvider.java     | 14 ++--
 .../hbase/util/AbstractPositionedByteRange.java |  2 +-
 .../hadoop/hbase/util/ByteBufferUtils.java      |  2 +-
 .../hadoop/hbase/util/ByteRangeUtils.java       |  2 +-
 .../org/apache/hadoop/hbase/util/Bytes.java     | 10 +--
 .../hadoop/hbase/util/ClassLoaderBase.java      |  2 +-
 .../org/apache/hadoop/hbase/util/ClassSize.java |  2 +-
 .../hbase/util/CoprocessorClassLoader.java      |  4 +-
 .../apache/hadoop/hbase/util/OrderedBytes.java  |  2 +-
 .../org/apache/hadoop/hbase/util/Threads.java   |  2 +-
 .../hbase/util/test/RedundantKVGenerator.java   |  2 +-
 .../apache/hadoop/hbase/zookeeper/ZKConfig.java |  2 +-
 .../org/apache/hadoop/hbase/ClassFinder.java    |  2 +-
 .../apache/hadoop/hbase/TestClassFinder.java    |  5 +-
 .../hadoop/hbase/TestHBaseConfiguration.java    |  2 +-
 .../hadoop/hbase/codec/TestCellCodec.java       |  4 +-
 .../hbase/codec/TestCellCodecWithTags.java      |  4 +-
 .../hadoop/hbase/codec/TestKeyValueCodec.java   |  4 +-
 .../hbase/codec/TestKeyValueCodecWithTags.java  |  4 +-
 hbase-endpoint/pom.xml                          | 61 +++++++++++---
 .../hbase/client/TestRpcControllerFactory.java  |  2 +-
 ...gionServerBulkLoadWithOldSecureEndpoint.java |  2 +-
 hbase-examples/pom.xml                          | 10 +++
 .../hbase/client/example/HttpProxyExample.java  |  4 +-
 .../example/MultiThreadedClientExample.java     |  2 +-
 .../client/example/TestHttpProxyExample.java    |  2 +-
 hbase-external-blockcache/pom.xml               | 12 +++
 hbase-hadoop-compat/pom.xml                     |  4 +
 .../hadoop/hbase/metrics/OperationMetrics.java  |  2 +-
 hbase-hadoop2-compat/pom.xml                    | 14 +++-
 .../apache/hadoop/hbase/metrics/Interns.java    |  6 +-
 .../hadoop/hbase/metrics/MetricsInfoImpl.java   |  7 +-
 .../impl/GlobalMetricRegistriesAdapter.java     |  2 +-
 .../hadoop/metrics2/impl/JmxCacheBuster.java    |  2 +-
 .../metrics2/lib/DynamicMetricsRegistry.java    |  6 +-
 .../metrics2/util/MetricSampleQuantiles.java    |  2 +-
 hbase-it/pom.xml                                | 22 ++++-
 .../hbase/IntegrationTestAcidGuarantees.java    |  2 +-
 .../hbase/IntegrationTestBackupRestore.java     |  8 +-
 .../hadoop/hbase/IntegrationTestIngest.java     |  2 +-
 .../hbase/IntegrationTestRegionReplicaPerf.java | 10 +--
 ...IntegrationTestRegionReplicaReplication.java |  2 +-
 .../hbase/chaos/factories/MonkeyFactory.java    |  2 +-
 .../hbase/chaos/util/ChaosMonkeyRunner.java     |  2 +-
 .../hbase/ipc/IntegrationTestRpcClient.java     |  2 +-
 .../mapreduce/IntegrationTestBulkLoad.java      |  4 +-
 .../hadoop/hbase/mttr/IntegrationTestMTTR.java  |  7 +-
 .../test/IntegrationTestBigLinkedList.java      |  2 +-
 .../test/IntegrationTestLoadAndVerify.java      |  2 +-
 .../hbase/test/IntegrationTestReplication.java  |  2 +-
 ...undedMultiGetRequestsWithRegionReplicas.java |  2 +-
 ...stTimeBoundedRequestsWithRegionReplicas.java |  2 +-
 hbase-metrics-api/pom.xml                       |  8 ++
 .../hbase/metrics/MetricRegistriesLoader.java   |  2 +-
 .../metrics/TestMetricRegistriesLoader.java     |  4 +-
 hbase-metrics/pom.xml                           |  4 +
 .../hbase/metrics/impl/TestRefCountingMap.java  |  2 +-
 hbase-prefix-tree/pom.xml                       | 20 ++++-
 .../decode/PrefixTreeArraySearcher.java         |  2 +-
 .../encode/column/ColumnSectionWriter.java      |  2 +-
 .../prefixtree/encode/other/LongEncoder.java    |  2 +-
 .../prefixtree/encode/row/RowSectionWriter.java |  2 +-
 .../prefixtree/encode/tokenize/Tokenizer.java   |  2 +-
 .../encode/tokenize/TokenizerNode.java          |  2 +-
 .../hbase/util/byterange/ByteRangeSet.java      |  2 +-
 .../prefixtree/builder/TestTokenizerData.java   |  2 +-
 .../codec/prefixtree/builder/TestTreeDepth.java |  2 +-
 .../builder/data/TestTokenizerDataBasic.java    |  2 +-
 .../builder/data/TestTokenizerDataEdgeCase.java |  2 +-
 .../prefixtree/column/TestColumnBuilder.java    |  2 +-
 .../codec/prefixtree/column/TestColumnData.java |  2 +-
 .../column/data/TestColumnDataRandom.java       |  2 +-
 .../column/data/TestColumnDataSimple.java       |  2 +-
 .../codec/prefixtree/row/BaseTestRowData.java   |  2 +-
 .../hbase/codec/prefixtree/row/TestRowData.java |  2 +-
 .../codec/prefixtree/row/TestRowEncoder.java    |  2 +-
 .../row/data/TestRowDataComplexQualifiers.java  |  2 +-
 .../prefixtree/row/data/TestRowDataDeeper.java  |  2 +-
 .../data/TestRowDataDifferentTimestamps.java    |  2 +-
 .../prefixtree/row/data/TestRowDataEmpty.java   |  2 +-
 .../row/data/TestRowDataExerciseFInts.java      |  2 +-
 .../row/data/TestRowDataMultiFamilies.java      |  2 +-
 .../prefixtree/row/data/TestRowDataNub.java     |  2 +-
 .../row/data/TestRowDataNumberStrings.java      |  2 +-
 .../data/TestRowDataQualifierByteOrdering.java  |  2 +-
 .../row/data/TestRowDataRandomKeyValues.java    |  2 +-
 .../TestRowDataRandomKeyValuesWithTags.java     |  2 +-
 .../row/data/TestRowDataSearchWithPrefix.java   |  2 +-
 .../row/data/TestRowDataSearcherRowMiss.java    |  2 +-
 .../prefixtree/row/data/TestRowDataSimple.java  |  2 +-
 .../row/data/TestRowDataSingleQualifier.java    |  2 +-
 .../prefixtree/row/data/TestRowDataTrivial.java |  2 +-
 .../row/data/TestRowDataTrivialWithTags.java    |  2 +-
 .../prefixtree/row/data/TestRowDataUrls.java    |  2 +-
 .../row/data/TestRowDataUrlsExample.java        |  2 +-
 .../prefixtree/timestamp/TestTimestampData.java |  2 +-
 hbase-procedure/pom.xml                         |  4 +-
 .../hadoop/hbase/procedure2/Procedure.java      |  2 +-
 .../hbase/procedure2/ProcedureExecutor.java     |  4 +-
 .../hbase/procedure2/ProcedureScheduler.java    |  2 +-
 .../hadoop/hbase/procedure2/ProcedureUtil.java  |  2 +-
 .../procedure2/RemoteProcedureDispatcher.java   |  2 +-
 .../procedure2/SimpleProcedureScheduler.java    |  2 +-
 .../procedure2/store/wal/WALProcedureStore.java |  2 +-
 .../hbase/procedure2/TestProcedureUtil.java     |  8 ++
 hbase-rest/pom.xml                              | 16 +++-
 .../apache/hadoop/hbase/rest/RESTServer.java    |  2 +-
 hbase-rsgroup/pom.xml                           |  4 +-
 .../hbase/rsgroup/RSGroupAdminClient.java       |  2 +-
 .../hbase/rsgroup/RSGroupAdminEndpoint.java     |  2 +-
 .../hbase/rsgroup/RSGroupAdminServer.java       |  4 +-
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 12 +--
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java   |  6 +-
 .../balancer/TestRSGroupBasedLoadBalancer.java  |  4 +-
 .../hadoop/hbase/rsgroup/TestRSGroups.java      |  2 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsBase.java  |  4 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java  |  2 +-
 .../rsgroup/VerifyingRSGroupAdminClient.java    |  4 +-
 hbase-server/pom.xml                            | 57 ++++++++++++-
 .../apache/hadoop/hbase/ZKNamespaceManager.java |  2 +-
 .../hadoop/hbase/backup/BackupHFileCleaner.java |  6 +-
 .../hadoop/hbase/backup/HFileArchiver.java      |  8 +-
 .../hbase/backup/impl/BackupAdminImpl.java      |  2 +-
 .../hbase/backup/impl/BackupCommands.java       |  2 +-
 .../hadoop/hbase/backup/impl/BackupManager.java |  2 +-
 .../hbase/backup/impl/TableBackupClient.java    |  2 +-
 .../backup/mapreduce/HFileSplitterJob.java      |  2 +-
 .../hadoop/hbase/client/locking/EntityLock.java |  2 +-
 .../hbase/client/locking/LockServiceClient.java |  2 +-
 .../SplitLogManagerCoordination.java            |  2 +-
 .../SplitLogWorkerCoordination.java             |  2 +-
 .../hbase/coprocessor/MetricsCoprocessor.java   |  2 +-
 .../hbase/coprocessor/RegionObserver.java       |  2 +-
 .../hadoop/hbase/executor/ExecutorService.java  |  8 +-
 .../favored/FavoredNodeAssignmentHelper.java    |  6 +-
 .../hbase/favored/FavoredNodeLoadBalancer.java  |  6 +-
 .../hbase/favored/FavoredNodesManager.java      |  6 +-
 .../favored/StartcodeAgnosticServerName.java    |  4 +-
 .../apache/hadoop/hbase/http/HttpServer.java    |  4 +-
 .../hbase/io/FSDataInputStreamWrapper.java      |  2 +-
 .../org/apache/hadoop/hbase/io/MetricsIO.java   |  2 +-
 .../hbase/io/asyncfs/AsyncFSOutputHelper.java   |  4 +-
 .../asyncfs/FanOutOneBlockAsyncDFSOutput.java   |  3 +-
 .../FanOutOneBlockAsyncDFSOutputHelper.java     |  4 +-
 .../FanOutOneBlockAsyncDFSOutputSaslHelper.java | 14 ++--
 .../hadoop/hbase/io/hfile/CacheConfig.java      |  2 +-
 .../hbase/io/hfile/CombinedBlockCache.java      |  2 +-
 .../org/apache/hadoop/hbase/io/hfile/HFile.java |  4 +-
 .../hadoop/hbase/io/hfile/HFileBlock.java       |  4 +-
 .../hadoop/hbase/io/hfile/HFileReaderImpl.java  |  2 +-
 .../hadoop/hbase/io/hfile/LruBlockCache.java    | 11 +--
 .../hbase/io/hfile/LruCachedBlockQueue.java     |  2 +-
 .../hbase/io/hfile/bucket/BucketAllocator.java  | 10 +--
 .../hbase/io/hfile/bucket/BucketCache.java      |  4 +-
 .../hbase/io/hfile/bucket/CachedEntryQueue.java |  2 +-
 .../apache/hadoop/hbase/ipc/RpcExecutor.java    |  4 +-
 .../org/apache/hadoop/hbase/ipc/RpcServer.java  |  2 +-
 .../hadoop/hbase/ipc/RpcServerInterface.java    |  2 +-
 .../hadoop/hbase/ipc/SimpleRpcServer.java       |  2 +-
 .../org/apache/hadoop/hbase/mapred/Driver.java  |  2 +-
 .../hadoop/hbase/mapreduce/CellCounter.java     |  2 +-
 .../hbase/mapreduce/HFileOutputFormat2.java     |  2 +-
 .../hadoop/hbase/mapreduce/HashTable.java       |  6 +-
 .../apache/hadoop/hbase/mapreduce/Import.java   |  4 +-
 .../hadoop/hbase/mapreduce/ImportTsv.java       |  8 +-
 .../hadoop/hbase/mapreduce/JarFinder.java       |  2 +-
 .../hbase/mapreduce/LoadIncrementalHFiles.java  |  8 +-
 .../mapreduce/MultiTableHFileOutputFormat.java  |  2 +-
 .../MultiTableSnapshotInputFormat.java          |  2 +-
 .../MultiTableSnapshotInputFormatImpl.java      |  4 +-
 .../hadoop/hbase/mapreduce/SyncTable.java       |  7 +-
 .../hbase/mapreduce/TableMapReduceUtil.java     |  2 +-
 .../hbase/mapreduce/TableRecordReaderImpl.java  |  2 +-
 .../mapreduce/TableSnapshotInputFormat.java     |  2 +-
 .../mapreduce/TableSnapshotInputFormatImpl.java |  2 +-
 .../hadoop/hbase/mapreduce/WALPlayer.java       |  2 +-
 .../replication/VerifyReplication.java          |  2 +-
 .../hadoop/hbase/master/CatalogJanitor.java     |  2 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  6 +-
 .../hadoop/hbase/master/MasterServices.java     |  2 +-
 .../hadoop/hbase/master/MasterWalManager.java   |  2 +-
 .../hadoop/hbase/master/ServerManager.java      |  2 +-
 .../hadoop/hbase/master/SplitLogManager.java    |  2 +-
 .../hbase/master/TableNamespaceManager.java     |  2 +-
 .../hadoop/hbase/master/TableStateManager.java  |  2 +-
 .../master/assignment/AssignmentManager.java    |  4 +-
 .../master/assignment/GCRegionProcedure.java    |  2 +-
 .../assignment/MergeTableRegionsProcedure.java  |  2 +-
 .../master/assignment/RegionStateStore.java     |  2 +-
 .../hbase/master/assignment/RegionStates.java   |  2 +-
 .../assignment/SplitTableRegionProcedure.java   |  2 +-
 .../hbase/master/balancer/BaseLoadBalancer.java | 10 +--
 .../balancer/FavoredStochasticBalancer.java     |  6 +-
 .../master/balancer/RegionLocationFinder.java   | 18 ++---
 .../master/balancer/SimpleLoadBalancer.java     |  2 +-
 .../master/balancer/StochasticLoadBalancer.java |  4 +-
 .../master/cleaner/BaseFileCleanerDelegate.java |  4 +-
 .../hbase/master/cleaner/CleanerChore.java      |  8 +-
 .../hbase/master/cleaner/HFileCleaner.java      |  2 +-
 .../hbase/master/locking/LockManager.java       |  2 +-
 .../procedure/CloneSnapshotProcedure.java       |  2 +-
 .../master/procedure/CreateTableProcedure.java  |  2 +-
 .../procedure/MasterProcedureScheduler.java     |  2 +-
 .../master/procedure/RSProcedureDispatcher.java |  2 +-
 .../snapshot/EnabledTableSnapshotHandler.java   |  2 +-
 .../master/snapshot/SnapshotFileCache.java      |  4 +-
 .../apache/hadoop/hbase/mob/MobFileCache.java   |  2 +-
 .../compactions/PartitionedMobCompactor.java    |  2 +-
 .../hadoop/hbase/monitoring/LogMonitoring.java  |  2 +-
 .../MemoryBoundedLogMessageBuffer.java          |  6 +-
 .../hadoop/hbase/monitoring/TaskMonitor.java    |  4 +-
 .../namespace/NamespaceTableAndRegionInfo.java  |  2 +-
 .../hadoop/hbase/procedure/Procedure.java       |  2 +-
 .../hbase/procedure/ProcedureCoordinator.java   |  2 +-
 .../hadoop/hbase/procedure/ProcedureMember.java |  2 +-
 .../flush/MasterFlushTableProcedureManager.java |  2 +-
 .../quotas/AverageIntervalRateLimiter.java      |  2 +-
 .../hbase/quotas/FixedIntervalRateLimiter.java  |  2 +-
 .../hadoop/hbase/quotas/MasterQuotaManager.java |  2 +-
 .../quotas/NamespaceQuotaSnapshotStore.java     |  4 +-
 .../apache/hadoop/hbase/quotas/QuotaCache.java  |  2 +-
 .../hadoop/hbase/quotas/QuotaObserverChore.java |  8 +-
 .../apache/hadoop/hbase/quotas/RateLimiter.java |  2 +-
 .../quotas/RegionServerRpcQuotaManager.java     |  2 +-
 .../quotas/RegionServerSpaceQuotaManager.java   |  2 +-
 .../quotas/SnapshotQuotaObserverChore.java      |  4 +-
 .../hbase/quotas/TableQuotaSnapshotStore.java   |  4 +-
 .../hbase/regionserver/AbstractMemStore.java    |  2 +-
 .../AnnotationReadingPriorityFunction.java      |  2 +-
 .../hadoop/hbase/regionserver/CellChunkMap.java |  2 +-
 .../hadoop/hbase/regionserver/CellSet.java      |  2 +-
 .../apache/hadoop/hbase/regionserver/Chunk.java |  4 +-
 .../hadoop/hbase/regionserver/ChunkCreator.java |  4 +-
 .../hadoop/hbase/regionserver/CompactSplit.java |  4 +-
 .../regionserver/CompactedHFilesDischarger.java |  2 +-
 .../hbase/regionserver/CompactingMemStore.java  |  2 +-
 .../regionserver/CompositeImmutableSegment.java |  2 +-
 .../ConstantSizeRegionSplitPolicy.java          |  2 +-
 .../regionserver/DefaultStoreFileManager.java   |  6 +-
 .../DelimitedKeyPrefixRegionSplitPolicy.java    |  5 +-
 .../hadoop/hbase/regionserver/HRegion.java      | 14 ++--
 .../hbase/regionserver/HRegionFileSystem.java   |  2 +-
 .../hbase/regionserver/HRegionServer.java       |  7 +-
 .../hadoop/hbase/regionserver/HStore.java       | 12 +--
 .../hadoop/hbase/regionserver/HStoreFile.java   |  2 +-
 .../hbase/regionserver/HeapMemoryManager.java   |  2 +-
 .../hadoop/hbase/regionserver/KeyValueHeap.java |  2 +-
 .../hadoop/hbase/regionserver/LogRoller.java    |  2 +-
 .../hbase/regionserver/MemStoreCompactor.java   |  2 +-
 .../hbase/regionserver/MemStoreFlusher.java     |  2 +-
 .../hbase/regionserver/MemStoreLABImpl.java     |  4 +-
 .../hbase/regionserver/MetricsRegionServer.java |  2 +-
 .../MetricsTableWrapperAggregateImpl.java       |  2 +-
 .../MultiVersionConcurrencyControl.java         |  6 +-
 .../hbase/regionserver/MutableSegment.java      |  2 +-
 .../hbase/regionserver/RSRpcServices.java       | 11 +--
 .../hadoop/hbase/regionserver/Region.java       |  2 +-
 .../regionserver/RegionCoprocessorHost.java     |  4 +-
 .../hbase/regionserver/RegionMergeRequest.java  |  2 +-
 .../hbase/regionserver/RegionSplitPolicy.java   |  2 +-
 .../hadoop/hbase/regionserver/RowProcessor.java |  2 +-
 .../hadoop/hbase/regionserver/ScanInfo.java     |  2 +-
 .../hbase/regionserver/ScannerIdGenerator.java  | 16 +++-
 .../hadoop/hbase/regionserver/Segment.java      |  2 +-
 .../hbase/regionserver/SegmentFactory.java      |  1 +
 .../hbase/regionserver/ServerNonceManager.java  |  2 +-
 .../hbase/regionserver/SplitLogWorker.java      |  2 +-
 .../hadoop/hbase/regionserver/SplitRequest.java |  2 +-
 .../regionserver/StoreFileComparators.java      |  6 +-
 .../hbase/regionserver/StoreFileManager.java    |  2 +-
 .../hbase/regionserver/StoreFileReader.java     |  2 +-
 .../hbase/regionserver/StoreFileWriter.java     |  2 +-
 .../hadoop/hbase/regionserver/StoreScanner.java |  2 +-
 .../hbase/regionserver/StripeStoreEngine.java   |  2 +-
 .../regionserver/StripeStoreFileManager.java    |  4 +-
 .../hbase/regionserver/StripeStoreFlusher.java  |  2 +-
 .../compactions/CompactionRequest.java          |  2 +-
 .../regionserver/compactions/Compactor.java     |  2 +-
 .../compactions/DateTieredCompactionPolicy.java | 10 +--
 .../compactions/DefaultCompactor.java           |  2 +-
 .../ExponentialCompactionWindowFactory.java     |  2 +-
 .../compactions/SortedCompactionPolicy.java     |  8 +-
 .../compactions/StripeCompactionPolicy.java     |  2 +-
 .../querymatcher/LegacyScanQueryMatcher.java    |  2 +-
 .../hbase/regionserver/wal/AbstractFSWAL.java   |  4 +-
 .../hbase/regionserver/wal/AsyncFSWAL.java      |  2 +-
 .../wal/AsyncProtobufLogWriter.java             |  2 +-
 .../hbase/regionserver/wal/Compressor.java      |  2 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |  2 +-
 .../hbase/regionserver/wal/FSWALEntry.java      |  2 +-
 .../hbase/regionserver/wal/MetricsWAL.java      |  2 +-
 .../regionserver/wal/SequenceIdAccounting.java  |  2 +-
 .../hadoop/hbase/regionserver/wal/WALEdit.java  |  2 +-
 .../replication/BaseReplicationEndpoint.java    |  5 +-
 .../hbase/replication/BulkLoadCellFilter.java   |  2 +-
 .../replication/HBaseReplicationEndpoint.java   |  2 +-
 .../NamespaceTableCfWALEntryFilter.java         |  2 +-
 .../hbase/replication/ReplicationEndpoint.java  |  3 +-
 .../hbase/replication/ScopeWALEntryFilter.java  |  2 +-
 .../master/ReplicationHFileCleaner.java         | 10 +--
 .../master/ReplicationLogCleaner.java           | 10 +--
 .../regionserver/DumpReplicationQueues.java     |  2 +-
 .../HBaseInterClusterReplicationEndpoint.java   | 11 +--
 .../regionserver/HFileReplicator.java           |  2 +-
 .../RegionReplicaReplicationEndpoint.java       |  6 +-
 .../replication/regionserver/Replication.java   |  2 +-
 .../regionserver/ReplicationSinkManager.java    |  6 +-
 .../regionserver/ReplicationSource.java         | 36 ++++++---
 .../regionserver/ReplicationSourceManager.java  |  4 +-
 .../regionserver/ReplicationSourceShipper.java  |  6 +-
 .../security/access/AccessControlLists.java     |  6 +-
 .../hbase/security/access/AccessController.java | 14 ++--
 .../hbase/security/access/AuthResult.java       |  2 +-
 .../hbase/security/access/TableAuthManager.java |  8 +-
 .../hadoop/hbase/security/token/TokenUtil.java  |  5 +-
 .../hbase/security/token/ZKSecretWatcher.java   |  2 +-
 .../security/visibility/ExpressionParser.java   |  2 +-
 .../visibility/VisibilityController.java        | 11 ++-
 .../VisibilityReplicationEndpoint.java          | 47 ++++++++---
 .../security/visibility/VisibilityUtils.java    |  6 +-
 .../hbase/snapshot/RestoreSnapshotHelper.java   |  2 +-
 .../snapshot/SnapshotDescriptionUtils.java      |  2 +-
 .../org/apache/hadoop/hbase/tool/Canary.java    |  2 +-
 .../hadoop/hbase/util/ConfigurationUtil.java    |  2 +-
 .../hadoop/hbase/util/DirectMemoryUtils.java    |  2 +-
 .../apache/hadoop/hbase/util/FSHDFSUtils.java   |  2 +-
 .../hadoop/hbase/util/FSTableDescriptors.java   |  4 +-
 .../org/apache/hadoop/hbase/util/FSUtils.java   | 10 +--
 .../org/apache/hadoop/hbase/util/HBaseFsck.java | 14 ++--
 .../org/apache/hadoop/hbase/util/IdLock.java    |  2 +-
 .../hadoop/hbase/util/IdReadWriteLock.java      |  2 +-
 .../hadoop/hbase/util/JvmPauseMonitor.java      | 17 ++--
 .../hadoop/hbase/util/RegionSizeCalculator.java |  2 +-
 .../hbase/util/RegionSplitCalculator.java       |  6 +-
 .../hadoop/hbase/util/RegionSplitter.java       |  8 +-
 .../hadoop/hbase/wal/AbstractFSWALProvider.java |  2 +-
 .../hadoop/hbase/wal/AsyncFSWALProvider.java    |  2 +-
 .../java/org/apache/hadoop/hbase/wal/WAL.java   |  2 +-
 .../org/apache/hadoop/hbase/wal/WALFactory.java |  2 +-
 .../org/apache/hadoop/hbase/wal/WALKey.java     |  2 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java    |  6 +-
 .../hbase/zookeeper/MiniZooKeeperCluster.java   |  2 +-
 .../apache/hadoop/hbase/GenericTestUtils.java   |  6 +-
 .../hadoop/hbase/HBaseTestingUtility.java       |  3 -
 .../hadoop/hbase/PerformanceEvaluation.java     |  6 +-
 .../hadoop/hbase/ScanPerformanceEvaluation.java | 85 +++++++++++---------
 .../apache/hadoop/hbase/TestAcidGuarantees.java |  2 +-
 .../org/apache/hadoop/hbase/TestIOFencing.java  |  2 +-
 .../hadoop/hbase/TestMetaTableAccessor.java     |  2 +-
 .../org/apache/hadoop/hbase/TestNamespace.java  |  2 +-
 .../org/apache/hadoop/hbase/TestRegionLoad.java |  4 +-
 .../hbase/backup/TestBackupBoundaryTests.java   |  2 +-
 .../hadoop/hbase/backup/TestBackupDelete.java   |  2 +-
 .../hbase/backup/TestBackupDeleteRestore.java   |  2 +-
 .../backup/TestBackupDeleteWithFailures.java    |  2 +-
 .../hadoop/hbase/backup/TestBackupDescribe.java |  2 +-
 .../hbase/backup/TestBackupMultipleDeletes.java |  2 +-
 .../hbase/backup/TestBackupShowHistory.java     |  2 +-
 .../hbase/backup/TestBackupStatusProgress.java  |  2 +-
 .../hadoop/hbase/backup/TestFullRestore.java    |  2 +-
 .../hbase/backup/TestIncrementalBackup.java     |  2 +-
 .../TestIncrementalBackupDeleteTable.java       |  2 +-
 .../TestIncrementalBackupWithBulkLoad.java      |  2 +-
 .../TestIncrementalBackupWithFailures.java      |  2 +-
 .../hadoop/hbase/backup/TestRemoteBackup.java   |  2 +-
 .../backup/TestRepairAfterFailedDelete.java     |  2 +-
 .../backup/master/TestBackupLogCleaner.java     |  4 +-
 .../client/SimpleRawScanResultConsumer.java     |  2 +-
 .../hbase/client/SimpleScanResultConsumer.java  |  2 +-
 .../hadoop/hbase/client/TestEnableTable.java    |  6 +-
 .../org/apache/hadoop/hbase/client/TestHCM.java |  2 +-
 .../hadoop/hbase/client/TestSizeFailures.java   |  2 +-
 .../hbase/client/TestSnapshotFromClient.java    |  2 +-
 .../hbase/client/TestTableFavoredNodes.java     |  4 +-
 .../hbase/codec/TestCellMessageCodec.java       |  4 +-
 .../hbase/coprocessor/SimpleRegionObserver.java |  2 +-
 .../coprocessor/TestCoprocessorMetrics.java     |  2 +-
 ...erverForAddingMutationsFromCoprocessors.java |  2 +-
 .../TestFavoredNodeAssignmentHelper.java        |  4 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  |  2 +-
 .../hadoop/hbase/filter/TestFilterList.java     |  2 +-
 .../TestFuzzyRowAndColumnRangeFilter.java       |  2 +-
 .../filter/TestFuzzyRowFilterEndToEnd.java      |  2 +-
 .../hadoop/hbase/io/hfile/CacheTestUtils.java   |  2 +-
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java |  2 +-
 .../hfile/TestLazyDataBlockDecompression.java   |  2 +-
 .../hadoop/hbase/ipc/AbstractTestIPC.java       |  4 +-
 .../hadoop/hbase/ipc/TestBufferChain.java       |  4 +-
 .../hadoop/hbase/ipc/TestProtoBufRpc.java       |  2 +-
 .../hadoop/hbase/ipc/TestRpcClientLeaks.java    |  2 +-
 .../hbase/ipc/TestRpcHandlerException.java      |  2 +-
 .../ipc/TestRpcServerSlowConnectionSetup.java   |  2 +-
 .../hbase/ipc/TestSimpleRpcScheduler.java       |  8 +-
 .../hbase/mapred/TestGroupingTableMap.java      |  8 +-
 .../TestMultiTableSnapshotInputFormat.java      |  2 +-
 .../hadoop/hbase/mapred/TestRowCounter.java     |  2 +-
 .../hbase/mapred/TestTableMapReduceUtil.java    |  4 +-
 .../MultiTableInputFormatTestBase.java          |  2 +-
 .../hadoop/hbase/mapreduce/TestHashTable.java   |  4 +-
 .../hbase/mapreduce/TestImportTsvParser.java    |  6 +-
 .../TestLoadIncrementalHFilesSplitRecovery.java |  2 +-
 .../TestMultiTableSnapshotInputFormat.java      |  6 +-
 .../TestMultiTableSnapshotInputFormatImpl.java  | 11 +--
 .../hadoop/hbase/mapreduce/TestSyncTable.java   |  2 +-
 .../mapreduce/TestTableSnapshotInputFormat.java |  2 +-
 .../apache/hadoop/hbase/master/TestMaster.java  |  2 +-
 .../hbase/master/TestMasterStatusServlet.java   |  2 +-
 .../LoadBalancerPerformanceEvaluation.java      | 13 +--
 .../LoadOnlyFavoredStochasticBalancer.java      |  2 +-
 .../master/balancer/TestBaseLoadBalancer.java   |  2 +-
 .../balancer/TestFavoredNodeTableImport.java    |  2 +-
 .../TestFavoredStochasticBalancerPickers.java   |  4 +-
 .../TestFavoredStochasticLoadBalancer.java      |  6 +-
 .../hbase/master/cleaner/TestLogsCleaner.java   |  2 +-
 .../cleaner/TestReplicationHFileCleaner.java    |  2 +-
 .../master/cleaner/TestSnapshotFromMaster.java  |  2 +-
 .../master/snapshot/TestSnapshotFileCache.java  |  4 +-
 .../hbase/namespace/TestNamespaceAuditor.java   |  2 +-
 .../procedure/TestProcedureCoordinator.java     |  2 +-
 .../hadoop/hbase/procedure/TestZKProcedure.java |  2 +-
 .../procedure/TestZKProcedureControllers.java   |  2 +-
 .../hbase/quotas/SpaceQuotaHelperForTests.java  |  6 +-
 .../TestNamespaceQuotaViolationStore.java       |  2 +-
 .../hadoop/hbase/quotas/TestQuotaAdmin.java     |  2 +-
 .../hbase/quotas/TestQuotaObserverChore.java    |  2 +-
 .../TestQuotaObserverChoreWithMiniCluster.java  |  4 +-
 .../quotas/TestSnapshotQuotaObserverChore.java  |  6 +-
 .../quotas/TestSpaceQuotasWithSnapshots.java    |  2 +-
 .../quotas/TestTableQuotaViolationStore.java    |  2 +-
 .../hbase/quotas/TestTablesWithQuotas.java      |  2 +-
 .../AbstractTestDateTieredCompactionPolicy.java |  4 +-
 .../hbase/regionserver/RegionAsTable.java       |  2 +-
 .../TestCompactionArchiveIOException.java       |  2 +-
 .../regionserver/TestCompactionPolicy.java      |  2 +-
 .../hbase/regionserver/TestDefaultMemStore.java |  6 +-
 .../TestEndToEndSplitTransaction.java           |  4 +-
 .../hadoop/hbase/regionserver/TestHRegion.java  |  4 +-
 .../regionserver/TestHRegionReplayEvents.java   |  2 +-
 .../regionserver/TestHRegionServerBulkLoad.java |  2 +-
 .../TestHRegionServerBulkLoadWithOldClient.java |  2 +-
 .../hbase/regionserver/TestHStoreFile.java      |  6 +-
 .../hbase/regionserver/TestMemStoreLAB.java     |  8 +-
 .../regionserver/TestPerColumnFamilyFlush.java  |  2 +-
 .../hbase/regionserver/TestRSStatusServlet.java |  2 +-
 .../TestRegionMergeTransactionOnCluster.java    |  2 +-
 .../regionserver/TestReversibleScanners.java    |  2 +-
 .../hadoop/hbase/regionserver/TestStore.java    |  2 +-
 .../TestTimestampFilterSeekHint.java            |  2 +-
 .../compactions/MockStoreFileGenerator.java     |  4 +-
 .../compactions/TestStripeCompactionPolicy.java |  4 +-
 .../regionserver/wal/TestAsyncProtobufLog.java  |  2 +-
 .../replication/TestReplicationSmallTests.java  |  2 +-
 .../replication/TestReplicationSource.java      |  2 +-
 .../TestReplicationWALEntryFilters.java         |  2 +-
 .../TestRegionReplicaReplicationEndpoint.java   |  2 +-
 ...egionReplicaReplicationEndpointNoMaster.java |  6 +-
 .../TestReplicationSinkManager.java             |  2 +-
 .../TestReplicationSourceManager.java           |  2 +-
 .../hbase/security/HBaseKerberosUtils.java      |  2 +-
 .../hadoop/hbase/security/TestSecureIPC.java    |  2 +-
 .../apache/hadoop/hbase/security/TestUser.java  |  2 +-
 .../hbase/security/access/SecureTestUtil.java   |  4 +-
 .../security/access/TestAccessController.java   |  2 +-
 .../hbase/security/access/TestCellACLs.java     |  2 +-
 .../security/access/TestNamespaceCommands.java  |  2 +-
 .../security/access/TestTablePermissions.java   |  4 +-
 .../access/TestWithDisabledAuthorization.java   |  2 +-
 .../security/token/TestTokenAuthentication.java |  2 +-
 .../hadoop/hbase/tool/TestCanaryTool.java       |  2 +-
 .../hadoop/hbase/util/MultiThreadedAction.java  |  2 +-
 .../hadoop/hbase/util/MultiThreadedUpdater.java |  2 +-
 .../hbase/util/TestConfigurationUtil.java       |  4 +-
 .../hadoop/hbase/util/TestHBaseFsckTwoRS.java   |  2 +-
 .../hbase/util/TestRegionSplitCalculator.java   |  4 +-
 .../hadoop/hbase/util/TestSortedList.java       |  2 +-
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java |  2 +-
 .../hbck/TestOfflineMetaRebuildOverlap.java     |  2 +-
 .../hadoop/hbase/wal/TestWALFiltering.java      |  2 +-
 .../apache/hadoop/hbase/wal/TestWALSplit.java   |  6 +-
 hbase-shell/pom.xml                             | 48 +++++++++++
 .../hbase/client/rsgroup/TestShellRSGroups.java |  4 +-
 hbase-spark-it/pom.xml                          | 10 ++-
 hbase-spark/pom.xml                             | 22 +++++
 .../hbase/spark/TestJavaHBaseContext.java       |  2 +-
 hbase-testing-util/pom.xml                      | 36 +++++++++
 hbase-thrift/pom.xml                            | 28 ++++++-
 .../hbase/thrift/TBoundedThreadPoolServer.java  |  2 +-
 .../hadoop/hbase/thrift/ThriftServerRunner.java |  6 +-
 .../hadoop/hbase/thrift2/ThriftServer.java      |  2 +-
 .../hbase/thrift/TestThriftHttpServer.java      |  2 +-
 .../hbase/thrift/TestThriftServerCmdLine.java   |  2 +-
 .../thrift2/TestThriftHBaseServiceHandler.java  |  2 +-
 pom.xml                                         | 14 +---
 591 files changed, 1410 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 1699ea0..0d591a2 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -209,6 +209,12 @@
     <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-hadoop-compat</artifactId>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
         <groupId>org.apache.hbase</groupId>

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index cc1143d..2f36261 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -148,8 +148,8 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-miscellaneous</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -205,6 +205,17 @@
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-crypto</artifactId>
+      <version>${commons-crypto.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.java.dev.jna</groupId>
+          <artifactId>jna</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <profiles>

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index de79a67..bd8968d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -67,7 +67,7 @@ import org.apache.hadoop.hbase.util.ExceptionUtil;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.PairOfSameType;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java
index 5dd40cc..8611de5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java
@@ -21,7 +21,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.NO_NONCE_GENERATOR;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.getStubKey;
 import static org.apache.hadoop.hbase.client.NonceGenerator.CLIENT_NONCES_ENABLED_KEY;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import io.netty.util.HashedWheelTimer;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
index ed7ac4d..6126b8a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
@@ -26,6 +26,12 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+
+import io.netty.util.Timeout;
+import io.netty.util.TimerTask;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index ba6b052..22efdaa 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.client;
 
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
index e6e4fd1..710ec91 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.java
@@ -19,7 +19,7 @@
 
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
index 0ee3b52..729fb94 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;
 
 import io.netty.util.HashedWheelTimer;
@@ -499,4 +499,4 @@ class AsyncRpcRetryingCallerFactory {
   public <T> ServerRequestCallerBuilder<T> serverRequest() {
     return new ServerRequestCallerBuilder<>();
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java
index 6343c8b..e5448d9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.java
@@ -28,7 +28,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.translateException;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timeout;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableBase.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableBase.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableBase.java
index 3c551df..006e3e2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableBase.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableBase.java
@@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toList;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.allOf;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.toCheckExistenceOnly;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java
index 2f8a939..28a5568 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableResultScanner.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Throwables;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
index 2a55de9..0ddc159 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
@@ -15,7 +15,7 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
index 007e638..34c5620 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 59cf005..d3b19e4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -21,7 +21,7 @@ import static org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.createScanResultCache;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.incRegionCountMetrics;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java
index 20706c6..c456789 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
index 4547e78..6727929 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionConfiguration.java
@@ -15,7 +15,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 /**
  * Configuration parameters for the connection.

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index 44974cb..4dff7dd 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -122,7 +122,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.zookeeper.KeeperException;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
index 1f2fbb5..d8f4836 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
@@ -21,8 +21,8 @@ import static java.util.stream.Collectors.toList;
 import static org.apache.hadoop.hbase.HConstants.EMPTY_END_ROW;
 import static org.apache.hadoop.hbase.HConstants.EMPTY_START_ROW;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 import java.io.IOException;
 import java.lang.reflect.UndeclaredThrowableException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 11224da..447b396 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -204,7 +204,7 @@ import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.zookeeper.KeeperException;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.Message;
 import com.google.protobuf.RpcController;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java
index f2c5746..0785009 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HRegionLocator.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HRegionLocation;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index 46ce902..a48b9e0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.client.ConnectionUtils.checkHasFamilies;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 // DO NOT MAKE USE OF THESE IMPORTS! THEY ARE HERE FOR COPROCESSOR ENDPOINTS ONLY.
 // Internally, we use shaded protobuf. This below are part of our public API.
 import com.google.protobuf.Descriptors;
@@ -1333,4 +1333,4 @@ public class HTable implements Table {
     }
     return mutator;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
index 313125c..0210c9b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
@@ -19,8 +19,8 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.io.IOException;
 import java.util.AbstractMap.SimpleEntry;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
index ea64900..410e7d8 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetricsConnection.java
@@ -26,7 +26,7 @@ import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.RatioGauge;
 import com.codahale.metrics.Timer;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 38a1950..64dada0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.RegionActi
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 /**
  * Callable that handles the <code>multi</code> method call going against a single

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index b010c2f..f6cb4b1 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -50,11 +50,11 @@ import org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ClassSize;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.ArrayListMultimap;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.ListMultimap;
+import org.apache.hadoop.hbase.shaded.com.google.common.io.ByteArrayDataInput;
+import org.apache.hadoop.hbase.shaded.com.google.common.io.ByteArrayDataOutput;
+import org.apache.hadoop.hbase.shaded.com.google.common.io.ByteStreams;
 
 @InterfaceAudience.Public
 public abstract class Mutation extends OperationWithAttributes implements Row, CellScannable,

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
index abac040..52ec9cd 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.util.CollectionUtils.computeIfAbsent;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.util.Map.Entry;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
index 7f50d13..0bf54ae 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client;
 import java.io.IOException;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.filter.Filter;
@@ -32,8 +32,8 @@ import org.apache.hadoop.hbase.security.visibility.Authorizations;
 import org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.ArrayListMultimap;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.ListMultimap;
 import org.apache.hadoop.hbase.util.Bytes;
 
 @InterfaceAudience.Public

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java
index 537a92d..5110b8a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java
@@ -524,4 +524,4 @@ class RawAsyncTableImpl implements RawAsyncTable {
           (loc, error) -> onLocateComplete(stubMaker, callable, callback, locs, nonNullEndKey,
             endKeyInclusive, new AtomicBoolean(false), new AtomicInteger(0), loc, error));
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java
index 2dc73e0..3b10549 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorRpcChannel.java
@@ -100,4 +100,4 @@ class RegionCoprocessorRpcChannel extends SyncCoprocessorRpcChannel {
   public byte[] getLastRegion() {
     return lastRegion;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java
index 6de5779..77458b0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionCoprocessorServiceExec.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.client;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Objects;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Objects;
 import com.google.protobuf.Descriptors.MethodDescriptor;
 import com.google.protobuf.Message;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowAccess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowAccess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowAccess.java
index 758bce6..ccf779b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowAccess.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RowAccess.java
@@ -18,7 +18,7 @@
 package org.apache.hadoop.hbase.client;
 
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
index 852e2c6..34d5d89 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java
@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerStatisticTracker.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerStatisticTracker.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerStatisticTracker.java
index f78ca41..e437b48 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerStatisticTracker.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerStatisticTracker.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import static org.apache.hadoop.hbase.util.CollectionUtils.computeIfAbsent;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 import java.util.concurrent.ConcurrentHashMap;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SimpleRequestController.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SimpleRequestController.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SimpleRequestController.java
index de2cbe1..1e1cb9a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SimpleRequestController.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SimpleRequestController.java
@@ -18,7 +18,7 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java
index a39bd96..e0652e6 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 /**
  * Simple exponential backoff policy on for the client that uses a  percent^4 times the

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java
index 03764ed..2f73a0e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.ImmutableMap;
 
 /**
  * Provides server side metrics related to scan operations.

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
index 94425f9..752d18c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
@@ -58,8 +58,8 @@ import org.apache.hadoop.hbase.replication.ReplicationQueuesClientArguments;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
 
 /**
  * <p>

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java
index f561f4a..19c5042 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationSerDeHelper.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Strings;
 
-import com.google.common.collect.Lists;
+import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;
 
 import java.io.IOException;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java
index dad4132..913dcc5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
index 2ce9746..bbffbe2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
index b6e9607..987e090 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.ByteBufferUtils;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
index 69b5088..ab4cad7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 /**
  * This filter is used for selecting only those keys with columns that are

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
index 451d7ee..56c633b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 /**
  * This is a generic filter to be used to filter by comparison.  It takes an
  * operator (equal, greater, not equal, etc) and a byte [] comparator.

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
index c14314c..5717fc4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java
index 8493610..e4f03e0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
index 895ffc8..20c6656 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.UnsafeAccess;
 import org.apache.hadoop.hbase.util.UnsafeAvailChecker;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
 
 /**
  * This is optimized version of a standard FuzzyRowFilter Filters data based on fuzzy row key.

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
index ed95a7d..070b7c3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 /**
  * A Filter that stops after the given row.  There is no "RowStopFilter" because

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java
index b082941..7f75963 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 
 /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java
index 894e7b4..c832423 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 /**
  * Implementation of Filter interface that limits results to a specific page

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
index 33b3ead..6dc4bc2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 import org.apache.hadoop.hbase.util.ByteBufferUtils;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
index 0dbc0bb..c056833 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.CompareType;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 
 /**
  * This filter is used to filter cells based on value. It takes a {@link CompareFilter.CompareOp}

http://git-wip-us.apache.org/repos/asf/hbase/blob/890d92a9/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
index b1409e3..699a064 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.FilterProtos;
 
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;
 import org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;
 
 /**


Mime
View raw message