You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ay...@apache.org on 2020/12/10 00:23:12 UTC
[hadoop] branch branch-3.3 updated (f04a9df -> b84bc63)
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from f04a9df YARN-10491. Fix deprecation warnings in SLSWebApp.java (#2519)
new 8378ab9 HADOOP-17288. Use shaded guava from thirdparty. Contributed by Ayush Saxena. #2505
new b84bc63 HADOOP-17344. Harmonize guava version and shade guava in yarn-csi. (#2434)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop-client-minicluster/pom.xml | 12 +++++++
.../org/apache/hadoop/fs/cosn/CosNFileSystem.java | 2 +-
.../apache/hadoop/fs/cosn/CosNOutputStream.java | 8 ++---
.../fs/cosn/auth/COSCredentialsProviderList.java | 2 +-
hadoop-common-project/hadoop-auth/pom.xml | 7 +++-
.../client/KerberosAuthenticator.java | 2 +-
.../server/AuthenticationHandlerUtil.java | 2 +-
.../server/JWTRedirectAuthenticationHandler.java | 2 +-
.../server/KerberosAuthenticationHandler.java | 2 +-
.../server/LdapAuthenticationHandler.java | 4 +--
.../server/MultiSchemeAuthenticationHandler.java | 4 +--
.../util/FileSignerSecretProvider.java | 2 +-
.../security/authentication/util/KerberosName.java | 2 +-
.../util/RandomSignerSecretProvider.java | 2 +-
.../util/RolloverSignerSecretProvider.java | 2 +-
.../util/ZKSignerSecretProvider.java | 2 +-
.../util/StringSignerSecretProvider.java | 2 +-
.../util/StringSignerSecretProviderCreator.java | 2 +-
hadoop-common-project/hadoop-common/pom.xml | 5 +++
.../java/org/apache/hadoop/conf/ConfServlet.java | 2 +-
.../java/org/apache/hadoop/conf/Configuration.java | 8 ++---
.../org/apache/hadoop/conf/ReconfigurableBase.java | 6 ++--
.../apache/hadoop/crypto/AesCtrCryptoCodec.java | 2 +-
.../java/org/apache/hadoop/crypto/CryptoCodec.java | 4 +--
.../apache/hadoop/crypto/CryptoInputStream.java | 2 +-
.../apache/hadoop/crypto/CryptoOutputStream.java | 2 +-
.../apache/hadoop/crypto/CryptoStreamUtils.java | 2 +-
.../apache/hadoop/crypto/JceAesCtrCryptoCodec.java | 2 +-
.../hadoop/crypto/OpensslAesCtrCryptoCodec.java | 2 +-
.../org/apache/hadoop/crypto/OpensslCipher.java | 2 +-
.../hadoop/crypto/key/CachingKeyProvider.java | 6 ++--
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 4 +--
.../crypto/key/KeyProviderCryptoExtension.java | 2 +-
.../key/KeyProviderDelegationTokenExtension.java | 2 +-
.../org/apache/hadoop/crypto/key/KeyShell.java | 2 +-
.../hadoop/crypto/key/kms/KMSClientProvider.java | 6 ++--
.../key/kms/LoadBalancingKMSClientProvider.java | 4 +--
.../apache/hadoop/crypto/key/kms/ValueQueue.java | 10 +++---
.../hadoop/crypto/random/OpensslSecureRandom.java | 2 +-
.../org/apache/hadoop/fs/AbstractFileSystem.java | 2 +-
.../java/org/apache/hadoop/fs/ByteBufferUtil.java | 2 +-
.../org/apache/hadoop/fs/ChecksumFileSystem.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/DF.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/DU.java | 2 +-
.../apache/hadoop/fs/DelegationTokenRenewer.java | 2 +-
.../hadoop/fs/FSDataOutputStreamBuilder.java | 2 +-
.../java/org/apache/hadoop/fs/FSInputStream.java | 2 +-
.../java/org/apache/hadoop/fs/FileContext.java | 4 +--
.../org/apache/hadoop/fs/FileEncryptionInfo.java | 4 +--
.../main/java/org/apache/hadoop/fs/FileSystem.java | 6 ++--
.../hadoop/fs/FileSystemStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/FsTracer.java | 2 +-
.../java/org/apache/hadoop/fs/FsUrlConnection.java | 2 +-
.../apache/hadoop/fs/GlobalStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/Globber.java | 2 +-
.../main/java/org/apache/hadoop/fs/HardLink.java | 2 +-
.../java/org/apache/hadoop/fs/PartialListing.java | 2 +-
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/Stat.java | 2 +-
.../org/apache/hadoop/fs/TrashPolicyDefault.java | 2 +-
.../apache/hadoop/fs/UnionStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/XAttrCodec.java | 2 +-
.../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 4 +--
.../hadoop/fs/impl/AbstractFSBuilderImpl.java | 6 ++--
.../hadoop/fs/impl/AbstractMultipartUploader.java | 4 +--
.../fs/impl/FileSystemMultipartUploader.java | 4 +--
.../apache/hadoop/fs/impl/FsLinkResolution.java | 2 +-
.../fs/impl/MultipartUploaderBuilderImpl.java | 2 +-
.../hadoop/fs/impl/PathCapabilitiesSupport.java | 2 +-
.../apache/hadoop/fs/impl/WrappedIOException.java | 2 +-
.../org/apache/hadoop/fs/permission/AclEntry.java | 2 +-
.../org/apache/hadoop/fs/permission/AclStatus.java | 6 ++--
.../org/apache/hadoop/fs/permission/AclUtil.java | 2 +-
.../org/apache/hadoop/fs/sftp/SFTPFileSystem.java | 2 +-
.../org/apache/hadoop/fs/shell/AclCommands.java | 2 +-
.../java/org/apache/hadoop/fs/shell/Concat.java | 2 +-
.../org/apache/hadoop/fs/shell/CopyCommands.java | 2 +-
.../main/java/org/apache/hadoop/fs/shell/Ls.java | 2 +-
.../apache/hadoop/fs/shell/SnapshotCommands.java | 2 +-
.../main/java/org/apache/hadoop/fs/shell/Tail.java | 2 +-
.../org/apache/hadoop/fs/shell/TouchCommands.java | 2 +-
.../org/apache/hadoop/fs/shell/XAttrCommands.java | 2 +-
.../org/apache/hadoop/fs/viewfs/InodeTree.java | 2 +-
.../apache/hadoop/fs/viewfs/ViewFileSystem.java | 2 +-
.../java/org/apache/hadoop/fs/viewfs/ViewFs.java | 2 +-
.../org/apache/hadoop/ha/ActiveStandbyElector.java | 4 +--
.../org/apache/hadoop/ha/FailoverController.java | 2 +-
.../main/java/org/apache/hadoop/ha/HAAdmin.java | 2 +-
.../java/org/apache/hadoop/ha/HAServiceTarget.java | 2 +-
.../java/org/apache/hadoop/ha/HealthMonitor.java | 2 +-
.../main/java/org/apache/hadoop/ha/NodeFencer.java | 4 +--
.../org/apache/hadoop/ha/ShellCommandFencer.java | 2 +-
.../org/apache/hadoop/ha/SshFenceByTcpPort.java | 2 +-
.../org/apache/hadoop/ha/ZKFailoverController.java | 6 ++--
.../java/org/apache/hadoop/http/HttpServer2.java | 6 ++--
.../org/apache/hadoop/io/AbstractMapWritable.java | 2 +-
.../org/apache/hadoop/io/DataOutputBuffer.java | 2 +-
.../apache/hadoop/io/ElasticByteBufferPool.java | 2 +-
.../org/apache/hadoop/io/FastByteComparisons.java | 2 +-
.../java/org/apache/hadoop/io/ReadaheadPool.java | 4 +--
.../java/org/apache/hadoop/io/SecureIOUtils.java | 2 +-
.../java/org/apache/hadoop/io/SequenceFile.java | 2 +-
.../org/apache/hadoop/io/compress/CodecPool.java | 6 ++--
.../hadoop/io/compress/DecompressorStream.java | 2 +-
.../hadoop/io/compress/zlib/ZlibFactory.java | 2 +-
.../io/compress/zstd/ZStandardCompressor.java | 2 +-
.../hadoop/io/erasurecode/CodecRegistry.java | 2 +-
.../apache/hadoop/io/erasurecode/CodecUtil.java | 2 +-
.../apache/hadoop/io/file/tfile/Compression.java | 2 +-
.../org/apache/hadoop/io/nativeio/NativeIO.java | 2 +-
.../apache/hadoop/io/retry/AsyncCallHandler.java | 4 +--
.../org/apache/hadoop/io/retry/CallReturn.java | 2 +-
.../hadoop/io/retry/RetryInvocationHandler.java | 2 +-
.../org/apache/hadoop/io/retry/RetryPolicies.java | 2 +-
.../org/apache/hadoop/ipc/CallQueueManager.java | 2 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 6 ++--
.../main/java/org/apache/hadoop/ipc/ClientId.java | 2 +-
.../org/apache/hadoop/ipc/DecayRpcScheduler.java | 6 ++--
.../java/org/apache/hadoop/ipc/FairCallQueue.java | 2 +-
.../org/apache/hadoop/ipc/ProtobufRpcEngine.java | 2 +-
.../org/apache/hadoop/ipc/ProtobufRpcEngine2.java | 2 +-
.../org/apache/hadoop/ipc/ProtocolSignature.java | 2 +-
.../java/org/apache/hadoop/ipc/ProxyCombiner.java | 2 +-
.../org/apache/hadoop/ipc/RefreshRegistry.java | 6 ++--
.../java/org/apache/hadoop/ipc/RetryCache.java | 4 +--
.../main/java/org/apache/hadoop/ipc/Server.java | 2 +-
.../metrics/DecayRpcSchedulerDetailedMetrics.java | 2 +-
.../org/apache/hadoop/ipc/metrics/RpcMetrics.java | 2 +-
.../main/java/org/apache/hadoop/log/LogLevel.java | 4 +--
.../org/apache/hadoop/log/LogThrottlingHelper.java | 2 +-
.../org/apache/hadoop/metrics2/AbstractMetric.java | 4 +--
.../org/apache/hadoop/metrics2/MetricsTag.java | 4 +--
.../metrics2/filter/AbstractPatternFilter.java | 2 +-
.../metrics2/impl/AbstractMetricsRecord.java | 4 +--
.../hadoop/metrics2/impl/MBeanInfoBuilder.java | 2 +-
.../hadoop/metrics2/impl/MetricsCollectorImpl.java | 4 +--
.../apache/hadoop/metrics2/impl/MetricsConfig.java | 8 ++---
.../metrics2/impl/MetricsRecordBuilderImpl.java | 2 +-
.../metrics2/impl/MetricsRecordFiltered.java | 2 +-
.../hadoop/metrics2/impl/MetricsRecordImpl.java | 2 +-
.../hadoop/metrics2/impl/MetricsSinkAdapter.java | 2 +-
.../hadoop/metrics2/impl/MetricsSourceAdapter.java | 8 ++---
.../hadoop/metrics2/impl/MetricsSystemImpl.java | 8 ++---
.../hadoop/metrics2/lib/DefaultMetricsSystem.java | 2 +-
.../apache/hadoop/metrics2/lib/MethodMetric.java | 2 +-
.../hadoop/metrics2/lib/MetricsInfoImpl.java | 4 +--
.../hadoop/metrics2/lib/MetricsRegistry.java | 2 +-
.../hadoop/metrics2/lib/MetricsSourceBuilder.java | 2 +-
.../apache/hadoop/metrics2/lib/MutableCounter.java | 2 +-
.../apache/hadoop/metrics2/lib/MutableGauge.java | 2 +-
.../hadoop/metrics2/lib/MutableQuantiles.java | 4 +--
.../apache/hadoop/metrics2/lib/MutableRates.java | 4 +--
.../metrics2/lib/MutableRatesWithAggregation.java | 2 +-
.../metrics2/lib/MutableRollingAverages.java | 6 ++--
.../apache/hadoop/metrics2/lib/UniqueNames.java | 4 +--
.../metrics2/sink/RollingFileSystemSink.java | 2 +-
.../apache/hadoop/metrics2/source/JvmMetrics.java | 4 +--
.../org/apache/hadoop/metrics2/util/MBeans.java | 4 +--
.../apache/hadoop/metrics2/util/MetricsCache.java | 2 +-
.../org/apache/hadoop/metrics2/util/Quantile.java | 2 +-
.../hadoop/metrics2/util/SampleQuantiles.java | 6 ++--
.../org/apache/hadoop/metrics2/util/Servers.java | 2 +-
.../src/main/java/org/apache/hadoop/net/DNS.java | 2 +-
.../main/java/org/apache/hadoop/net/NetUtils.java | 2 +-
.../org/apache/hadoop/net/NetworkTopology.java | 6 ++--
.../org/apache/hadoop/net/SocketInputWrapper.java | 2 +-
.../org/apache/hadoop/net/unix/DomainSocket.java | 2 +-
.../hadoop/net/unix/DomainSocketWatcher.java | 6 ++--
.../java/org/apache/hadoop/security/Groups.java | 24 +++++++-------
.../hadoop/security/IngressPortBasedResolver.java | 2 +-
.../apache/hadoop/security/LdapGroupsMapping.java | 2 +-
.../org/apache/hadoop/security/ProviderUtils.java | 2 +-
.../security/RuleBasedLdapGroupsMapping.java | 2 +-
.../org/apache/hadoop/security/SaslRpcClient.java | 2 +-
.../org/apache/hadoop/security/SecurityUtil.java | 4 +--
.../hadoop/security/ShellBasedIdMapping.java | 6 ++--
.../security/ShellBasedUnixGroupsMapping.java | 4 +--
.../hadoop/security/UserGroupInformation.java | 2 +-
.../alias/AbstractJavaKeyStoreProvider.java | 2 +-
.../hadoop/security/alias/CredentialShell.java | 2 +-
.../authorize/DefaultImpersonationProvider.java | 2 +-
.../hadoop/security/authorize/ProxyUsers.java | 4 +--
.../authorize/ServiceAuthorizationManager.java | 2 +-
.../hadoop/security/http/CrossOriginFilter.java | 2 +-
.../security/ssl/DelegatingSSLSocketFactory.java | 2 +-
.../security/ssl/FileBasedKeyStoresFactory.java | 2 +-
.../security/ssl/ReloadingX509TrustManager.java | 2 +-
.../org/apache/hadoop/security/token/Token.java | 4 +--
.../AbstractDelegationTokenIdentifier.java | 2 +-
.../AbstractDelegationTokenSecretManager.java | 2 +-
.../delegation/ZKDelegationTokenSecretManager.java | 4 +--
.../web/DelegationTokenAuthenticatedURL.java | 2 +-
.../web/DelegationTokenAuthenticationFilter.java | 2 +-
.../web/DelegationTokenAuthenticationHandler.java | 2 +-
.../delegation/web/DelegationTokenManager.java | 2 +-
...SchemeDelegationTokenAuthenticationHandler.java | 4 +--
.../org/apache/hadoop/service/AbstractService.java | 2 +-
.../service/launcher/InterruptEscalator.java | 2 +-
.../apache/hadoop/service/launcher/IrqHandler.java | 2 +-
.../hadoop/service/launcher/ServiceLauncher.java | 4 +--
.../org/apache/hadoop/util/AutoCloseableLock.java | 2 +-
.../util/BlockingThreadPoolExecutorService.java | 2 +-
.../org/apache/hadoop/util/ChunkedArrayList.java | 8 ++---
.../hadoop/util/CloseableReferenceCount.java | 2 +-
.../org/apache/hadoop/util/DirectBufferPool.java | 2 +-
.../java/org/apache/hadoop/util/DiskChecker.java | 2 +-
.../apache/hadoop/util/DiskValidatorFactory.java | 2 +-
.../java/org/apache/hadoop/util/FindClass.java | 2 +-
.../java/org/apache/hadoop/util/GcTimeMonitor.java | 2 +-
.../org/apache/hadoop/util/IdentityHashStore.java | 2 +-
.../org/apache/hadoop/util/InstrumentedLock.java | 2 +-
.../apache/hadoop/util/InstrumentedReadLock.java | 2 +-
.../apache/hadoop/util/InstrumentedWriteLock.java | 2 +-
.../apache/hadoop/util/IntrusiveCollection.java | 2 +-
.../org/apache/hadoop/util/JsonSerialization.java | 2 +-
.../org/apache/hadoop/util/JvmPauseMonitor.java | 10 +++---
.../org/apache/hadoop/util/LightWeightCache.java | 4 +--
.../org/apache/hadoop/util/LightWeightGSet.java | 2 +-
.../org/apache/hadoop/util/LimitInputStream.java | 4 +--
.../java/org/apache/hadoop/util/MachineList.java | 2 +-
.../java/org/apache/hadoop/util/NativeCrc32.java | 2 +-
.../hadoop/util/ReadWriteDiskValidatorMetrics.java | 2 +-
.../hadoop/util/SemaphoredDelegatingExecutor.java | 8 ++---
.../java/org/apache/hadoop/util/ServletUtil.java | 2 +-
.../main/java/org/apache/hadoop/util/Shell.java | 2 +-
.../apache/hadoop/util/ShutdownHookManager.java | 4 +--
.../apache/hadoop/util/ShutdownThreadsHelper.java | 2 +-
.../org/apache/hadoop/util/StringInterner.java | 4 +--
.../java/org/apache/hadoop/util/StringUtils.java | 4 +--
.../java/org/apache/hadoop/util/SysInfoLinux.java | 2 +-
.../org/apache/hadoop/util/SysInfoWindows.java | 2 +-
.../main/java/org/apache/hadoop/util/ZKUtil.java | 8 ++---
.../hadoop/util/concurrent/AsyncGetFuture.java | 2 +-
.../apache/hadoop/util/curator/ChildReaper.java | 2 +-
.../hadoop/util/curator/ZKCuratorManager.java | 2 +-
.../org/apache/hadoop/conf/TestConfServlet.java | 2 +-
.../hadoop/conf/TestConfigurationDeprecation.java | 4 +--
.../apache/hadoop/conf/TestReconfiguration.java | 2 +-
.../org/apache/hadoop/crypto/TestCryptoCodec.java | 2 +-
.../apache/hadoop/crypto/key/TestValueQueue.java | 2 +-
.../kms/TestLoadBalancingKMSClientProvider.java | 2 +-
.../org/apache/hadoop/fs/FCStatisticsBaseTest.java | 2 +-
.../apache/hadoop/fs/TestFileSystemCaching.java | 4 +--
.../org/apache/hadoop/fs/TestLocalFileSystem.java | 2 +-
.../test/java/org/apache/hadoop/fs/TestPath.java | 2 +-
.../AbstractContractMultipartUploaderTest.java | 2 +-
.../apache/hadoop/fs/ftp/TestFTPFileSystem.java | 2 +-
.../hadoop/fs/loadGenerator/LoadGenerator.java | 2 +-
.../org/apache/hadoop/ha/ClientBaseWithFixes.java | 2 +-
.../java/org/apache/hadoop/ha/DummyHAService.java | 2 +-
.../java/org/apache/hadoop/ha/MiniZKFCCluster.java | 4 +--
.../hadoop/ha/TestActiveStandbyElectorRealZK.java | 2 +-
.../java/org/apache/hadoop/ha/TestHAAdmin.java | 4 +--
.../java/org/apache/hadoop/ha/TestNodeFencer.java | 2 +-
.../apache/hadoop/ha/TestShellCommandFencer.java | 2 +-
.../test/java/org/apache/hadoop/io/TestText.java | 4 +--
.../io/compress/CompressDecompressTester.java | 8 ++---
.../io/compress/TestCompressorDecompressor.java | 2 +-
.../zlib/TestZlibCompressorDecompressor.java | 2 +-
.../rawcoder/RawErasureCoderBenchmark.java | 2 +-
.../org/apache/hadoop/ipc/RPCCallBenchmark.java | 2 +-
.../test/java/org/apache/hadoop/ipc/TestIPC.java | 4 +--
.../metrics2/impl/TestMetricsSourceAdapter.java | 2 +-
.../metrics2/impl/TestMetricsSystemImpl.java | 2 +-
.../apache/hadoop/net/MockDomainNameResolver.java | 2 +-
.../org/apache/hadoop/net/TestTableMapping.java | 4 +--
.../apache/hadoop/net/unix/TestDomainSocket.java | 2 +-
.../hadoop/net/unix/TestDomainSocketWatcher.java | 2 +-
.../TestLdapGroupsMappingWithBindUserSwitch.java | 2 +-
.../apache/hadoop/security/TestSecurityUtil.java | 2 +-
.../hadoop/security/TestShellBasedIdMapping.java | 4 +--
.../org/apache/hadoop/test/GenericTestUtils.java | 4 +--
.../org/apache/hadoop/test/LambdaTestUtils.java | 2 +-
.../org/apache/hadoop/test/MetricsAsserts.java | 2 +-
.../java/org/apache/hadoop/util/JarFinder.java | 2 +-
.../hadoop/util/TestApplicationClassLoader.java | 4 +--
.../apache/hadoop/util/TestDirectBufferPool.java | 2 +-
.../hadoop/util/TestGenericOptionsParser.java | 2 +-
.../org/apache/hadoop/util/TestMachineList.java | 2 +-
.../java/org/apache/hadoop/util/TestZKUtil.java | 4 +--
.../hadoop/util/bloom/BloomFilterCommonTester.java | 4 +--
.../apache/hadoop/util/bloom/TestBloomFilters.java | 6 ++--
hadoop-common-project/hadoop-kms/pom.xml | 4 +--
.../apache/hadoop/crypto/key/kms/server/KMS.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSACLs.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSAudit.java | 18 +++++------
.../key/kms/server/KMSAuthenticationFilter.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSMDCFilter.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 6 ++--
.../key/kms/server/SimpleKMSAuditLogger.java | 4 +--
.../hadoop/crypto/key/kms/server/MiniKMS.java | 2 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 2 +-
hadoop-common-project/hadoop-nfs/pom.xml | 4 +--
.../java/org/apache/hadoop/nfs/NfsExports.java | 2 +-
.../hadoop/nfs/nfs3/request/LOOKUP3Request.java | 2 +-
.../hadoop/nfs/nfs3/request/READ3Request.java | 2 +-
.../hadoop/nfs/nfs3/response/READDIR3Response.java | 2 +-
.../nfs/nfs3/response/READDIRPLUS3Response.java | 2 +-
.../org/apache/hadoop/oncrpc/RpcCallCache.java | 2 +-
.../java/org/apache/hadoop/oncrpc/RpcProgram.java | 2 +-
.../java/org/apache/hadoop/oncrpc/RpcReply.java | 2 +-
.../main/java/org/apache/hadoop/oncrpc/XDR.java | 4 +--
.../apache/hadoop/oncrpc/security/Credentials.java | 2 +-
.../hadoop/oncrpc/security/CredentialsNone.java | 2 +-
.../hadoop/oncrpc/security/CredentialsSys.java | 2 +-
.../hadoop/oncrpc/security/VerifierNone.java | 2 +-
.../java/org/apache/hadoop/portmap/Portmap.java | 2 +-
hadoop-common-project/hadoop-registry/pom.xml | 4 +--
.../apache/hadoop/registry/cli/RegistryCli.java | 2 +-
.../registry/client/api/DNSOperationsFactory.java | 2 +-
.../client/api/RegistryOperationsFactory.java | 2 +-
.../registry/client/binding/RegistryPathUtils.java | 2 +-
.../registry/client/binding/RegistryTypeUtils.java | 2 +-
.../registry/client/binding/RegistryUtils.java | 4 +--
.../client/impl/FSRegistryOperationsService.java | 4 +--
.../registry/client/impl/zk/CuratorService.java | 4 +--
.../client/impl/zk/RegistryOperationsService.java | 2 +-
.../registry/client/impl/zk/RegistrySecurity.java | 6 ++--
.../registry/client/impl/zk/ZKPathDumper.java | 4 +--
.../hadoop/registry/client/types/Endpoint.java | 2 +-
.../registry/client/types/ServiceRecord.java | 2 +-
.../hadoop/registry/server/dns/RegistryDNS.java | 2 +-
.../registry/server/dns/RegistryDNSServer.java | 2 +-
.../registry/server/dns/ReverseZoneUtils.java | 2 +-
.../integration/SelectByYarnPersistence.java | 2 +-
.../server/services/MicroZookeeperService.java | 2 +-
.../server/services/RegistryAdminService.java | 2 +-
.../java/org/apache/hadoop/hdfs/ClientContext.java | 2 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 10 +++---
.../apache/hadoop/hdfs/DFSClientFaultInjector.java | 2 +-
.../org/apache/hadoop/hdfs/DFSInputStream.java | 2 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +--
.../apache/hadoop/hdfs/DFSStripedInputStream.java | 2 +-
.../apache/hadoop/hdfs/DFSStripedOutputStream.java | 4 +--
.../java/org/apache/hadoop/hdfs/DFSUtilClient.java | 8 ++---
.../java/org/apache/hadoop/hdfs/DataStreamer.java | 12 +++----
.../org/apache/hadoop/hdfs/DeadNodeDetector.java | 2 +-
.../apache/hadoop/hdfs/DistributedFileSystem.java | 6 ++--
.../org/apache/hadoop/hdfs/KeyProviderCache.java | 10 +++---
.../apache/hadoop/hdfs/NameNodeProxiesClient.java | 4 +--
.../java/org/apache/hadoop/hdfs/PeerCache.java | 6 ++--
.../apache/hadoop/hdfs/PositionStripeReader.java | 2 +-
.../apache/hadoop/hdfs/StatefulStripeReader.java | 2 +-
.../java/org/apache/hadoop/hdfs/StripeReader.java | 2 +-
.../apache/hadoop/hdfs/StripedDataStreamer.java | 2 +-
.../java/org/apache/hadoop/hdfs/XAttrHelper.java | 6 ++--
.../hadoop/hdfs/client/HdfsDataInputStream.java | 2 +-
.../hadoop/hdfs/client/HdfsDataOutputStream.java | 2 +-
.../hdfs/client/impl/BlockReaderFactory.java | 8 ++---
.../hadoop/hdfs/client/impl/BlockReaderLocal.java | 4 +--
.../hadoop/hdfs/client/impl/BlockReaderRemote.java | 2 +-
.../hadoop/hdfs/client/impl/DfsClientConf.java | 4 +--
.../hadoop/hdfs/client/impl/LeaseRenewer.java | 2 +-
.../client/impl/SnapshotDiffReportGenerator.java | 2 +-
.../impl/metrics/BlockReaderLocalMetrics.java | 2 +-
.../hadoop/hdfs/protocol/BlockStoragePolicy.java | 2 +-
.../hadoop/hdfs/protocol/CacheDirectiveInfo.java | 2 +-
.../hdfs/protocol/CacheDirectiveIterator.java | 2 +-
.../apache/hadoop/hdfs/protocol/DatanodeID.java | 2 +-
.../hadoop/hdfs/protocol/ErasureCodingPolicy.java | 2 +-
.../hdfs/protocol/ErasureCodingPolicyInfo.java | 2 +-
.../hadoop/hdfs/protocol/HdfsPartialListing.java | 2 +-
.../apache/hadoop/hdfs/protocol/LocatedBlock.java | 4 +--
.../hadoop/hdfs/protocol/ReencryptionStatus.java | 6 ++--
.../hadoop/hdfs/protocol/SnapshotDiffReport.java | 2 +-
.../hdfs/protocol/SnapshotDiffReportListing.java | 2 +-
.../hdfs/protocol/ZoneReencryptionStatus.java | 2 +-
.../hdfs/protocol/datatransfer/PacketHeader.java | 6 ++--
.../hdfs/protocol/datatransfer/PacketReceiver.java | 4 +--
.../hdfs/protocol/datatransfer/PipelineAck.java | 2 +-
.../datatransfer/sasl/DataTransferSaslUtil.java | 8 ++---
.../datatransfer/sasl/SaslDataTransferClient.java | 6 ++--
.../ClientNamenodeProtocolTranslatorPB.java | 2 +-
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 12 +++----
.../protocolPB/ReconfigurationProtocolUtils.java | 2 +-
.../security/token/block/BlockTokenIdentifier.java | 2 +-
.../delegation/DelegationTokenIdentifier.java | 2 +-
.../hdfs/server/datanode/BlockMetadataHeader.java | 2 +-
.../hdfs/server/datanode/DiskBalancerWorkItem.java | 2 +-
.../server/datanode/DiskBalancerWorkStatus.java | 2 +-
.../namenode/ha/ObserverReadProxyProvider.java | 2 +-
.../hdfs/server/protocol/SlowDiskReports.java | 2 +-
.../hdfs/server/protocol/SlowPeerReports.java | 2 +-
.../hadoop/hdfs/shortcircuit/DfsClientShm.java | 2 +-
.../hdfs/shortcircuit/DfsClientShmManager.java | 4 +--
.../hdfs/shortcircuit/DomainSocketFactory.java | 8 ++---
.../hdfs/shortcircuit/ShortCircuitCache.java | 6 ++--
.../hdfs/shortcircuit/ShortCircuitReplica.java | 4 +--
.../hadoop/hdfs/shortcircuit/ShortCircuitShm.java | 6 ++--
.../apache/hadoop/hdfs/util/ByteArrayManager.java | 2 +-
.../apache/hadoop/hdfs/util/StripedBlockUtil.java | 4 +--
.../hadoop/hdfs/web/ByteRangeInputStream.java | 4 +--
.../org/apache/hadoop/hdfs/web/JsonUtilClient.java | 6 ++--
.../org/apache/hadoop/hdfs/web/TokenAspect.java | 2 +-
.../hadoop/hdfs/web/URLConnectionFactory.java | 2 +-
.../apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 8 ++---
.../hdfs/web/resources/AclPermissionParam.java | 2 +-
.../hadoop/hdfs/web/resources/UserParam.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestPeerCache.java | 2 +-
.../ha/TestRequestHedgingProxyProvider.java | 2 +-
.../hadoop/hdfs/web/TestByteRangeInputStream.java | 2 +-
.../hadoop/hdfs/web/TestURLConnectionFactory.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 +--
.../hadoop/fs/http/client/HttpFSFileSystem.java | 8 ++---
.../apache/hadoop/fs/http/server/HttpFSServer.java | 2 +-
.../apache/hadoop/lib/servlet/ServerWebApp.java | 2 +-
.../org/apache/hadoop/lib/wsrs/Parameters.java | 2 +-
.../apache/hadoop/lib/wsrs/ParametersProvider.java | 2 +-
.../hadoop/fs/http/client/BaseTestHttpFSWith.java | 2 +-
.../hadoop/fs/http/server/TestHttpFSServer.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 4 +--
.../hadoop/hdfs/nfs/mount/RpcProgramMountd.java | 2 +-
.../hadoop/hdfs/nfs/nfs3/DFSClientCache.java | 16 +++++-----
.../java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java | 2 +-
.../apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java | 2 +-
.../apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 4 +--
.../hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java | 6 ++--
.../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +-
.../org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java | 4 +--
.../apache/hadoop/hdfs/nfs/nfs3/WriteManager.java | 2 +-
.../metrics/FederationRPCPerformanceMonitor.java | 2 +-
.../federation/metrics/NamenodeBeanMetrics.java | 6 ++--
.../hdfs/server/federation/metrics/RBFMetrics.java | 2 +-
.../federation/metrics/StateStoreMetrics.java | 2 +-
.../federation/resolver/MountTableResolver.java | 6 ++--
.../MultipleDestinationMountTableResolver.java | 2 +-
.../resolver/order/AvailableSpaceResolver.java | 2 +-
.../federation/resolver/order/HashResolver.java | 2 +-
.../federation/resolver/order/LocalResolver.java | 4 +--
.../federation/resolver/order/RandomResolver.java | 2 +-
.../federation/router/ConnectionManager.java | 2 +-
.../server/federation/router/ConnectionPool.java | 2 +-
.../server/federation/router/ConnectionPoolId.java | 2 +-
.../router/MountTableRefresherService.java | 14 ++++----
.../server/federation/router/PeriodicService.java | 2 +-
.../hdfs/server/federation/router/Quota.java | 4 +--
.../hdfs/server/federation/router/Router.java | 2 +-
.../federation/router/RouterAdminServer.java | 4 +--
.../federation/router/RouterClientProtocol.java | 2 +-
.../federation/router/RouterHeartbeatService.java | 2 +-
.../server/federation/router/RouterRpcClient.java | 4 +--
.../server/federation/router/RouterRpcServer.java | 2 +-
.../router/security/RouterSecurityManager.java | 2 +-
.../server/federation/store/StateStoreService.java | 2 +-
.../store/driver/impl/StateStoreFileBaseImpl.java | 2 +-
.../store/driver/impl/StateStoreFileImpl.java | 2 +-
.../federation/store/records/BaseRecord.java | 2 +-
.../router/TestRouterPolicyProvider.java | 2 +-
.../server/federation/router/TestRouterRpc.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 +--
.../main/java/org/apache/hadoop/hdfs/DFSUtil.java | 10 +++---
.../main/java/org/apache/hadoop/hdfs/HAUtil.java | 6 ++--
.../apache/hadoop/hdfs/net/DFSNetworkTopology.java | 4 +--
.../hadoop/hdfs/net/DFSTopologyNodeImpl.java | 4 +--
.../hadoop/hdfs/protocol/BlockListAsLongs.java | 4 +--
.../hadoop/hdfs/protocol/CacheDirective.java | 4 +--
.../apache/hadoop/hdfs/protocol/LayoutFlags.java | 8 ++---
.../datatransfer/sasl/SaslDataTransferServer.java | 6 ++--
.../DatanodeProtocolClientSideTranslatorPB.java | 2 +-
.../DatanodeProtocolServerSideTranslatorPB.java | 2 +-
.../hadoop/hdfs/qjournal/client/AsyncLogger.java | 2 +-
.../hdfs/qjournal/client/AsyncLoggerSet.java | 12 +++----
.../hdfs/qjournal/client/IPCLoggerChannel.java | 20 ++++++------
.../qjournal/client/IPCLoggerChannelMetrics.java | 2 +-
.../hadoop/hdfs/qjournal/client/QuorumCall.java | 14 ++++----
.../hdfs/qjournal/client/QuorumException.java | 4 +--
.../hdfs/qjournal/client/QuorumJournalManager.java | 8 ++---
.../qjournal/client/SegmentRecoveryComparator.java | 6 ++--
.../hadoop/hdfs/qjournal/server/JNStorage.java | 2 +-
.../hadoop/hdfs/qjournal/server/Journal.java | 8 ++---
.../hdfs/qjournal/server/JournalFaultInjector.java | 2 +-
.../hadoop/hdfs/qjournal/server/JournalNode.java | 8 ++---
.../hdfs/qjournal/server/JournalNodeRpcServer.java | 2 +-
.../hdfs/qjournal/server/JournalNodeSyncer.java | 6 ++--
.../hdfs/qjournal/server/JournaledEditsCache.java | 2 +-
.../token/block/BlockPoolTokenSecretManager.java | 2 +-
.../token/block/BlockTokenSecretManager.java | 10 +++---
.../delegation/DelegationTokenSecretManager.java | 4 +--
.../hdfs/server/aliasmap/InMemoryAliasMap.java | 4 +--
.../hadoop/hdfs/server/balancer/Balancer.java | 6 ++--
.../hadoop/hdfs/server/balancer/Dispatcher.java | 4 +--
.../hdfs/server/balancer/NameNodeConnector.java | 6 ++--
.../AvailableSpaceBlockPlacementPolicy.java | 2 +-
.../server/blockmanagement/BlockIdManager.java | 4 +--
.../hdfs/server/blockmanagement/BlockInfo.java | 2 +-
.../blockmanagement/BlockInfoContiguous.java | 2 +-
.../server/blockmanagement/BlockInfoStriped.java | 4 +--
.../hdfs/server/blockmanagement/BlockManager.java | 4 +--
.../blockmanagement/BlockManagerFaultInjector.java | 2 +-
.../blockmanagement/BlockManagerSafeMode.java | 4 +--
.../blockmanagement/BlockPlacementPolicy.java | 2 +-
.../BlockPlacementPolicyDefault.java | 4 +--
.../blockmanagement/BlockReportLeaseManager.java | 2 +-
.../blockmanagement/BlockStoragePolicySuite.java | 6 ++--
.../server/blockmanagement/BlockToMarkCorrupt.java | 2 +-
.../blockmanagement/CacheReplicationMonitor.java | 2 +-
.../blockmanagement/CombinedHostFileManager.java | 8 ++---
.../server/blockmanagement/CorruptReplicasMap.java | 2 +-
.../DatanodeAdminBackoffMonitor.java | 2 +-
.../DatanodeAdminDefaultMonitor.java | 2 +-
.../blockmanagement/DatanodeAdminManager.java | 6 ++--
.../server/blockmanagement/DatanodeDescriptor.java | 2 +-
.../server/blockmanagement/DatanodeManager.java | 6 ++--
.../blockmanagement/DatanodeStorageInfo.java | 2 +-
.../blockmanagement/ExcessRedundancyMap.java | 2 +-
.../server/blockmanagement/HeartbeatManager.java | 2 +-
.../server/blockmanagement/HostFileManager.java | 2 +-
.../hdfs/server/blockmanagement/HostSet.java | 8 ++---
.../server/blockmanagement/InvalidateBlocks.java | 2 +-
.../blockmanagement/PendingDataNodeMessages.java | 4 +--
.../PendingReconstructionBlocks.java | 2 +-
.../blockmanagement/PendingRecoveryBlocks.java | 2 +-
.../server/blockmanagement/ProvidedStorageMap.java | 2 +-
.../server/blockmanagement/SlowDiskTracker.java | 8 ++---
.../server/blockmanagement/SlowPeerTracker.java | 6 ++--
.../hdfs/server/common/HdfsServerConstants.java | 2 +-
.../apache/hadoop/hdfs/server/common/Storage.java | 4 +--
.../hadoop/hdfs/server/common/StorageInfo.java | 2 +-
.../org/apache/hadoop/hdfs/server/common/Util.java | 4 +--
.../blockaliasmap/impl/TextFileRegionAliasMap.java | 2 +-
.../hdfs/server/datanode/BPOfferService.java | 8 ++---
.../hdfs/server/datanode/BPServiceActor.java | 4 +--
.../hdfs/server/datanode/BlockChecksumHelper.java | 2 +-
.../hdfs/server/datanode/BlockPoolManager.java | 10 +++---
.../server/datanode/BlockPoolSliceStorage.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockReceiver.java | 2 +-
.../hdfs/server/datanode/BlockRecoveryWorker.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockScanner.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockSender.java | 4 +--
.../hadoop/hdfs/server/datanode/DataNode.java | 14 ++++----
.../server/datanode/DataNodeFaultInjector.java | 2 +-
.../hadoop/hdfs/server/datanode/DataStorage.java | 8 ++---
.../hadoop/hdfs/server/datanode/DataXceiver.java | 4 +--
.../hdfs/server/datanode/DataXceiverServer.java | 4 +--
.../hdfs/server/datanode/DirectoryScanner.java | 6 ++--
.../hadoop/hdfs/server/datanode/DiskBalancer.java | 4 +--
.../datanode/IncrementalBlockReportManager.java | 4 +--
.../hadoop/hdfs/server/datanode/LocalReplica.java | 2 +-
.../hdfs/server/datanode/ProvidedReplica.java | 2 +-
.../server/datanode/SecureDataNodeStarter.java | 2 +-
.../hdfs/server/datanode/ShortCircuitRegistry.java | 8 ++---
.../hadoop/hdfs/server/datanode/VolumeScanner.java | 8 ++---
.../server/datanode/VolumeScannerCBInjector.java | 2 +-
.../server/datanode/checker/AbstractFuture.java | 20 ++++++------
.../hdfs/server/datanode/checker/AsyncChecker.java | 2 +-
.../datanode/checker/DatasetVolumeChecker.java | 16 +++++-----
.../datanode/checker/StorageLocationChecker.java | 6 ++--
.../datanode/checker/ThrottledAsyncChecker.java | 10 +++---
.../server/datanode/checker/TimeoutFuture.java | 4 +--
.../datanode/erasurecode/ErasureCodingWorker.java | 2 +-
.../server/datanode/erasurecode/StripedReader.java | 2 +-
.../datanode/erasurecode/StripedReconstructor.java | 2 +-
.../server/datanode/erasurecode/StripedWriter.java | 2 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 2 +-
.../server/datanode/fsdataset/impl/CacheStats.java | 2 +-
.../datanode/fsdataset/impl/FsDatasetCache.java | 4 +--
.../datanode/fsdataset/impl/FsDatasetImpl.java | 8 ++---
.../datanode/fsdataset/impl/FsDatasetUtil.java | 2 +-
.../datanode/fsdataset/impl/FsVolumeImpl.java | 8 ++---
.../fsdataset/impl/FsVolumeImplBuilder.java | 2 +-
.../fsdataset/impl/MappableBlockLoader.java | 2 +-
.../impl/NativePmemMappableBlockLoader.java | 2 +-
.../datanode/fsdataset/impl/PmemVolumeManager.java | 2 +-
.../fsdataset/impl/ProvidedVolumeImpl.java | 2 +-
.../fsdataset/impl/RamDiskReplicaLruTracker.java | 2 +-
.../fsdataset/impl/RamDiskReplicaTracker.java | 2 +-
.../datanode/metrics/DataNodeDiskMetrics.java | 6 ++--
.../server/datanode/metrics/OutlierDetector.java | 4 +--
.../HostRestrictingAuthorizationFilterHandler.java | 2 +-
.../datanode/web/webhdfs/DataNodeUGIProvider.java | 6 ++--
.../datanode/web/webhdfs/ExceptionHandler.java | 2 +-
.../datanode/web/webhdfs/WebHdfsHandler.java | 2 +-
.../server/diskbalancer/command/CancelCommand.java | 2 +-
.../hdfs/server/diskbalancer/command/Command.java | 6 ++--
.../diskbalancer/command/ExecuteCommand.java | 2 +-
.../server/diskbalancer/command/HelpCommand.java | 2 +-
.../server/diskbalancer/command/PlanCommand.java | 4 +--
.../server/diskbalancer/command/QueryCommand.java | 2 +-
.../server/diskbalancer/command/ReportCommand.java | 4 +--
.../connectors/DBNameNodeConnector.java | 2 +-
.../diskbalancer/connectors/JsonNodeConnector.java | 2 +-
.../datamodel/DiskBalancerCluster.java | 2 +-
.../datamodel/DiskBalancerDataNode.java | 2 +-
.../datamodel/DiskBalancerVolumeSet.java | 2 +-
.../server/diskbalancer/planner/GreedyPlanner.java | 2 +-
.../hdfs/server/diskbalancer/planner/NodePlan.java | 2 +-
.../org/apache/hadoop/hdfs/server/mover/Mover.java | 6 ++--
.../hdfs/server/namenode/AclEntryStatusFormat.java | 2 +-
.../hadoop/hdfs/server/namenode/AclFeature.java | 4 +--
.../hadoop/hdfs/server/namenode/AclStorage.java | 6 ++--
.../hdfs/server/namenode/AclTransformation.java | 8 ++---
.../hadoop/hdfs/server/namenode/BackupImage.java | 4 +--
.../hadoop/hdfs/server/namenode/BackupNode.java | 2 +-
.../hadoop/hdfs/server/namenode/CacheManager.java | 8 ++---
.../hadoop/hdfs/server/namenode/CachePool.java | 2 +-
.../hdfs/server/namenode/CheckpointConf.java | 2 +-
.../hdfs/server/namenode/CheckpointSignature.java | 2 +-
.../hadoop/hdfs/server/namenode/Checkpointer.java | 4 +--
.../namenode/ContentSummaryComputationContext.java | 2 +-
.../server/namenode/EditLogBackupInputStream.java | 2 +-
.../server/namenode/EditLogFileInputStream.java | 6 ++--
.../server/namenode/EditLogFileOutputStream.java | 2 +-
.../hdfs/server/namenode/EditsDoubleBuffer.java | 2 +-
.../server/namenode/EncryptionFaultInjector.java | 2 +-
.../server/namenode/EncryptionZoneManager.java | 8 ++---
.../namenode/ErasureCodingPolicyManager.java | 4 +--
.../hadoop/hdfs/server/namenode/FSDirAclOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirAppendOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirAttrOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirConcatOp.java | 2 +-
.../server/namenode/FSDirEncryptionZoneOp.java | 4 +--
.../hdfs/server/namenode/FSDirErasureCodingOp.java | 4 +--
.../hadoop/hdfs/server/namenode/FSDirMkdirOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirRenameOp.java | 2 +-
.../namenode/FSDirSatisfyStoragePolicyOp.java | 2 +-
.../server/namenode/FSDirStatAndListingOp.java | 2 +-
.../hdfs/server/namenode/FSDirTruncateOp.java | 2 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirXAttrOp.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSDirectory.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSEditLog.java | 6 ++--
.../hdfs/server/namenode/FSEditLogAsync.java | 4 +--
.../hdfs/server/namenode/FSEditLogLoader.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSEditLogOp.java | 10 +++---
.../hadoop/hdfs/server/namenode/FSImage.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSImageFormat.java | 4 +--
.../hdfs/server/namenode/FSImageFormatPBINode.java | 4 +--
.../server/namenode/FSImageFormatProtobuf.java | 4 +--
.../hdfs/server/namenode/FSImageSerialization.java | 2 +-
.../FSImageTransactionalStorageInspector.java | 4 +--
.../hadoop/hdfs/server/namenode/FSNamesystem.java | 14 ++++----
.../hdfs/server/namenode/FSNamesystemLock.java | 2 +-
.../hdfs/server/namenode/FSPermissionChecker.java | 2 +-
.../hdfs/server/namenode/FSTreeTraverser.java | 2 +-
.../hdfs/server/namenode/FileJournalManager.java | 10 +++---
.../apache/hadoop/hdfs/server/namenode/INode.java | 8 ++---
.../server/namenode/INodeAttributeProvider.java | 2 +-
.../hdfs/server/namenode/INodeDirectory.java | 4 +--
.../server/namenode/INodeDirectoryAttributes.java | 2 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 4 +--
.../hadoop/hdfs/server/namenode/INodeMap.java | 2 +-
.../hdfs/server/namenode/INodeReference.java | 2 +-
.../server/namenode/INodeWithAdditionalFields.java | 2 +-
.../hadoop/hdfs/server/namenode/INodesInPath.java | 2 +-
.../hadoop/hdfs/server/namenode/ImageServlet.java | 4 +--
.../namenode/InotifyFSEditLogOpTranslator.java | 2 +-
.../hadoop/hdfs/server/namenode/JournalSet.java | 8 ++---
.../hadoop/hdfs/server/namenode/LeaseManager.java | 6 ++--
.../hadoop/hdfs/server/namenode/NNStorage.java | 6 ++--
.../server/namenode/NNStorageRetentionManager.java | 8 ++---
.../hadoop/hdfs/server/namenode/NNUpgradeUtil.java | 2 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 10 +++---
.../hdfs/server/namenode/NameNodeHttpServer.java | 2 +-
.../server/namenode/NameNodeResourceChecker.java | 2 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 4 +--
.../hadoop/hdfs/server/namenode/NameNodeUtils.java | 2 +-
.../hadoop/hdfs/server/namenode/NamenodeFsck.java | 2 +-
.../server/namenode/QuotaByStorageTypeEntry.java | 2 +-
.../hadoop/hdfs/server/namenode/QuotaCounts.java | 2 +-
.../namenode/RedundantEditLogInputStream.java | 4 +--
.../hdfs/server/namenode/ReencryptionHandler.java | 6 ++--
.../hdfs/server/namenode/ReencryptionUpdater.java | 6 ++--
.../hdfs/server/namenode/SaveNamespaceContext.java | 2 +-
.../hdfs/server/namenode/SecondaryNameNode.java | 6 ++--
.../hdfs/server/namenode/TransferFsImage.java | 4 +--
.../hadoop/hdfs/server/namenode/XAttrFeature.java | 2 +-
.../hadoop/hdfs/server/namenode/XAttrFormat.java | 4 +--
.../server/namenode/XAttrPermissionFilter.java | 4 +--
.../hdfs/server/namenode/ha/BootstrapStandby.java | 4 +--
.../hdfs/server/namenode/ha/EditLogTailer.java | 8 ++---
.../server/namenode/ha/RemoteNameNodeInfo.java | 4 +--
.../server/namenode/ha/StandbyCheckpointer.java | 8 ++---
.../namenode/snapshot/AbstractINodeDiff.java | 2 +-
.../namenode/snapshot/DiffListBySkipList.java | 2 +-
.../snapshot/DirectorySnapshottableFeature.java | 6 ++--
.../snapshot/DirectoryWithSnapshotFeature.java | 2 +-
.../namenode/snapshot/FSImageFormatPBSnapshot.java | 4 +--
.../server/namenode/snapshot/SnapshotDiffInfo.java | 4 +--
.../namenode/snapshot/SnapshotDiffListingInfo.java | 2 +-
.../namenode/snapshot/SnapshotFSImageFormat.java | 2 +-
.../server/namenode/snapshot/SnapshotManager.java | 4 +--
.../sps/BlockStorageMovementAttemptedItems.java | 2 +-
.../namenode/sps/BlockStorageMovementNeeded.java | 2 +-
.../namenode/sps/StoragePolicySatisfier.java | 4 +--
.../namenode/sps/StoragePolicySatisfyManager.java | 2 +-
.../hdfs/server/namenode/top/TopAuditLogger.java | 2 +-
.../hadoop/hdfs/server/namenode/top/TopConf.java | 4 +--
.../server/namenode/top/metrics/TopMetrics.java | 2 +-
.../namenode/top/window/RollingWindowManager.java | 2 +-
.../web/resources/NamenodeWebHdfsMethods.java | 6 ++--
.../protocol/BlockECReconstructionCommand.java | 2 +-
.../hdfs/server/protocol/BlockRecoveryCommand.java | 2 +-
.../hdfs/server/protocol/BlocksWithLocations.java | 2 +-
.../hdfs/server/protocol/DatanodeRegistration.java | 2 +-
.../hadoop/hdfs/server/protocol/NamespaceInfo.java | 4 +--
.../hadoop/hdfs/server/protocol/RemoteEditLog.java | 2 +-
.../server/protocol/RemoteEditLogManifest.java | 4 +--
.../org/apache/hadoop/hdfs/tools/AdminHelper.java | 2 +-
.../org/apache/hadoop/hdfs/tools/CacheAdmin.java | 2 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 4 +--
.../org/apache/hadoop/hdfs/tools/DFSHAAdmin.java | 6 ++--
.../hadoop/hdfs/tools/DFSZKFailoverController.java | 2 +-
.../org/apache/hadoop/hdfs/tools/DebugAdmin.java | 2 +-
.../hadoop/hdfs/tools/DelegationTokenFetcher.java | 2 +-
.../hadoop/hdfs/tools/NNHAServiceTarget.java | 2 +-
.../offlineEditsViewer/OfflineEditsXmlLoader.java | 2 +-
.../offlineEditsViewer/StatisticsEditsVisitor.java | 2 +-
.../tools/offlineImageViewer/FSImageHandler.java | 2 +-
.../tools/offlineImageViewer/FSImageLoader.java | 8 ++---
.../FileDistributionCalculator.java | 2 +-
.../OfflineImageReconstructor.java | 6 ++--
.../PBImageCorruptionDetector.java | 2 +-
.../offlineImageViewer/PBImageTextWriter.java | 6 ++--
.../tools/offlineImageViewer/PBImageXmlWriter.java | 4 +--
.../offlineImageViewer/TextWriterImageVisitor.java | 2 +-
.../tools/offlineImageViewer/WebImageViewer.java | 2 +-
.../hadoop/hdfs/util/BestEffortLongFile.java | 4 +--
.../java/org/apache/hadoop/hdfs/util/Diff.java | 2 +-
.../org/apache/hadoop/hdfs/util/EnumCounters.java | 2 +-
.../org/apache/hadoop/hdfs/util/EnumDoubles.java | 2 +-
.../org/apache/hadoop/hdfs/util/MD5FileUtils.java | 2 +-
.../hadoop/hdfs/util/PersistentLongFile.java | 2 +-
.../apache/hadoop/hdfs/util/ReferenceCountMap.java | 4 +--
.../java/org/apache/hadoop/hdfs/web/JsonUtil.java | 4 +--
.../hdfs/web/resources/ExceptionHandler.java | 2 +-
.../hadoop/fs/TestEnhancedByteBufferAccess.java | 2 +-
.../java/org/apache/hadoop/fs/TestGlobPaths.java | 2 +-
.../fs/viewfs/TestViewFileSystemWithAcls.java | 2 +-
.../hadoop/fs/viewfs/TestViewFsWithAcls.java | 2 +-
.../apache/hadoop/hdfs/AdminStatesBaseTest.java | 2 +-
.../java/org/apache/hadoop/hdfs/DFSTestUtil.java | 14 ++++----
.../hdfs/ErasureCodeBenchmarkThroughput.java | 2 +-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 12 +++----
.../org/apache/hadoop/hdfs/MiniDFSNNTopology.java | 4 +--
.../apache/hadoop/hdfs/StripedFileTestUtil.java | 2 +-
.../hadoop/hdfs/TestAppendSnapshotTruncate.java | 2 +-
.../hadoop/hdfs/TestBatchedListDirectories.java | 2 +-
.../apache/hadoop/hdfs/TestBlockStoragePolicy.java | 4 +--
.../org/apache/hadoop/hdfs/TestDFSFinalize.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSRollback.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestDFSShell.java | 2 +-
.../TestDFSStripedOutputStreamWithFailureBase.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestDFSUtil.java | 2 +-
.../org/apache/hadoop/hdfs/TestDecommission.java | 2 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 2 +-
.../hadoop/hdfs/TestErasureCodingExerciseAPIs.java | 2 +-
.../org/apache/hadoop/hdfs/TestExtendedAcls.java | 2 +-
.../hadoop/hdfs/TestExternalBlockReader.java | 2 +-
.../apache/hadoop/hdfs/TestHDFSPolicyProvider.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestHdfsAdmin.java | 2 +-
.../hadoop/hdfs/TestLeaseRecoveryStriped.java | 2 +-
.../apache/hadoop/hdfs/TestMaintenanceState.java | 2 +-
.../org/apache/hadoop/hdfs/TestMiniDFSCluster.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestQuota.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestSafeMode.java | 2 +-
.../hadoop/hdfs/TestSafeModeWithStripedFile.java | 2 +-
.../hdfs/TestTrashWithSecureEncryptionZones.java | 2 +-
.../org/apache/hadoop/hdfs/UpgradeUtilities.java | 6 ++--
.../hdfs/client/impl/TestBlockReaderFactory.java | 2 +-
.../hadoop/hdfs/net/TestDFSNetworkTopology.java | 2 +-
.../protocol/datatransfer/TestPacketReceiver.java | 2 +-
.../hadoop/hdfs/protocolPB/TestPBHelper.java | 8 ++---
.../hadoop/hdfs/qjournal/MiniJournalCluster.java | 4 +--
.../apache/hadoop/hdfs/qjournal/QJMTestUtil.java | 2 +-
.../hdfs/qjournal/client/TestEpochsAreUnique.java | 4 +--
.../hdfs/qjournal/client/TestQJMWithFaults.java | 6 ++--
.../hdfs/qjournal/client/TestQuorumCall.java | 6 ++--
.../qjournal/client/TestQuorumJournalManager.java | 2 +-
.../client/TestQuorumJournalManagerUnit.java | 10 +++---
.../client/TestSegmentRecoveryComparator.java | 2 +-
.../hadoop/hdfs/qjournal/server/TestJournal.java | 2 +-
.../hdfs/qjournal/server/TestJournalNode.java | 6 ++--
.../hdfs/qjournal/server/TestJournalNodeSync.java | 2 +-
.../qjournal/server/TestJournaledEditsCache.java | 2 +-
.../blockmanagement/BlockManagerTestUtil.java | 2 +-
.../server/blockmanagement/TestBlockManager.java | 8 ++---
.../TestBlockReportRateLimiting.java | 4 +--
.../TestPendingDataNodeMessages.java | 2 +-
.../blockmanagement/TestRBWBlockInvalidation.java | 2 +-
.../blockmanagement/TestSlowDiskTracker.java | 4 +--
.../impl/TestInMemoryLevelDBAliasMapClient.java | 4 +--
.../impl/TestLevelDbMockAliasMapClient.java | 2 +-
.../hdfs/server/datanode/FsDatasetTestUtils.java | 2 +-
.../server/datanode/InternalDataNodeTestUtils.java | 2 +-
.../hdfs/server/datanode/SimulatedFSDataset.java | 2 +-
.../hdfs/server/datanode/TestBPOfferService.java | 4 +--
.../hdfs/server/datanode/TestBlockRecovery.java | 2 +-
.../datanode/TestDataNodeHotSwapVolumes.java | 4 +--
.../hdfs/server/datanode/TestDataNodeMetrics.java | 2 +-
.../hdfs/server/datanode/TestDatanodeRegister.java | 2 +-
.../server/datanode/TestReadOnlySharedStorage.java | 2 +-
.../hdfs/server/datanode/TestRefreshNamenodes.java | 4 +--
.../datanode/checker/TestDatasetVolumeChecker.java | 4 +--
.../checker/TestThrottledAsyncChecker.java | 2 +-
.../checker/TestThrottledAsyncCheckerTimeout.java | 8 ++---
.../fsdataset/impl/FsDatasetImplTestUtils.java | 2 +-
.../fsdataset/impl/LazyPersistTestCase.java | 2 +-
.../impl/TestCacheByPmemMappableBlockLoader.java | 2 +-
.../fsdataset/impl/TestFsDatasetCache.java | 2 +-
.../datanode/fsdataset/impl/TestFsDatasetImpl.java | 2 +-
.../fsdataset/impl/TestPmemCacheRecovery.java | 2 +-
.../fsdataset/impl/TestScrLazyPersistFiles.java | 2 +-
.../datanode/metrics/TestSlowNodeDetector.java | 6 ++--
.../web/webhdfs/TestDataNodeUGIProvider.java | 2 +-
.../server/diskbalancer/DiskBalancerTestUtil.java | 2 +-
.../hdfs/server/diskbalancer/TestDiskBalancer.java | 2 +-
.../TestDiskBalancerWithMockMover.java | 2 +-
.../command/TestDiskBalancerCommand.java | 2 +-
.../apache/hadoop/hdfs/server/mover/TestMover.java | 2 +-
.../hadoop/hdfs/server/mover/TestStorageMover.java | 4 +--
.../hadoop/hdfs/server/namenode/FSAclBaseTest.java | 4 +--
.../hdfs/server/namenode/FSImageTestUtil.java | 14 ++++----
.../hdfs/server/namenode/FSXAttrBaseTest.java | 4 +--
.../server/namenode/NNThroughputBenchmark.java | 2 +-
.../hdfs/server/namenode/TestAclConfigFlag.java | 2 +-
.../server/namenode/TestAclTransformation.java | 4 +--
.../hdfs/server/namenode/TestAuditLogAtDebug.java | 2 +-
.../hdfs/server/namenode/TestAuditLogger.java | 2 +-
.../hdfs/server/namenode/TestBackupNode.java | 6 ++--
.../hdfs/server/namenode/TestCheckpoint.java | 10 +++---
.../hadoop/hdfs/server/namenode/TestEditLog.java | 4 +--
.../hdfs/server/namenode/TestFSDirectory.java | 4 +--
.../hdfs/server/namenode/TestFSEditLogLoader.java | 4 +--
.../hadoop/hdfs/server/namenode/TestFSImage.java | 2 +-
.../hdfs/server/namenode/TestFSImageWithAcl.java | 2 +-
.../server/namenode/TestFileJournalManager.java | 4 +--
.../hadoop/hdfs/server/namenode/TestFsck.java | 2 +-
.../namenode/TestINodeAttributeProvider.java | 4 +--
.../hadoop/hdfs/server/namenode/TestINodeFile.java | 2 +-
.../hdfs/server/namenode/TestLeaseManager.java | 2 +-
.../namenode/TestNNStorageRetentionFunctional.java | 2 +-
.../namenode/TestNNStorageRetentionManager.java | 8 ++---
.../hdfs/server/namenode/TestNameEditsConfigs.java | 4 +--
.../hdfs/server/namenode/TestNameNodeMXBean.java | 2 +-
.../hdfs/server/namenode/TestNameNodeRecovery.java | 2 +-
.../server/namenode/TestProtectedDirectories.java | 6 ++--
.../namenode/TestSecondaryNameNodeUpgrade.java | 2 +-
.../namenode/TestStartupProgressServlet.java | 2 +-
.../hdfs/server/namenode/TestStorageRestore.java | 2 +-
.../hdfs/server/namenode/TestTransferFsImage.java | 2 +-
.../hadoop/hdfs/server/namenode/ha/HATestUtil.java | 2 +-
.../server/namenode/ha/TestBootstrapStandby.java | 2 +-
.../namenode/ha/TestBootstrapStandbyWithQJM.java | 2 +-
.../server/namenode/ha/TestDFSUpgradeWithHA.java | 2 +-
.../hdfs/server/namenode/ha/TestDNFencing.java | 2 +-
.../namenode/ha/TestDelegationTokensWithHA.java | 2 +-
.../namenode/ha/TestEditLogsDuringFailover.java | 4 +--
.../server/namenode/ha/TestFailureOfSharedDir.java | 2 +-
.../server/namenode/ha/TestFailureToReadEdits.java | 2 +-
.../server/namenode/ha/TestHAConfiguration.java | 2 +-
.../hdfs/server/namenode/ha/TestHASafeMode.java | 2 +-
.../server/namenode/ha/TestHAStateTransitions.java | 2 +-
.../namenode/ha/TestObserverReadProxyProvider.java | 2 +-
.../server/namenode/ha/TestStandbyCheckpoints.java | 6 ++--
.../namenode/ha/TestStandbyInProgressTail.java | 4 +--
.../namenode/metrics/TestNameNodeMetrics.java | 2 +-
.../namenode/snapshot/TestAclWithSnapshot.java | 2 +-
.../snapshot/TestFileWithSnapshotFeature.java | 2 +-
.../hdfs/shortcircuit/TestShortCircuitCache.java | 4 +--
.../org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 2 +-
.../hadoop/hdfs/tools/TestDFSAdminWithHA.java | 2 +-
.../apache/hadoop/hdfs/tools/TestDFSHAAdmin.java | 4 +--
.../hdfs/tools/TestDFSHAAdminMiniCluster.java | 6 ++--
.../org/apache/hadoop/hdfs/tools/TestGetConf.java | 2 +-
...stViewFileSystemOverloadSchemeWithDFSAdmin.java | 2 +-
...ViewFileSystemOverloadSchemeWithFSCommands.java | 2 +-
.../offlineEditsViewer/TestOfflineEditsViewer.java | 2 +-
.../offlineImageViewer/TestOfflineImageViewer.java | 6 ++--
.../TestOfflineImageViewerForAcl.java | 4 +--
.../hdfs/util/TestAtomicFileOutputStream.java | 2 +-
.../hadoop/hdfs/util/TestStripedBlockUtil.java | 2 +-
.../org/apache/hadoop/hdfs/web/TestJsonUtil.java | 2 +-
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 2 +-
.../java/org/apache/hadoop/tools/TestTools.java | 4 +--
.../hadoop/mapred/LocalContainerLauncher.java | 4 +--
.../hadoop/mapred/TaskAttemptListenerImpl.java | 2 +-
.../java/org/apache/hadoop/mapred/YarnChild.java | 2 +-
.../jobhistory/JobHistoryEventHandler.java | 2 +-
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 2 +-
.../mapreduce/v2/app/TaskHeartbeatHandler.java | 2 +-
.../v2/app/commit/CommitterEventHandler.java | 2 +-
.../hadoop/mapreduce/v2/app/job/impl/JobImpl.java | 4 +--
.../mapreduce/v2/app/job/impl/TaskAttemptImpl.java | 4 +--
.../hadoop/mapreduce/v2/app/job/impl/TaskImpl.java | 2 +-
.../v2/app/launcher/ContainerLauncherImpl.java | 2 +-
.../hadoop/mapreduce/v2/app/rm/RMCommunicator.java | 2 +-
.../mapreduce/v2/app/rm/RMContainerAllocator.java | 2 +-
.../mapreduce/v2/app/rm/RMContainerRequestor.java | 2 +-
.../v2/app/speculate/DefaultSpeculator.java | 2 +-
.../mapreduce/v2/app/webapp/AMWebServices.java | 2 +-
.../mapreduce/v2/app/webapp/AppController.java | 2 +-
.../hadoop/mapreduce/v2/app/MockAppContext.java | 2 +-
.../apache/hadoop/mapreduce/v2/app/MockJobs.java | 6 ++--
.../mapreduce/v2/app/job/impl/TestTaskAttempt.java | 4 +--
.../mapreduce/v2/app/webapp/TestAMWebApp.java | 2 +-
.../mapreduce/v2/app/webapp/TestAMWebServices.java | 2 +-
.../mapred/LocalDistributedCacheManager.java | 4 +--
.../org/apache/hadoop/mapred/LocalJobRunner.java | 2 +-
.../apache/hadoop/mapreduce/v2/util/MRApps.java | 2 +-
.../hadoop/mapreduce/v2/util/MRWebAppUtil.java | 4 +--
.../v2/jobhistory/TestJobHistoryUtils.java | 2 +-
.../java/org/apache/hadoop/mapred/Counters.java | 2 +-
.../org/apache/hadoop/mapred/FileInputFormat.java | 2 +-
.../java/org/apache/hadoop/mapred/JobConf.java | 2 +-
.../org/apache/hadoop/mapred/JobQueueClient.java | 2 +-
.../hadoop/mapred/LocatedFileStatusFetcher.java | 16 +++++-----
.../main/java/org/apache/hadoop/mapred/Task.java | 2 +-
.../java/org/apache/hadoop/mapred/TaskLog.java | 2 +-
.../org/apache/hadoop/mapred/TextInputFormat.java | 2 +-
.../java/org/apache/hadoop/mapreduce/Cluster.java | 2 +-
.../main/java/org/apache/hadoop/mapreduce/Job.java | 2 +-
.../hadoop/mapreduce/JobResourceUploader.java | 2 +-
.../hadoop/mapreduce/JobSubmissionFiles.java | 2 +-
.../org/apache/hadoop/mapreduce/JobSubmitter.java | 2 +-
.../hadoop/mapreduce/counters/AbstractCounter.java | 2 +-
.../mapreduce/counters/AbstractCounterGroup.java | 2 +-
.../mapreduce/counters/AbstractCounters.java | 6 ++--
.../mapreduce/counters/CounterGroupFactory.java | 4 +--
.../mapreduce/counters/FileSystemCounterGroup.java | 10 +++---
.../mapreduce/counters/FrameworkCounterGroup.java | 6 ++--
.../hadoop/mapreduce/jobhistory/EventWriter.java | 2 +-
.../jobhistory/JobUnsuccessfulCompletionEvent.java | 2 +-
.../lib/input/CombineFileInputFormat.java | 6 ++--
.../mapreduce/lib/input/FileInputFormat.java | 2 +-
.../mapreduce/lib/input/TextInputFormat.java | 2 +-
.../mapreduce/lib/output/FileOutputCommitter.java | 4 +--
.../mapreduce/lib/output/FileOutputFormat.java | 2 +-
.../lib/output/NamedCommitterFactory.java | 2 +-
.../lib/output/PartialFileOutputCommitter.java | 2 +-
.../mapreduce/lib/output/PathOutputCommitter.java | 2 +-
.../mapreduce/security/SecureShuffleUtils.java | 2 +-
.../hadoop/mapreduce/task/reduce/Fetcher.java | 2 +-
.../mapreduce/task/reduce/MergeManagerImpl.java | 2 +-
.../mapreduce/task/reduce/OnDiskMapOutput.java | 2 +-
.../task/reduce/ShuffleClientMetrics.java | 2 +-
.../task/reduce/ShuffleSchedulerImpl.java | 2 +-
.../org/apache/hadoop/mapreduce/tools/CLI.java | 4 +--
.../hadoop/mapreduce/util/CountersStrings.java | 2 +-
.../apache/hadoop/mapred/TestFileInputFormat.java | 2 +-
.../mapreduce/lib/input/TestFileInputFormat.java | 4 +--
.../mapreduce/v2/hs/CachedHistoryStorage.java | 14 ++++----
.../mapreduce/v2/hs/HistoryClientService.java | 2 +-
.../hadoop/mapreduce/v2/hs/HistoryFileManager.java | 4 +--
.../apache/hadoop/mapreduce/v2/hs/JobHistory.java | 4 +--
.../hadoop/mapreduce/v2/hs/JobHistoryServer.java | 2 +-
.../mapreduce/v2/hs/server/HSAdminServer.java | 2 +-
.../mapreduce/v2/hs/webapp/HsWebServices.java | 2 +-
.../hadoop/mapreduce/v2/hs/webapp/dao/JobInfo.java | 2 +-
.../hadoop/mapreduce/v2/hs/MockHistoryJobs.java | 2 +-
.../hadoop/mapreduce/v2/hs/TestJobHistory.java | 2 +-
.../v2/hs/webapp/TestHsWebServicesLogs.java | 2 +-
.../hadoop/mapred/ClientServiceDelegate.java | 2 +-
.../apache/hadoop/mapred/ResourceMgrDelegate.java | 2 +-
.../java/org/apache/hadoop/mapred/YARNRunner.java | 2 +-
.../hadoop/mapred/TestMRTimelineEventHandling.java | 2 +-
.../org/apache/hadoop/mapred/TestYARNRunner.java | 4 +--
.../lib/input/TestCombineFileInputFormat.java | 2 +-
.../NativeMapOutputCollectorDelegator.java | 2 +-
.../hadoop/mapred/nativetask/NativeRuntime.java | 2 +-
.../nativetask/buffer/ByteBufferDataWriter.java | 2 +-
.../hadoop/mapred/nativetask/util/BytesUtil.java | 4 +--
.../hadoop/mapred/nativetask/util/ConfigUtil.java | 2 +-
.../mapred/nativetask/util/ReadWriteBuffer.java | 2 +-
.../hadoop/mapred/nativetask/kvtest/KVJob.java | 2 +-
.../hadoop/mapred/nativetask/kvtest/KVTest.java | 4 +--
.../mapred/nativetask/testutil/BytesFactory.java | 6 ++--
.../mapred/nativetask/utils/TestBytesUtil.java | 4 +--
.../apache/hadoop/mapred/FadvisedChunkedFile.java | 2 +-
.../apache/hadoop/mapred/FadvisedFileRegion.java | 2 +-
.../org/apache/hadoop/mapred/ShuffleHandler.java | 14 ++++----
.../hadoop/mapred/uploader/FrameworkUploader.java | 2 +-
.../mapred/uploader/TestFrameworkUploader.java | 2 +-
.../hadoop-mapreduce-client/pom.xml | 4 +--
.../hadoop-mapreduce-examples/pom.xml | 4 +--
.../hadoop/examples/BaileyBorweinPlouffe.java | 2 +-
.../java/org/apache/hadoop/examples/WordMean.java | 2 +-
.../org/apache/hadoop/examples/WordMedian.java | 2 +-
.../hadoop/examples/WordStandardDeviation.java | 2 +-
.../examples/dancing/DistributedPentomino.java | 2 +-
.../org/apache/hadoop/examples/dancing/Sudoku.java | 2 +-
.../java/org/apache/hadoop/examples/pi/Parser.java | 2 +-
.../java/org/apache/hadoop/examples/pi/Util.java | 2 +-
.../hadoop/examples/terasort/TeraScheduler.java | 2 +-
hadoop-maven-plugins/pom.xml | 4 +++
.../maven/plugin/resourcegz/ResourceGzMojo.java | 2 +-
hadoop-project/pom.xml | 37 ++++++++++++++++++++--
.../fs/aliyun/oss/AliyunOSSBlockOutputStream.java | 8 ++---
.../hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java | 4 +--
.../hadoop/fs/aliyun/oss/AliyunOSSInputStream.java | 2 +-
.../hadoop/fs/aliyun/oss/AliyunOSSUtils.java | 2 +-
hadoop-tools/hadoop-archive-logs/pom.xml | 4 +--
.../org/apache/hadoop/tools/HadoopArchiveLogs.java | 2 +-
.../hadoop/tools/HadoopArchiveLogsRunner.java | 2 +-
.../org/apache/hadoop/tools/HadoopArchives.java | 2 +-
.../apache/hadoop/fs/s3a/AWSClientIOException.java | 2 +-
.../hadoop/fs/s3a/AWSCredentialProviderList.java | 4 +--
.../hadoop/fs/s3a/FailureInjectionPolicy.java | 2 +-
.../hadoop/fs/s3a/InconsistentAmazonS3Client.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/Invoker.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/Listing.java | 4 +--
.../apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 10 +++---
.../org/apache/hadoop/fs/s3a/S3ADataBlocks.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 6 ++--
.../org/apache/hadoop/fs/s3a/S3AInputStream.java | 4 +--
.../apache/hadoop/fs/s3a/S3AInstrumentation.java | 2 +-
.../apache/hadoop/fs/s3a/S3ALocatedFileStatus.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AOpContext.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AReadOpContext.java | 4 +--
.../org/apache/hadoop/fs/s3a/S3ARetryPolicy.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 6 ++--
.../fs/s3a/SimpleAWSCredentialsProvider.java | 2 +-
.../apache/hadoop/fs/s3a/WriteOperationHelper.java | 6 ++--
.../auth/AbstractSessionCredentialsProvider.java | 2 +-
.../fs/s3a/auth/AssumedRoleCredentialProvider.java | 4 +--
.../fs/s3a/auth/MarshalledCredentialBinding.java | 2 +-
.../fs/s3a/auth/MarshalledCredentialProvider.java | 2 +-
.../hadoop/fs/s3a/auth/MarshalledCredentials.java | 2 +-
.../org/apache/hadoop/fs/s3a/auth/RoleModel.java | 2 +-
.../apache/hadoop/fs/s3a/auth/RolePolicies.java | 2 +-
.../hadoop/fs/s3a/auth/STSClientFactory.java | 2 +-
.../fs/s3a/auth/delegation/AbstractDTService.java | 2 +-
.../delegation/FullCredentialsTokenBinding.java | 2 +-
.../fs/s3a/auth/delegation/RoleTokenBinding.java | 4 +--
.../s3a/auth/delegation/S3ADelegationTokens.java | 6 ++--
.../s3a/auth/delegation/SessionTokenBinding.java | 2 +-
.../hadoop/fs/s3a/commit/AbstractS3ACommitter.java | 6 ++--
.../hadoop/fs/s3a/commit/CommitOperations.java | 2 +-
.../hadoop/fs/s3a/commit/MagicCommitPaths.java | 2 +-
.../fs/s3a/commit/files/SinglePendingCommit.java | 2 +-
.../fs/s3a/commit/magic/MagicCommitTracker.java | 2 +-
.../apache/hadoop/fs/s3a/commit/staging/Paths.java | 12 +++----
.../fs/s3a/commit/staging/StagingCommitter.java | 2 +-
.../hadoop/fs/s3a/impl/AbstractStoreOperation.java | 2 +-
.../hadoop/fs/s3a/impl/ChangeDetectionPolicy.java | 2 +-
.../apache/hadoop/fs/s3a/impl/ChangeTracker.java | 4 +--
.../apache/hadoop/fs/s3a/impl/DeleteOperation.java | 4 +--
.../fs/s3a/impl/ExecutingStoreOperation.java | 2 +-
.../hadoop/fs/s3a/impl/InternalConstants.java | 2 +-
.../fs/s3a/impl/MultiObjectDeleteSupport.java | 4 +--
.../apache/hadoop/fs/s3a/impl/RenameOperation.java | 4 +--
.../hadoop/fs/s3a/impl/S3AMultipartUploader.java | 6 ++--
.../apache/hadoop/fs/s3a/impl/StoreContext.java | 2 +-
.../hadoop/fs/s3a/impl/StoreContextBuilder.java | 2 +-
.../s3a/s3guard/AuthoritativeAuditOperation.java | 2 +-
.../hadoop/fs/s3a/s3guard/DescendantsIterator.java | 2 +-
.../hadoop/fs/s3a/s3guard/DirListingMetadata.java | 2 +-
.../fs/s3a/s3guard/DumpS3GuardDynamoTable.java | 4 +--
.../fs/s3a/s3guard/DynamoDBClientFactory.java | 2 +-
.../fs/s3a/s3guard/DynamoDBMetadataStore.java | 8 ++---
.../s3guard/DynamoDBMetadataStoreTableManager.java | 4 +--
.../hadoop/fs/s3a/s3guard/ImportOperation.java | 2 +-
.../hadoop/fs/s3a/s3guard/LocalMetadataStore.java | 8 ++---
.../hadoop/fs/s3a/s3guard/MetadataStore.java | 2 +-
.../s3guard/MetadataStoreListFilesIterator.java | 2 +-
.../apache/hadoop/fs/s3a/s3guard/PathMetadata.java | 2 +-
.../s3guard/PathMetadataDynamoDBTranslation.java | 4 +--
.../fs/s3a/s3guard/ProgressiveRenameTracker.java | 2 +-
.../fs/s3a/s3guard/PurgeS3GuardDynamoTable.java | 2 +-
.../hadoop/fs/s3a/s3guard/RenameTracker.java | 2 +-
.../org/apache/hadoop/fs/s3a/s3guard/S3Guard.java | 4 +--
.../apache/hadoop/fs/s3a/s3guard/S3GuardFsck.java | 2 +-
.../hadoop/fs/s3a/s3guard/S3GuardTableAccess.java | 2 +-
.../apache/hadoop/fs/s3a/s3guard/S3GuardTool.java | 4 +--
.../apache/hadoop/fs/s3a/select/SelectBinding.java | 4 +--
.../hadoop/fs/s3a/select/SelectInputStream.java | 4 +--
.../org/apache/hadoop/fs/s3a/tools/MarkerTool.java | 4 +--
.../apache/hadoop/fs/s3native/S3xLoginHelper.java | 4 +--
.../fs/contract/s3a/ITestS3AContractSeek.java | 2 +-
.../ITestBlockingThreadPoolExecutorService.java | 2 +-
.../hadoop/fs/s3a/ITestS3AFailureHandling.java | 2 +-
.../hadoop/fs/s3a/ITestS3ARemoteFileChanged.java | 2 +-
.../hadoop/fs/s3a/ITestS3GuardListConsistency.java | 2 +-
.../apache/hadoop/fs/s3a/MockS3AFileSystem.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 2 +-
.../hadoop/fs/s3a/StorageStatisticsTracker.java | 2 +-
.../fs/s3a/TestS3AAWSCredentialsProvider.java | 2 +-
.../delegation/ILoadTestSessionCredentials.java | 2 +-
.../delegation/MiniKerberizedHadoopCluster.java | 2 +-
.../fs/s3a/commit/AbstractYarnClusterITest.java | 2 +-
.../fs/s3a/commit/ITestCommitOperations.java | 2 +-
.../hadoop/fs/s3a/commit/TestMagicCommitPaths.java | 2 +-
.../org/apache/hadoop/fs/s3a/commit/TestTasks.java | 2 +-
.../commit/integration/ITestS3ACommitterMRJob.java | 2 +-
.../fs/s3a/commit/staging/StagingTestBase.java | 4 +--
.../staging/TestDirectoryCommitterScale.java | 2 +-
.../s3a/commit/staging/TestStagingCommitter.java | 2 +-
.../staging/TestStagingPartitionedFileListing.java | 2 +-
.../staging/TestStagingPartitionedTaskCommit.java | 4 +--
.../fs/s3a/impl/ITestPartialRenamesDeletes.java | 4 +--
.../fs/s3a/impl/TestPartialDeleteFailures.java | 2 +-
.../s3a/s3guard/AbstractS3GuardToolTestBase.java | 2 +-
.../fs/s3a/s3guard/ITestDynamoDBMetadataStore.java | 4 +--
.../s3guard/ITestDynamoDBMetadataStoreScale.java | 2 +-
.../s3a/s3guard/ITestS3GuardDDBRootOperations.java | 2 +-
.../fs/s3a/s3guard/MetadataStoreTestBase.java | 2 +-
.../fs/s3a/s3guard/TestLocalMetadataStore.java | 6 ++--
.../TestPathMetadataDynamoDBTranslation.java | 2 +-
.../fs/s3a/s3guard/TestPathOrderComparators.java | 2 +-
.../scale/ILoadTestS3ABulkDeleteThrottling.java | 4 +--
.../org/apache/hadoop/fs/s3a/select/CsvFile.java | 2 +-
.../hadoop/fs/s3a/select/ITestS3SelectCLI.java | 2 +-
.../org/apache/hadoop/fs/adl/AdlFileSystem.java | 4 +--
hadoop-tools/hadoop-azure/pom.xml | 4 +--
.../azure/AzureFileSystemThreadPoolExecutor.java | 2 +-
.../fs/azure/AzureNativeFileSystemStore.java | 2 +-
.../hadoop/fs/azure/BlockBlobAppendStream.java | 4 +--
.../apache/hadoop/fs/azure/CachingAuthorizer.java | 4 +--
.../hadoop/fs/azure/ClientThrottlingAnalyzer.java | 4 +--
.../hadoop/fs/azure/NativeAzureFileSystem.java | 4 +--
.../fs/azure/NativeAzureFileSystemHelper.java | 2 +-
.../hadoop/fs/azure/NativeFileSystemStore.java | 2 +-
.../hadoop/fs/azure/PageBlobOutputStream.java | 2 +-
.../hadoop/fs/azure/RemoteWasbAuthorizerImpl.java | 2 +-
.../apache/hadoop/fs/azure/SelfRenewingLease.java | 2 +-
.../java/org/apache/hadoop/fs/azure/WasbFsck.java | 2 +-
.../hadoop/fs/azure/WasbRemoteCallHelper.java | 2 +-
.../hadoop/fs/azurebfs/AbfsConfiguration.java | 4 +--
.../hadoop/fs/azurebfs/AbfsCountersImpl.java | 2 +-
.../hadoop/fs/azurebfs/AzureBlobFileSystem.java | 4 +--
.../fs/azurebfs/AzureBlobFileSystemStore.java | 6 ++--
.../fs/azurebfs/oauth2/AzureADAuthenticator.java | 2 +-
.../azurebfs/oauth2/ClientCredsTokenProvider.java | 2 +-
.../oauth2/CustomTokenProviderAdapter.java | 2 +-
.../fs/azurebfs/oauth2/IdentityTransformer.java | 2 +-
.../oauth2/RefreshTokenBasedTokenProvider.java | 2 +-
.../azurebfs/oauth2/UserPasswordTokenProvider.java | 2 +-
.../security/AbfsDelegationTokenManager.java | 4 +--
.../hadoop/fs/azurebfs/services/AbfsClient.java | 4 +--
.../services/AbfsClientThrottlingAnalyzer.java | 4 +--
.../hadoop/fs/azurebfs/services/AbfsCounters.java | 2 +-
.../fs/azurebfs/services/AbfsInputStream.java | 4 +--
.../fs/azurebfs/services/AbfsOutputStream.java | 4 +--
.../fs/azurebfs/services/AbfsRestOperation.java | 2 +-
.../azurebfs/services/ExponentialRetryPolicy.java | 2 +-
.../fs/azurebfs/services/ReadBufferManager.java | 2 +-
.../hadoop/fs/azurebfs/utils/CachedSASToken.java | 2 +-
.../utils/TextFileBasedIdentityHandler.java | 4 +--
.../TestNativeAzureFileSystemAuthorization.java | 2 +-
.../fs/azurebfs/ITestAbfsIdentityTransformer.java | 2 +-
.../ITestAzureBlobFileSystemCheckAccess.java | 4 +--
.../fs/azurebfs/ITestAzureBlobFilesystemAcl.java | 2 +-
.../extensions/ClassicDelegationTokenManager.java | 2 +-
.../extensions/StubAbfsTokenIdentifier.java | 2 +-
.../java/org/apache/hadoop/tools/CopyListing.java | 2 +-
.../apache/hadoop/tools/CopyListingFileStatus.java | 6 ++--
.../main/java/org/apache/hadoop/tools/DistCp.java | 4 +--
.../org/apache/hadoop/tools/DistCpOptions.java | 4 +--
.../org/apache/hadoop/tools/OptionsParser.java | 2 +-
.../org/apache/hadoop/tools/RegexCopyFilter.java | 2 +-
.../org/apache/hadoop/tools/SimpleCopyListing.java | 4 +--
.../hadoop/tools/mapred/DeletedDirTracker.java | 6 ++--
.../tools/mapred/RetriableFileCopyCommand.java | 2 +-
.../org/apache/hadoop/tools/util/DistCpUtils.java | 2 +-
.../hadoop/tools/TestDistCpWithRawXAttrs.java | 2 +-
.../apache/hadoop/tools/TestDistCpWithXAttrs.java | 2 +-
.../apache/hadoop/tools/util/TestDistCpUtils.java | 2 +-
.../hadoop-dynamometer-infra/pom.xml | 4 +--
.../apache/hadoop/tools/dynamometer/AMOptions.java | 2 +-
.../tools/dynamometer/ApplicationMaster.java | 6 ++--
.../apache/hadoop/tools/dynamometer/Client.java | 10 +++---
.../hadoop/tools/dynamometer/DynoInfraUtils.java | 2 +-
.../tools/dynamometer/TestDynamometerInfra.java | 2 +-
.../workloadgenerator/CreateFileMapper.java | 2 +-
.../audit/AuditLogDirectParser.java | 2 +-
.../workloadgenerator/audit/AuditReplayMapper.java | 2 +-
.../workloadgenerator/audit/AuditReplayThread.java | 2 +-
.../hadoop/hdfs/server/namenode/ImageWriter.java | 2 +-
.../hadoop/hdfs/server/namenode/TreePath.java | 2 +-
.../TotalHeapUsageEmulatorPlugin.java | 2 +-
.../org/apache/hadoop/metrics2/sink/KafkaSink.java | 2 +-
.../hadoop/metrics2/impl/TestKafkaMetrics.java | 2 +-
.../hadoop/yarn/sls/appmaster/DAGAMSimulator.java | 2 +-
.../hadoop/yarn/sls/nodemanager/NMSimulator.java | 2 +-
.../yarn/sls/scheduler/FairSchedulerMetrics.java | 2 +-
.../hadoop-yarn/hadoop-yarn-api/pom.xml | 4 +--
.../yarn/api/records/ResourceInformation.java | 4 +--
.../org/apache/hadoop/yarn/api/records/URL.java | 2 +-
.../records/timeline/TimelineEntityGroupId.java | 2 +-
.../java/org/apache/hadoop/yarn/conf/HAUtil.java | 2 +-
.../util/constraint/PlacementConstraintParser.java | 2 +-
.../hadoop/yarn/util/csi/CsiConfigUtils.java | 2 +-
.../hadoop/yarn/util/resource/ResourceUtils.java | 2 +-
.../resource/TestPlacementConstraintParser.java | 2 +-
.../hadoop/yarn/conf/TestResourceInformation.java | 4 +--
.../pom.xml | 4 +--
.../distributedshell/ApplicationMaster.java | 4 +--
.../yarn/applications/distributedshell/Client.java | 4 +--
.../TestDSWithMultipleNodeManager.java | 2 +-
.../hadoop-yarn-services-api/pom.xml | 4 +--
.../yarn/service/client/ApiServiceClient.java | 4 +--
.../service/client/SystemServiceManagerImpl.java | 2 +-
.../hadoop/yarn/service/webapp/ApiServer.java | 6 ++--
.../apache/hadoop/yarn/service/TestApiServer.java | 2 +-
.../yarn/service/client/TestApiServiceClient.java | 2 +-
.../hadoop-yarn-services-core/pom.xml | 4 +--
.../apache/hadoop/yarn/service/ServiceContext.java | 4 +--
.../apache/hadoop/yarn/service/ServiceManager.java | 4 +--
.../apache/hadoop/yarn/service/ServiceMaster.java | 2 +-
.../hadoop/yarn/service/ServiceScheduler.java | 6 ++--
.../service/api/records/ResourceInformation.java | 4 +--
.../hadoop/yarn/service/client/ServiceClient.java | 2 +-
.../hadoop/yarn/service/component/Component.java | 4 +--
.../yarn/service/component/ComponentEvent.java | 2 +-
.../component/instance/ComponentInstance.java | 2 +-
.../component/instance/ComponentInstanceEvent.java | 2 +-
.../service/containerlaunch/AbstractLauncher.java | 4 +--
.../containerlaunch/CommandLineBuilder.java | 2 +-
.../containerlaunch/ContainerLaunchService.java | 2 +-
.../containerlaunch/JavaCommandLineBuilder.java | 2 +-
.../yarn/service/provider/ProviderService.java | 2 +-
.../defaultImpl/DefaultClientProvider.java | 2 +-
.../registry/YarnRegistryViewForProviders.java | 2 +-
.../yarn/service/utils/ClientRegistryBinder.java | 2 +-
.../hadoop/yarn/service/utils/ConfigHelper.java | 2 +-
.../hadoop/yarn/service/utils/CoreFileSystem.java | 2 +-
.../utils/PublishedConfigurationOutputter.java | 4 +--
.../hadoop/yarn/service/utils/ServiceApiUtil.java | 10 +++---
.../hadoop/yarn/service/utils/ServiceUtils.java | 2 +-
.../hadoop/yarn/service/utils/ZookeeperUtils.java | 2 +-
.../yarn/service/MockRunningServiceContext.java | 2 +-
.../apache/hadoop/yarn/service/MockServiceAM.java | 2 +-
.../hadoop/yarn/service/ServiceTestUtils.java | 6 ++--
.../TestDefaultUpgradeComponentsFinder.java | 2 +-
.../apache/hadoop/yarn/service/TestServiceAM.java | 2 +-
.../yarn/service/TestYarnNativeServices.java | 4 +--
.../yarn/service/client/TestServiceClient.java | 2 +-
.../component/instance/TestComponentInstance.java | 2 +-
.../provider/TestAbstractProviderService.java | 2 +-
.../hadoop/yarn/service/utils/TestFilterUtils.java | 2 +-
.../hadoop-yarn/hadoop-yarn-client/pom.xml | 4 +--
.../apache/hadoop/yarn/client/api/AMRMClient.java | 6 ++--
.../hadoop/yarn/client/api/NMTokenCache.java | 2 +-
.../yarn/client/api/async/AMRMClientAsync.java | 4 +--
.../yarn/client/api/async/NMClientAsync.java | 2 +-
.../client/api/async/impl/AMRMClientAsyncImpl.java | 2 +-
.../client/api/async/impl/NMClientAsyncImpl.java | 4 +--
.../yarn/client/api/impl/AHSv2ClientImpl.java | 2 +-
.../yarn/client/api/impl/AMRMClientImpl.java | 6 ++--
.../api/impl/ContainerManagementProtocolProxy.java | 2 +-
.../hadoop/yarn/client/api/impl/NMClientImpl.java | 2 +-
.../client/api/impl/SharedCacheClientImpl.java | 2 +-
.../yarn/client/api/impl/YarnClientImpl.java | 2 +-
.../hadoop/yarn/client/cli/ApplicationCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/ClusterCLI.java | 2 +-
.../org/apache/hadoop/yarn/client/cli/LogsCLI.java | 2 +-
.../hadoop/yarn/client/cli/NodeAttributesCLI.java | 4 +--
.../apache/hadoop/yarn/client/cli/QueueCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/RMAdminCLI.java | 4 +--
.../hadoop/yarn/client/cli/SchedConfCLI.java | 2 +-
.../org/apache/hadoop/yarn/client/cli/TopCLI.java | 6 ++--
.../hadoop/yarn/client/util/YarnClientUtils.java | 4 +--
.../hadoop/yarn/client/cli/TestClusterCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/TestLogsCLI.java | 2 +-
.../yarn/client/cli/TestNodeAttributesCLI.java | 10 +++---
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 +--
.../apache/hadoop/yarn/client/cli/TestYarnCLI.java | 4 +--
.../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 +--
.../impl/pb/GetNodesToLabelsResponsePBImpl.java | 2 +-
.../impl/pb/GetPluginInfoRequestPBImpl.java | 2 +-
.../impl/pb/GetPluginInfoResponsePBImpl.java | 2 +-
.../impl/pb/NodePublishVolumeRequestPBImpl.java | 4 +--
.../impl/pb/NodePublishVolumeResponsePBImpl.java | 2 +-
.../impl/pb/NodeUnpublishVolumeRequestPBImpl.java | 2 +-
.../impl/pb/NodeUnpublishVolumeResponsePBImpl.java | 2 +-
.../ValidateVolumeCapabilitiesRequestPBImpl.java | 2 +-
.../ValidateVolumeCapabilitiesResponsePBImpl.java | 2 +-
.../impl/pb/ApplicationAttemptIdPBImpl.java | 2 +-
.../api/records/impl/pb/ApplicationIdPBImpl.java | 2 +-
.../api/records/impl/pb/ContainerIdPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/NodeIdPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/ProtoUtils.java | 4 +--
.../api/records/impl/pb/ReservationIdPBImpl.java | 2 +-
.../api/records/impl/pb/ResourceOptionPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/ResourcePBImpl.java | 4 +--
.../apache/hadoop/yarn/client/ClientRMProxy.java | 4 +--
.../org/apache/hadoop/yarn/client/RMProxy.java | 2 +-
.../org/apache/hadoop/yarn/client/ServerProxy.java | 2 +-
.../yarn/client/api/impl/TimelineClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineConnector.java | 6 ++--
.../client/api/impl/TimelineReaderClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineV2ClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineWriter.java | 2 +-
.../apache/hadoop/yarn/event/AsyncDispatcher.java | 2 +-
.../apache/hadoop/yarn/event/EventDispatcher.java | 2 +-
.../AggregatedLogDeletionService.java | 2 +-
.../yarn/logaggregation/AggregatedLogFormat.java | 6 ++--
.../yarn/logaggregation/LogAggregationUtils.java | 2 +-
.../hadoop/yarn/logaggregation/LogCLIHelpers.java | 2 +-
.../LogAggregationFileController.java | 2 +-
.../LogAggregationFileControllerFactory.java | 4 +--
.../ifile/LogAggregationIndexedFileController.java | 2 +-
.../yarn/nodelabels/CommonNodeLabelsManager.java | 4 +--
.../hadoop/yarn/nodelabels/NodeLabelUtil.java | 2 +-
.../nodelabels/store/op/NodeAttributeMirrorOp.java | 2 +-
.../nodelabels/store/op/RemoveClusterLabelOp.java | 2 +-
.../yarn/security/YarnAuthorizationProvider.java | 2 +-
.../client/YARNDelegationTokenIdentifier.java | 2 +-
.../impl/pb/ReplaceLabelsOnNodeRequestPBImpl.java | 2 +-
.../server/security/ApplicationACLsManager.java | 2 +-
.../apache/hadoop/yarn/util/AdHocLogDumper.java | 2 +-
.../apache/hadoop/yarn/util/BoundedAppender.java | 4 +--
.../org/apache/hadoop/yarn/util/FSDownload.java | 8 ++---
.../org/apache/hadoop/yarn/util/RackResolver.java | 4 +--
.../org/apache/hadoop/yarn/util/StringHelper.java | 4 +--
.../util/resource/DefaultResourceCalculator.java | 2 +-
.../hadoop/yarn/util/timeline/TimelineUtils.java | 2 +-
.../org/apache/hadoop/yarn/webapp/Controller.java | 2 +-
.../org/apache/hadoop/yarn/webapp/Dispatcher.java | 4 +--
.../apache/hadoop/yarn/webapp/ResponseInfo.java | 2 +-
.../java/org/apache/hadoop/yarn/webapp/Router.java | 10 +++---
.../java/org/apache/hadoop/yarn/webapp/WebApp.java | 6 ++--
.../org/apache/hadoop/yarn/webapp/WebApps.java | 2 +-
.../hadoop/yarn/webapp/hamlet/HamletGen.java | 2 +-
.../hadoop/yarn/webapp/hamlet/HamletImpl.java | 8 ++---
.../hadoop/yarn/webapp/hamlet2/HamletGen.java | 2 +-
.../hadoop/yarn/webapp/hamlet2/HamletImpl.java | 8 ++---
.../hadoop/yarn/webapp/view/DefaultPage.java | 2 +-
.../apache/hadoop/yarn/webapp/view/JQueryUI.java | 2 +-
.../hadoop/yarn/webapp/view/TwoColumnLayout.java | 2 +-
.../test/java/org/apache/hadoop/yarn/MockApps.java | 2 +-
.../hadoop/yarn/api/BasePBImplRecordsTest.java | 6 ++--
.../apache/hadoop/yarn/api/TestPBImplRecords.java | 2 +-
.../hadoop/yarn/nodelabels/NodeLabelTestBase.java | 4 +--
.../nodelabels/TestCommonNodeLabelsManager.java | 6 ++--
.../nodelabels/TestFileSystemNodeLabelsStore.java | 2 +-
.../hadoop/yarn/nodelabels/TestNodeLabelUtil.java | 2 +-
.../resourcetypes/ResourceTypesTestHelper.java | 2 +-
.../apache/hadoop/yarn/util/TestFSDownload.java | 6 ++--
.../CustomResourceTypesConfigurationProvider.java | 2 +-
.../yarn/util/resource/TestResourceCalculator.java | 2 +-
.../hadoop-yarn/hadoop-yarn-csi/pom.xml | 6 ++--
.../yarn/csi/adaptor/TestCsiAdaptorService.java | 4 +--
.../TestValidateVolumeCapabilityRequest.java | 4 +--
.../hadoop/yarn/csi/client/TestCsiClient.java | 2 +-
.../pom.xml | 4 +--
.../ApplicationHistoryClientService.java | 2 +-
.../ApplicationHistoryManagerImpl.java | 2 +-
.../ApplicationHistoryManagerOnTimelineStore.java | 2 +-
.../ApplicationHistoryServer.java | 2 +-
.../webapp/AHSWebServices.java | 2 +-
.../yarn/server/timeline/LeveldbTimelineStore.java | 4 +--
.../timeline/RollingLevelDBTimelineStore.java | 4 +--
.../yarn/server/timeline/TimelineDataManager.java | 2 +-
.../recovery/LeveldbTimelineStateStore.java | 2 +-
.../timeline/security/TimelineACLsManager.java | 2 +-
.../hadoop-yarn-server-common/pom.xml | 4 +--
.../yarn/server/AMHeartbeatRequestHandler.java | 4 +--
.../hadoop/yarn/server/AMRMClientRelayer.java | 2 +-
.../hadoop/yarn/server/api/ServerRMProxy.java | 2 +-
.../FederationRMFailoverProxyProvider.java | 4 +--
.../federation/policies/FederationPolicyUtils.java | 2 +-
.../federation/policies/RouterPolicyFacade.java | 2 +-
.../LocalityMulticastAMRMProxyPolicy.java | 4 +--
.../manager/PriorityBroadcastPolicyManager.java | 2 +-
.../manager/WeightedLocalityPolicyManager.java | 2 +-
.../metrics/FederationStateStoreClientMetrics.java | 2 +-
.../records/impl/pb/SubClusterInfoPBImpl.java | 2 +-
.../federation/utils/FederationRegistryClient.java | 2 +-
.../utils/FederationStateStoreFacade.java | 2 +-
.../server/metrics/AMRMClientRelayerMetrics.java | 2 +-
.../metrics/OpportunisticSchedulerMetrics.java | 2 +-
.../scheduler/OpportunisticContainerContext.java | 2 +-
.../TimelineAuthenticationFilterInitializer.java | 2 +-
.../yarn/server/uam/UnmanagedAMPoolManager.java | 2 +-
.../server/uam/UnmanagedApplicationManager.java | 4 +--
.../hadoop/yarn/server/utils/BuilderUtils.java | 2 +-
.../server/volume/csi/VolumeCapabilityRange.java | 2 +-
.../yarn/server/volume/csi/VolumeMetaData.java | 2 +-
.../hadoop/yarn/server/webapp/ContainerBlock.java | 2 +-
.../hadoop/yarn/server/webapp/LogServlet.java | 4 +--
.../hadoop/yarn/server/webapp/LogWebService.java | 4 +--
.../yarn/server/webapp/LogWebServiceUtils.java | 2 +-
.../yarn/server/MockResourceManagerFacade.java | 2 +-
.../api/protocolrecords/TestProtocolRecords.java | 2 +-
.../yarn/server/webapp/ContainerBlockTest.java | 2 +-
.../hadoop-yarn-server-nodemanager/pom.xml | 4 +--
.../yarn/server/nodemanager/ContainerExecutor.java | 2 +-
.../nodemanager/DefaultContainerExecutor.java | 2 +-
.../yarn/server/nodemanager/DeletionService.java | 2 +-
.../server/nodemanager/DirectoryCollection.java | 4 +--
.../server/nodemanager/LinuxContainerExecutor.java | 2 +-
.../nodemanager/LocalDirsHandlerService.java | 2 +-
.../yarn/server/nodemanager/NodeManager.java | 2 +-
.../server/nodemanager/NodeStatusUpdaterImpl.java | 2 +-
.../nodemanager/amrmproxy/AMRMProxyMetrics.java | 2 +-
.../nodemanager/amrmproxy/AMRMProxyService.java | 2 +-
.../amrmproxy/AMRMProxyTokenSecretManager.java | 2 +-
.../amrmproxy/AbstractRequestInterceptor.java | 2 +-
.../amrmproxy/DefaultRequestInterceptor.java | 4 +--
.../amrmproxy/FederationInterceptor.java | 4 +--
.../nodemanager/api/ResourceLocalizationSpec.java | 2 +-
.../nodemanager/containermanager/AuxServices.java | 4 +--
.../containermanager/ContainerManagerImpl.java | 2 +-
.../application/ApplicationImpl.java | 2 +-
.../containermanager/container/ContainerImpl.java | 2 +-
.../container/SlidingWindowRetryPolicy.java | 2 +-
.../launcher/ContainerCleanup.java | 2 +-
.../containermanager/launcher/ContainerLaunch.java | 2 +-
.../launcher/ContainersLauncher.java | 4 +--
.../resources/CGroupElasticMemoryController.java | 2 +-
.../resources/CGroupsBlkioResourceHandlerImpl.java | 2 +-
.../resources/CGroupsCpuResourceHandlerImpl.java | 2 +-
.../linux/resources/CGroupsHandlerImpl.java | 4 +--
.../CGroupsMemoryResourceHandlerImpl.java | 2 +-
.../linux/resources/CGroupsResourceCalculator.java | 2 +-
.../linux/resources/DefaultOOMHandler.java | 2 +-
.../resources/NetworkPacketTaggingHandlerImpl.java | 2 +-
.../resources/NetworkTagMappingJsonManager.java | 2 +-
.../linux/resources/ResourceHandlerChain.java | 2 +-
.../linux/resources/ResourceHandlerModule.java | 2 +-
.../resources/fpga/FpgaResourceAllocator.java | 4 +--
.../resources/fpga/FpgaResourceHandlerImpl.java | 2 +-
.../linux/resources/gpu/GpuResourceAllocator.java | 10 +++---
.../resources/numa/NumaResourceAllocation.java | 2 +-
.../resources/numa/NumaResourceAllocator.java | 4 +--
.../runtime/DelegatingLinuxContainerRuntime.java | 2 +-
.../linux/runtime/DockerLinuxContainerRuntime.java | 2 +-
.../linux/runtime/OCIContainerRuntime.java | 2 +-
.../linux/runtime/RuncContainerRuntime.java | 2 +-
.../linux/runtime/docker/DockerImagesCommand.java | 2 +-
.../runc/HdfsManifestToResourcesPlugin.java | 6 ++--
.../localizer/ContainerLocalizer.java | 6 ++--
.../localizer/LocalCacheDirectoryManager.java | 2 +-
.../localizer/LocalResourcesTrackerImpl.java | 2 +-
.../localizer/LocalizerContext.java | 2 +-
.../localizer/ResourceLocalizationService.java | 8 ++---
.../sharedcache/SharedCacheUploadService.java | 2 +-
.../localizer/sharedcache/SharedCacheUploader.java | 2 +-
.../logaggregation/AppLogAggregatorImpl.java | 4 +--
.../logaggregation/LogAggregationService.java | 4 +--
.../loghandler/NonAggregatingLogHandler.java | 2 +-
.../monitor/ContainersMonitorImpl.java | 4 +--
.../resourceplugin/ResourcePluginManager.java | 6 ++--
.../resourceplugin/com/nec/NECVEPlugin.java | 2 +-
.../resourceplugin/com/nec/VEDeviceDiscoverer.java | 2 +-
.../com/nvidia/NvidiaGPUPluginForRuntimeV2.java | 4 +--
.../deviceframework/DeviceMappingManager.java | 8 ++---
.../deviceframework/DevicePluginAdapter.java | 2 +-
.../deviceframework/DeviceResourceHandlerImpl.java | 2 +-
.../resourceplugin/fpga/FpgaDevice.java | 2 +-
.../resourceplugin/fpga/FpgaDiscoverer.java | 6 ++--
.../resourceplugin/fpga/IntelFpgaOpenclPlugin.java | 2 +-
.../resourceplugin/gpu/GpuDiscoverer.java | 8 ++---
.../gpu/NvidiaDockerV1CommandPlugin.java | 2 +-
.../gpu/NvidiaDockerV2CommandPlugin.java | 2 +-
.../scheduler/ContainerScheduler.java | 2 +-
.../volume/csi/ContainerVolumePublisher.java | 4 +--
.../health/NodeHealthCheckerService.java | 6 ++--
.../health/TimedHealthReporterService.java | 2 +-
.../nodemanager/metrics/NodeManagerMetrics.java | 2 +-
.../AbstractNodeDescriptorsProvider.java | 2 +-
.../ConfigurationNodeAttributesProvider.java | 6 ++--
.../recovery/NMLeveldbStateStoreService.java | 6 ++--
.../scheduler/DistributedScheduler.java | 2 +-
.../security/NMTokenSecretManagerInNM.java | 2 +-
.../timelineservice/NMTimelinePublisher.java | 2 +-
.../util/CgroupsLCEResourcesHandler.java | 2 +-
.../server/nodemanager/TestContainerExecutor.java | 2 +-
.../TestNodeStatusUpdaterForAttributes.java | 2 +-
.../containermanager/TestAuxServices.java | 4 +--
.../containermanager/TestContainerManager.java | 2 +-
.../container/TestResourceMappings.java | 2 +-
.../launcher/TestContainerLaunch.java | 2 +-
.../fpga/TestFpgaResourceHandlerImpl.java | 4 +--
.../resources/gpu/TestGpuResourceAllocator.java | 2 +-
.../resources/gpu/TestGpuResourceHandlerImpl.java | 4 +--
.../localizer/TestResourceLocalizationService.java | 2 +-
.../com/nec/TestVEDeviceDiscoverer.java | 2 +-
.../resourceplugin/gpu/TestGpuResourcePlugin.java | 2 +-
.../gpu/TestNvidiaDockerV1CommandPlugin.java | 4 +--
.../gpu/TestNvidiaDockerV2CommandPlugin.java | 4 +--
.../health/TestNodeHealthCheckerService.java | 4 +--
.../nodemanager/webapp/TestNMWebServices.java | 2 +-
.../hadoop-yarn-server-resourcemanager/pom.xml | 4 +--
.../ActiveStandbyElectorBasedElectorService.java | 2 +-
.../yarn/server/resourcemanager/AdminService.java | 2 +-
.../resourcemanager/ApplicationMasterService.java | 2 +-
.../server/resourcemanager/ClientRMService.java | 2 +-
.../server/resourcemanager/ClusterMetrics.java | 2 +-
.../CuratorBasedElectorService.java | 2 +-
.../yarn/server/resourcemanager/DBManager.java | 2 +-
.../server/resourcemanager/NodesListManager.java | 2 +-
.../OpportunisticContainerAllocatorAMService.java | 2 +-
.../yarn/server/resourcemanager/RMAppManager.java | 4 +--
.../yarn/server/resourcemanager/RMContextImpl.java | 2 +-
.../resourcemanager/RMSecretManagerService.java | 2 +-
.../yarn/server/resourcemanager/RMServerUtils.java | 2 +-
.../server/resourcemanager/ResourceManager.java | 2 +-
.../resourcemanager/ResourceTrackerService.java | 4 +--
.../ahs/RMApplicationHistoryWriter.java | 2 +-
.../resourcemanager/amlauncher/AMLauncher.java | 2 +-
.../amlauncher/ApplicationMasterLauncher.java | 2 +-
.../federation/FederationStateStoreService.java | 2 +-
.../metrics/TimelineServiceV2Publisher.java | 2 +-
.../resourcemanager/monitor/SchedulingMonitor.java | 2 +-
.../monitor/SchedulingMonitorManager.java | 2 +-
.../capacity/PreemptionCandidatesSelector.java | 2 +-
.../ProportionalCapacityPreemptionPolicy.java | 4 +--
.../QueuePriorityContainerCandidateSelector.java | 4 +--
.../invariants/MetricsInvariantChecker.java | 4 +--
.../nodelabels/NodeAttributesManagerImpl.java | 6 ++--
.../nodelabels/RMDelegatedNodeLabelsUpdater.java | 2 +-
.../nodelabels/RMNodeLabelsManager.java | 2 +-
.../placement/DefaultPlacementRule.java | 2 +-
.../resourcemanager/placement/FSPlacementRule.java | 2 +-
.../placement/PlacementManager.java | 2 +-
.../placement/UserGroupMappingPlacementRule.java | 2 +-
.../SubmissionContextPreProcessor.java | 2 +-
.../recovery/FileSystemRMStateStore.java | 2 +-
.../recovery/LeveldbRMStateStore.java | 2 +-
.../recovery/MemoryRMStateStore.java | 2 +-
.../resourcemanager/recovery/RMStateStore.java | 4 +--
.../recovery/RMStateUpdateAppEvent.java | 2 +-
.../resourcemanager/recovery/ZKRMStateStore.java | 2 +-
.../PeriodicRLESparseResourceAllocation.java | 2 +-
.../reservation/ReservationAllocation.java | 2 +-
.../planning/SimpleCapacityReplanner.java | 2 +-
.../resource/ResourceProfilesManagerImpl.java | 2 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 2 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 2 +-
.../rmcontainer/RMContainerImpl.java | 2 +-
.../server/resourcemanager/rmnode/RMNodeImpl.java | 2 +-
.../scheduler/AbstractYarnScheduler.java | 4 +--
.../resourcemanager/scheduler/Allocation.java | 2 +-
.../scheduler/ClusterNodeTracker.java | 4 +--
.../resourcemanager/scheduler/QueueMetrics.java | 4 +--
.../scheduler/QueueMetricsCustomResource.java | 2 +-
.../scheduler/SchedulerApplicationAttempt.java | 6 ++--
.../resourcemanager/scheduler/SchedulerNode.java | 4 +--
.../resourcemanager/scheduler/SchedulerUtils.java | 6 ++--
.../resourcemanager/scheduler/YarnScheduler.java | 2 +-
.../scheduler/activities/ActivitiesManager.java | 4 +--
.../scheduler/capacity/AbstractCSQueue.java | 4 +--
.../capacity/CSMaxRunningAppsEnforcer.java | 4 +--
.../scheduler/capacity/CSQueue.java | 2 +-
.../scheduler/capacity/CSQueueStore.java | 6 ++--
.../scheduler/capacity/CSQueueUtils.java | 2 +-
.../scheduler/capacity/CapacityScheduler.java | 6 ++--
.../capacity/CapacitySchedulerConfiguration.java | 6 ++--
.../capacity/CapacitySchedulerMetrics.java | 2 +-
.../capacity/CapacitySchedulerQueueManager.java | 2 +-
.../scheduler/capacity/LeafQueue.java | 4 +--
.../capacity/QueueManagementDynamicEditPolicy.java | 2 +-
.../scheduler/capacity/UsersManager.java | 2 +-
.../capacity/WorkflowPriorityMappingsManager.java | 2 +-
.../conf/FSSchedulerConfigurationStore.java | 2 +-
.../capacity/conf/LeveldbConfigurationStore.java | 2 +-
.../conf/MutableCSConfigurationProvider.java | 4 +--
.../capacity/conf/ZKConfigurationStore.java | 2 +-
.../PriorityUtilizationQueueOrderingPolicy.java | 2 +-
.../capacity/preemption/PreemptionManager.java | 2 +-
.../GuaranteedOrZeroCapacityOverTimePolicy.java | 2 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 2 +-
.../scheduler/constraint/AllocationTags.java | 2 +-
.../constraint/AllocationTagsManager.java | 4 +--
.../scheduler/constraint/TargetApplications.java | 4 +--
.../constraint/TargetApplicationsNamespace.java | 4 +--
.../processor/PlacementConstraintProcessor.java | 2 +-
...CentralizedOpportunisticContainerAllocator.java | 2 +-
.../distributed/NodeQueueLoadMonitor.java | 2 +-
.../scheduler/fair/AllocationConfiguration.java | 2 +-
.../fair/AllocationFileLoaderService.java | 2 +-
.../scheduler/fair/FSAppAttempt.java | 2 +-
.../scheduler/fair/FSLeafQueue.java | 2 +-
.../scheduler/fair/FSOpDurations.java | 2 +-
.../scheduler/fair/FSParentQueue.java | 2 +-
.../resourcemanager/scheduler/fair/FSQueue.java | 2 +-
.../scheduler/fair/FSQueueMetrics.java | 2 +-
.../scheduler/fair/FSSchedulerNode.java | 4 +--
.../scheduler/fair/FairScheduler.java | 8 ++---
.../scheduler/fair/FairSchedulerConfiguration.java | 2 +-
.../scheduler/fair/FairSchedulerUtilities.java | 2 +-
.../scheduler/fair/MaxRunningAppsEnforcer.java | 6 ++--
.../scheduler/fair/QueueManager.java | 6 ++--
.../fair/ReservationQueueConfiguration.java | 2 +-
.../fair/allocation/AllocationFileParser.java | 4 +--
.../fair/converter/DryRunResultHolder.java | 2 +-
.../FSConfigToCSConfigArgumentHandler.java | 2 +-
.../converter/FSConfigToCSConfigConverter.java | 2 +-
.../converter/FSConfigToCSConfigRuleHandler.java | 2 +-
.../policies/DominantResourceFairnessPolicy.java | 2 +-
.../scheduler/fair/policies/FairSharePolicy.java | 2 +-
.../scheduler/fair/policies/FifoPolicy.java | 2 +-
.../scheduler/fifo/FifoScheduler.java | 2 +-
.../scheduler/placement/MultiNodeSorter.java | 2 +-
.../placement/SimpleCandidateNodeSet.java | 2 +-
.../SingleConstraintAppPlacementAllocator.java | 2 +-
.../scheduler/policy/FairOrderingPolicy.java | 2 +-
.../security/AMRMTokenSecretManager.java | 2 +-
.../security/ClientToAMTokenSecretManagerInRM.java | 2 +-
.../security/DelegationTokenRenewer.java | 4 +--
.../security/NMTokenSecretManagerInRM.java | 2 +-
.../resourcemanager/security/QueueACLsManager.java | 2 +-
.../security/RMContainerTokenSecretManager.java | 2 +-
.../security/RMDelegationTokenSecretManager.java | 2 +-
.../volume/csi/VolumeManagerImpl.java | 4 +--
.../volume/csi/lifecycle/VolumeImpl.java | 6 ++--
.../webapp/ApplicationsRequestBuilder.java | 2 +-
.../resourcemanager/webapp/RMWebAppFilter.java | 2 +-
.../resourcemanager/webapp/RMWebServices.java | 2 +-
.../resourcemanager/webapp/dao/ActivitiesInfo.java | 2 +-
.../webapp/dao/ActivityNodeInfo.java | 2 +-
.../webapp/dao/AppActivitiesInfo.java | 2 +-
.../server/resourcemanager/webapp/dao/AppInfo.java | 4 +--
.../webapp/dao/AppRequestAllocationInfo.java | 2 +-
.../resourcemanager/webapp/dao/NodeInfo.java | 2 +-
.../ApplicationMasterServiceTestBase.java | 2 +-
.../resourcemanager/MockMemoryRMStateStore.java | 2 +-
.../yarn/server/resourcemanager/MockNodes.java | 4 +--
.../server/resourcemanager/TestAppManager.java | 6 ++--
.../TestApplicationMasterServiceFair.java | 2 +-
.../resourcemanager/TestClientRMService.java | 4 +--
.../server/resourcemanager/TestRMAdminService.java | 6 ++--
.../resourcemanager/TestRMHAForNodeLabels.java | 2 +-
.../yarn/server/resourcemanager/TestRMRestart.java | 4 +--
.../TestResourceTrackerService.java | 4 +--
.../applicationsmanager/MockAsm.java | 2 +-
.../applicationsmanager/TestAMRestart.java | 4 +--
.../TestFileSystemNodeAttributeStore.java | 2 +-
.../nodelabels/TestNodeAttributesManager.java | 4 +--
.../TestRMDelegatedNodeLabelsUpdater.java | 4 +--
.../nodelabels/TestRMNodeLabelsManager.java | 4 +--
.../TestUserGroupMappingPlacementRule.java | 2 +-
.../recovery/TestZKRMStateStore.java | 6 ++--
.../rmapp/TestRMAppTransitions.java | 2 +-
.../rmcontainer/TestRMContainerImpl.java | 2 +-
.../scheduler/AppMetricsChecker.java | 2 +-
.../scheduler/ResourceMetricsChecker.java | 2 +-
.../scheduler/TestAbstractYarnScheduler.java | 4 +--
.../TestQueueMetricsForCustomResources.java | 4 +--
.../scheduler/TestSchedulerUtils.java | 6 ++--
.../capacity/CapacitySchedulerTestBase.java | 2 +-
.../scheduler/capacity/TestApplicationLimits.java | 6 ++--
.../capacity/TestApplicationLimitsByPartition.java | 4 +--
.../scheduler/capacity/TestCapacityScheduler.java | 6 ++--
.../TestCapacitySchedulerAsyncScheduling.java | 2 +-
.../TestCapacitySchedulerAutoCreatedQueueBase.java | 4 +--
.../TestCapacitySchedulerAutoQueueCreation.java | 2 +-
.../TestCapacitySchedulerLazyPreemption.java | 2 +-
.../TestCapacitySchedulerMaxParallelApps.java | 2 +-
.../TestCapacitySchedulerNodeLabelUpdate.java | 6 ++--
...stCapacitySchedulerSchedulingRequestUpdate.java | 4 +--
.../TestCapacitySchedulerSurgicalPreemption.java | 4 +--
...estCapacitySchedulerWithMultiResourceTypes.java | 2 +-
...stCapacitySchedulerWorkflowPriorityMapping.java | 4 +--
.../scheduler/capacity/TestLeafQueue.java | 2 +-
.../capacity/TestNodeLabelContainerAllocation.java | 6 ++--
.../scheduler/capacity/TestQueueParsing.java | 2 +-
.../scheduler/capacity/TestReservations.java | 2 +-
.../TestSchedulingRequestContainerAllocation.java | 4 +--
...tSchedulingRequestContainerAllocationAsync.java | 2 +-
.../scheduler/capacity/TestUtils.java | 2 +-
.../TestWorkPreservingRMRestartForNodeLabel.java | 6 ++--
...TestPriorityUtilizationQueueOrderingPolicy.java | 4 +--
.../constraint/TestAllocationTagsManager.java | 2 +-
.../constraint/TestAllocationTagsNamespace.java | 4 +--
.../TestPlacementConstraintManagerService.java | 2 +-
.../constraint/TestPlacementConstraintsUtil.java | 4 +--
.../algorithm/TestLocalAllocationTagsManager.java | 2 +-
.../scheduler/fair/FairSchedulerTestBase.java | 2 +-
.../scheduler/fair/TestFSLeafQueue.java | 2 +-
.../scheduler/fair/TestFSQueueMetrics.java | 2 +-
.../scheduler/fair/TestFairScheduler.java | 4 +--
.../fair/TestFairSchedulerConfiguration.java | 2 +-
.../scheduler/fair/TestQueueManager.java | 4 +--
.../fair/allocationfile/AllocationFileQueue.java | 2 +-
.../AllocationFileQueuePlacementPolicy.java | 2 +-
.../AllocationFileQueuePlacementRule.java | 2 +-
.../TestFSConfigToCSConfigArgumentHandler.java | 2 +-
.../fair/converter/TestFSQueueConverter.java | 2 +-
.../converter/TestQueuePlacementConverter.java | 2 +-
.../volume/csi/TestVolumeProcessor.java | 6 ++--
.../webapp/ActivitiesTestUtils.java | 2 +-
.../webapp/TestApplicationsRequestBuilder.java | 2 +-
.../resourcemanager/webapp/TestRMWebApp.java | 2 +-
.../webapp/TestRMWebAppFairScheduler.java | 2 +-
.../webapp/TestRMWebServiceAppsNodelabel.java | 4 +--
.../resourcemanager/webapp/TestRMWebServices.java | 2 +-
.../webapp/TestRMWebServicesApps.java | 2 +-
.../TestRMWebServicesForCSWithPartitions.java | 6 ++--
.../webapp/TestRMWebServicesNodes.java | 2 +-
.../FairSchedulerJsonVerifications.java | 2 +-
.../FairSchedulerXmlVerifications.java | 2 +-
.../helper/ResourceRequestsJsonVerifications.java | 4 +--
.../helper/ResourceRequestsXmlVerifications.java | 6 ++--
.../apache/hadoop/yarn/server/router/Router.java | 2 +-
.../hadoop/yarn/server/router/RouterMetrics.java | 2 +-
.../clientrm/DefaultClientRequestInterceptor.java | 2 +-
.../clientrm/FederationClientInterceptor.java | 4 +--
.../router/clientrm/RouterClientRMService.java | 2 +-
.../rmadmin/DefaultRMAdminRequestInterceptor.java | 2 +-
.../router/rmadmin/RouterRMAdminService.java | 2 +-
.../router/webapp/FederationInterceptorREST.java | 4 +--
.../server/router/webapp/RouterWebServices.java | 2 +-
.../router/webapp/TestRouterWebServicesREST.java | 2 +-
.../server/sharedcachemanager/CleanerService.java | 2 +-
.../sharedcachemanager/SharedCacheManager.java | 2 +-
.../sharedcachemanager/store/InMemorySCMStore.java | 4 +--
.../server/sharedcachemanager/store/SCMStore.java | 2 +-
.../hadoop-yarn-server-tests/pom.xml | 4 +--
.../apache/hadoop/yarn/server/MiniYARNCluster.java | 2 +-
.../pom.xml | 4 +--
.../timeline/EntityGroupFSTimelineStore.java | 4 +--
.../hadoop/yarn/server/timeline/LogInfo.java | 2 +-
.../server/timeline/EntityGroupPlugInForTest.java | 2 +-
.../cosmosdb/CosmosDBDocumentStoreReader.java | 4 +--
.../cosmosdb/CosmosDBDocumentStoreWriter.java | 2 +-
.../pom.xml | 6 ++++
.../TestTimelineReaderWebServicesHBaseStorage.java | 4 +--
.../pom.xml | 4 +--
.../storage/HBaseTimelineSchemaCreator.java | 2 +-
.../storage/reader/ApplicationEntityReader.java | 2 +-
.../storage/reader/EntityTypeReader.java | 2 +-
.../storage/reader/FlowActivityEntityReader.java | 2 +-
.../storage/reader/FlowRunEntityReader.java | 2 +-
.../storage/reader/GenericEntityReader.java | 2 +-
.../storage/reader/SubApplicationEntityReader.java | 2 +-
.../pom.xml | 4 +--
.../storage/common/TestSeparator.java | 2 +-
.../pom.xml | 4 +--
.../timelineservice/storage/flow/FlowScanner.java | 2 +-
.../pom.xml | 4 +--
.../timelineservice/storage/flow/FlowScanner.java | 2 +-
.../hadoop-yarn-server-timelineservice/pom.xml | 4 +--
.../collector/AppLevelTimelineCollector.java | 4 +--
.../AppLevelTimelineCollectorWithAgg.java | 2 +-
.../collector/NodeTimelineCollectorManager.java | 4 +--
.../PerNodeTimelineCollectorsAuxService.java | 2 +-
.../collector/TimelineCollectorManager.java | 2 +-
.../PerNodeAggTimelineCollectorMetrics.java | 2 +-
.../metrics/TimelineReaderMetrics.java | 2 +-
.../reader/TimelineReaderServer.java | 2 +-
.../reader/TimelineReaderUtils.java | 2 +-
.../reader/TimelineReaderWebServices.java | 2 +-
.../storage/FileSystemTimelineReaderImpl.java | 2 +-
.../storage/FileSystemTimelineWriterImpl.java | 2 +-
.../storage/TimelineSchemaCreator.java | 2 +-
.../storage/common/OfflineAggregationInfo.java | 2 +-
.../collector/TestTimelineCollector.java | 2 +-
.../reader/TestTimelineReaderWebServicesUtils.java | 2 +-
.../hadoop-yarn-server-web-proxy/pom.xml | 4 +--
.../hadoop/yarn/server/webproxy/ProxyCA.java | 2 +-
.../hadoop/yarn/server/webproxy/WebAppProxy.java | 2 +-
.../yarn/server/webproxy/WebAppProxyServlet.java | 2 +-
.../webproxy/amfilter/AmFilterInitializer.java | 2 +-
.../yarn/server/webproxy/amfilter/AmIpFilter.java | 2 +-
.../yarn/server/webproxy/TestProxyUriUtils.java | 2 +-
1749 files changed, 2807 insertions(+), 2744 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-17344. Harmonize guava version and shade
guava in yarn-csi. (#2434)
Posted by ay...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b84bc63aa2df0df060081fd9eb8b91bb8e06e761
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Tue Nov 10 15:19:40 2020 +0900
HADOOP-17344. Harmonize guava version and shade guava in yarn-csi. (#2434)
Reviewed-by: Ayush Saxena <ay...@apache.org>
Reviewed-by: Wei-Chiu Chuang <we...@apache.org>
---
.../hadoop-yarn/hadoop-yarn-csi/pom.xml | 18 ++----------------
.../hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java | 4 ++--
.../adaptor/TestValidateVolumeCapabilityRequest.java | 4 ++--
.../apache/hadoop/yarn/csi/client/TestCsiClient.java | 2 +-
4 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
index b57f238..3cbb951 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
@@ -27,16 +27,14 @@
<properties>
<protobuf.version>3.6.1</protobuf.version>
- <guava.version>20.0</guava.version>
<grpc.version>1.26.0</grpc.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
</properties>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -209,18 +207,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <executions>
- <execution>
- <id>replace-guava</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
index 2375b06..206fb14 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
@@ -17,8 +17,6 @@
*/
package org.apache.hadoop.yarn.csi.adaptor;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import csi.v0.Csi;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
@@ -26,6 +24,8 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.service.ServiceStateException;
import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.hadoop.yarn.api.CsiAdaptorProtocol;
import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
import org.apache.hadoop.yarn.api.impl.pb.client.CsiAdaptorProtocolPBClientImpl;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
index 303cfc4..127ddb3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.yarn.csi.adaptor;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeCapability;
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.ValidateVolumeCapabilitiesRequestPBImpl;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
index 9e7ac19..f025bc6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.yarn.csi.client;
import csi.v0.Csi;
import org.apache.commons.io.FileUtils;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HADOOP-17288. Use shaded guava from thirdparty.
Contributed by Ayush Saxena. #2505
Posted by ay...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 8378ab9f92c72dc6164b62f7be71826fd750dba4
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Thu Dec 10 05:31:58 2020 +0530
HADOOP-17288. Use shaded guava from thirdparty. Contributed by Ayush Saxena. #2505
---
.../hadoop-client-minicluster/pom.xml | 12 +++++++
.../org/apache/hadoop/fs/cosn/CosNFileSystem.java | 2 +-
.../apache/hadoop/fs/cosn/CosNOutputStream.java | 8 ++---
.../fs/cosn/auth/COSCredentialsProviderList.java | 2 +-
hadoop-common-project/hadoop-auth/pom.xml | 7 +++-
.../client/KerberosAuthenticator.java | 2 +-
.../server/AuthenticationHandlerUtil.java | 2 +-
.../server/JWTRedirectAuthenticationHandler.java | 2 +-
.../server/KerberosAuthenticationHandler.java | 2 +-
.../server/LdapAuthenticationHandler.java | 4 +--
.../server/MultiSchemeAuthenticationHandler.java | 4 +--
.../util/FileSignerSecretProvider.java | 2 +-
.../security/authentication/util/KerberosName.java | 2 +-
.../util/RandomSignerSecretProvider.java | 2 +-
.../util/RolloverSignerSecretProvider.java | 2 +-
.../util/ZKSignerSecretProvider.java | 2 +-
.../util/StringSignerSecretProvider.java | 2 +-
.../util/StringSignerSecretProviderCreator.java | 2 +-
hadoop-common-project/hadoop-common/pom.xml | 5 +++
.../java/org/apache/hadoop/conf/ConfServlet.java | 2 +-
.../java/org/apache/hadoop/conf/Configuration.java | 8 ++---
.../org/apache/hadoop/conf/ReconfigurableBase.java | 6 ++--
.../apache/hadoop/crypto/AesCtrCryptoCodec.java | 2 +-
.../java/org/apache/hadoop/crypto/CryptoCodec.java | 4 +--
.../apache/hadoop/crypto/CryptoInputStream.java | 2 +-
.../apache/hadoop/crypto/CryptoOutputStream.java | 2 +-
.../apache/hadoop/crypto/CryptoStreamUtils.java | 2 +-
.../apache/hadoop/crypto/JceAesCtrCryptoCodec.java | 2 +-
.../hadoop/crypto/OpensslAesCtrCryptoCodec.java | 2 +-
.../org/apache/hadoop/crypto/OpensslCipher.java | 2 +-
.../hadoop/crypto/key/CachingKeyProvider.java | 6 ++--
.../hadoop/crypto/key/JavaKeyStoreProvider.java | 4 +--
.../crypto/key/KeyProviderCryptoExtension.java | 2 +-
.../key/KeyProviderDelegationTokenExtension.java | 2 +-
.../org/apache/hadoop/crypto/key/KeyShell.java | 2 +-
.../hadoop/crypto/key/kms/KMSClientProvider.java | 6 ++--
.../key/kms/LoadBalancingKMSClientProvider.java | 4 +--
.../apache/hadoop/crypto/key/kms/ValueQueue.java | 10 +++---
.../hadoop/crypto/random/OpensslSecureRandom.java | 2 +-
.../org/apache/hadoop/fs/AbstractFileSystem.java | 2 +-
.../java/org/apache/hadoop/fs/ByteBufferUtil.java | 2 +-
.../org/apache/hadoop/fs/ChecksumFileSystem.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/DF.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/DU.java | 2 +-
.../apache/hadoop/fs/DelegationTokenRenewer.java | 2 +-
.../hadoop/fs/FSDataOutputStreamBuilder.java | 2 +-
.../java/org/apache/hadoop/fs/FSInputStream.java | 2 +-
.../java/org/apache/hadoop/fs/FileContext.java | 4 +--
.../org/apache/hadoop/fs/FileEncryptionInfo.java | 4 +--
.../main/java/org/apache/hadoop/fs/FileSystem.java | 6 ++--
.../hadoop/fs/FileSystemStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/FsTracer.java | 2 +-
.../java/org/apache/hadoop/fs/FsUrlConnection.java | 2 +-
.../apache/hadoop/fs/GlobalStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/Globber.java | 2 +-
.../main/java/org/apache/hadoop/fs/HardLink.java | 2 +-
.../java/org/apache/hadoop/fs/PartialListing.java | 2 +-
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/Stat.java | 2 +-
.../org/apache/hadoop/fs/TrashPolicyDefault.java | 2 +-
.../apache/hadoop/fs/UnionStorageStatistics.java | 2 +-
.../main/java/org/apache/hadoop/fs/XAttrCodec.java | 2 +-
.../org/apache/hadoop/fs/ftp/FTPFileSystem.java | 4 +--
.../hadoop/fs/impl/AbstractFSBuilderImpl.java | 6 ++--
.../hadoop/fs/impl/AbstractMultipartUploader.java | 4 +--
.../fs/impl/FileSystemMultipartUploader.java | 4 +--
.../apache/hadoop/fs/impl/FsLinkResolution.java | 2 +-
.../fs/impl/MultipartUploaderBuilderImpl.java | 2 +-
.../hadoop/fs/impl/PathCapabilitiesSupport.java | 2 +-
.../apache/hadoop/fs/impl/WrappedIOException.java | 2 +-
.../org/apache/hadoop/fs/permission/AclEntry.java | 2 +-
.../org/apache/hadoop/fs/permission/AclStatus.java | 6 ++--
.../org/apache/hadoop/fs/permission/AclUtil.java | 2 +-
.../org/apache/hadoop/fs/sftp/SFTPFileSystem.java | 2 +-
.../org/apache/hadoop/fs/shell/AclCommands.java | 2 +-
.../java/org/apache/hadoop/fs/shell/Concat.java | 2 +-
.../org/apache/hadoop/fs/shell/CopyCommands.java | 2 +-
.../main/java/org/apache/hadoop/fs/shell/Ls.java | 2 +-
.../apache/hadoop/fs/shell/SnapshotCommands.java | 2 +-
.../main/java/org/apache/hadoop/fs/shell/Tail.java | 2 +-
.../org/apache/hadoop/fs/shell/TouchCommands.java | 2 +-
.../org/apache/hadoop/fs/shell/XAttrCommands.java | 2 +-
.../org/apache/hadoop/fs/viewfs/InodeTree.java | 2 +-
.../apache/hadoop/fs/viewfs/ViewFileSystem.java | 2 +-
.../java/org/apache/hadoop/fs/viewfs/ViewFs.java | 2 +-
.../org/apache/hadoop/ha/ActiveStandbyElector.java | 4 +--
.../org/apache/hadoop/ha/FailoverController.java | 2 +-
.../main/java/org/apache/hadoop/ha/HAAdmin.java | 2 +-
.../java/org/apache/hadoop/ha/HAServiceTarget.java | 2 +-
.../java/org/apache/hadoop/ha/HealthMonitor.java | 2 +-
.../main/java/org/apache/hadoop/ha/NodeFencer.java | 4 +--
.../org/apache/hadoop/ha/ShellCommandFencer.java | 2 +-
.../org/apache/hadoop/ha/SshFenceByTcpPort.java | 2 +-
.../org/apache/hadoop/ha/ZKFailoverController.java | 6 ++--
.../java/org/apache/hadoop/http/HttpServer2.java | 6 ++--
.../org/apache/hadoop/io/AbstractMapWritable.java | 2 +-
.../org/apache/hadoop/io/DataOutputBuffer.java | 2 +-
.../apache/hadoop/io/ElasticByteBufferPool.java | 2 +-
.../org/apache/hadoop/io/FastByteComparisons.java | 2 +-
.../java/org/apache/hadoop/io/ReadaheadPool.java | 4 +--
.../java/org/apache/hadoop/io/SecureIOUtils.java | 2 +-
.../java/org/apache/hadoop/io/SequenceFile.java | 2 +-
.../org/apache/hadoop/io/compress/CodecPool.java | 6 ++--
.../hadoop/io/compress/DecompressorStream.java | 2 +-
.../hadoop/io/compress/zlib/ZlibFactory.java | 2 +-
.../io/compress/zstd/ZStandardCompressor.java | 2 +-
.../hadoop/io/erasurecode/CodecRegistry.java | 2 +-
.../apache/hadoop/io/erasurecode/CodecUtil.java | 2 +-
.../apache/hadoop/io/file/tfile/Compression.java | 2 +-
.../org/apache/hadoop/io/nativeio/NativeIO.java | 2 +-
.../apache/hadoop/io/retry/AsyncCallHandler.java | 4 +--
.../org/apache/hadoop/io/retry/CallReturn.java | 2 +-
.../hadoop/io/retry/RetryInvocationHandler.java | 2 +-
.../org/apache/hadoop/io/retry/RetryPolicies.java | 2 +-
.../org/apache/hadoop/ipc/CallQueueManager.java | 2 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 6 ++--
.../main/java/org/apache/hadoop/ipc/ClientId.java | 2 +-
.../org/apache/hadoop/ipc/DecayRpcScheduler.java | 6 ++--
.../java/org/apache/hadoop/ipc/FairCallQueue.java | 2 +-
.../org/apache/hadoop/ipc/ProtobufRpcEngine.java | 2 +-
.../org/apache/hadoop/ipc/ProtobufRpcEngine2.java | 2 +-
.../org/apache/hadoop/ipc/ProtocolSignature.java | 2 +-
.../java/org/apache/hadoop/ipc/ProxyCombiner.java | 2 +-
.../org/apache/hadoop/ipc/RefreshRegistry.java | 6 ++--
.../java/org/apache/hadoop/ipc/RetryCache.java | 4 +--
.../main/java/org/apache/hadoop/ipc/Server.java | 2 +-
.../metrics/DecayRpcSchedulerDetailedMetrics.java | 2 +-
.../org/apache/hadoop/ipc/metrics/RpcMetrics.java | 2 +-
.../main/java/org/apache/hadoop/log/LogLevel.java | 4 +--
.../org/apache/hadoop/log/LogThrottlingHelper.java | 2 +-
.../org/apache/hadoop/metrics2/AbstractMetric.java | 4 +--
.../org/apache/hadoop/metrics2/MetricsTag.java | 4 +--
.../metrics2/filter/AbstractPatternFilter.java | 2 +-
.../metrics2/impl/AbstractMetricsRecord.java | 4 +--
.../hadoop/metrics2/impl/MBeanInfoBuilder.java | 2 +-
.../hadoop/metrics2/impl/MetricsCollectorImpl.java | 4 +--
.../apache/hadoop/metrics2/impl/MetricsConfig.java | 8 ++---
.../metrics2/impl/MetricsRecordBuilderImpl.java | 2 +-
.../metrics2/impl/MetricsRecordFiltered.java | 2 +-
.../hadoop/metrics2/impl/MetricsRecordImpl.java | 2 +-
.../hadoop/metrics2/impl/MetricsSinkAdapter.java | 2 +-
.../hadoop/metrics2/impl/MetricsSourceAdapter.java | 8 ++---
.../hadoop/metrics2/impl/MetricsSystemImpl.java | 8 ++---
.../hadoop/metrics2/lib/DefaultMetricsSystem.java | 2 +-
.../apache/hadoop/metrics2/lib/MethodMetric.java | 2 +-
.../hadoop/metrics2/lib/MetricsInfoImpl.java | 4 +--
.../hadoop/metrics2/lib/MetricsRegistry.java | 2 +-
.../hadoop/metrics2/lib/MetricsSourceBuilder.java | 2 +-
.../apache/hadoop/metrics2/lib/MutableCounter.java | 2 +-
.../apache/hadoop/metrics2/lib/MutableGauge.java | 2 +-
.../hadoop/metrics2/lib/MutableQuantiles.java | 4 +--
.../apache/hadoop/metrics2/lib/MutableRates.java | 4 +--
.../metrics2/lib/MutableRatesWithAggregation.java | 2 +-
.../metrics2/lib/MutableRollingAverages.java | 6 ++--
.../apache/hadoop/metrics2/lib/UniqueNames.java | 4 +--
.../metrics2/sink/RollingFileSystemSink.java | 2 +-
.../apache/hadoop/metrics2/source/JvmMetrics.java | 4 +--
.../org/apache/hadoop/metrics2/util/MBeans.java | 4 +--
.../apache/hadoop/metrics2/util/MetricsCache.java | 2 +-
.../org/apache/hadoop/metrics2/util/Quantile.java | 2 +-
.../hadoop/metrics2/util/SampleQuantiles.java | 6 ++--
.../org/apache/hadoop/metrics2/util/Servers.java | 2 +-
.../src/main/java/org/apache/hadoop/net/DNS.java | 2 +-
.../main/java/org/apache/hadoop/net/NetUtils.java | 2 +-
.../org/apache/hadoop/net/NetworkTopology.java | 6 ++--
.../org/apache/hadoop/net/SocketInputWrapper.java | 2 +-
.../org/apache/hadoop/net/unix/DomainSocket.java | 2 +-
.../hadoop/net/unix/DomainSocketWatcher.java | 6 ++--
.../java/org/apache/hadoop/security/Groups.java | 24 +++++++-------
.../hadoop/security/IngressPortBasedResolver.java | 2 +-
.../apache/hadoop/security/LdapGroupsMapping.java | 2 +-
.../org/apache/hadoop/security/ProviderUtils.java | 2 +-
.../security/RuleBasedLdapGroupsMapping.java | 2 +-
.../org/apache/hadoop/security/SaslRpcClient.java | 2 +-
.../org/apache/hadoop/security/SecurityUtil.java | 4 +--
.../hadoop/security/ShellBasedIdMapping.java | 6 ++--
.../security/ShellBasedUnixGroupsMapping.java | 4 +--
.../hadoop/security/UserGroupInformation.java | 2 +-
.../alias/AbstractJavaKeyStoreProvider.java | 2 +-
.../hadoop/security/alias/CredentialShell.java | 2 +-
.../authorize/DefaultImpersonationProvider.java | 2 +-
.../hadoop/security/authorize/ProxyUsers.java | 4 +--
.../authorize/ServiceAuthorizationManager.java | 2 +-
.../hadoop/security/http/CrossOriginFilter.java | 2 +-
.../security/ssl/DelegatingSSLSocketFactory.java | 2 +-
.../security/ssl/FileBasedKeyStoresFactory.java | 2 +-
.../security/ssl/ReloadingX509TrustManager.java | 2 +-
.../org/apache/hadoop/security/token/Token.java | 4 +--
.../AbstractDelegationTokenIdentifier.java | 2 +-
.../AbstractDelegationTokenSecretManager.java | 2 +-
.../delegation/ZKDelegationTokenSecretManager.java | 4 +--
.../web/DelegationTokenAuthenticatedURL.java | 2 +-
.../web/DelegationTokenAuthenticationFilter.java | 2 +-
.../web/DelegationTokenAuthenticationHandler.java | 2 +-
.../delegation/web/DelegationTokenManager.java | 2 +-
...SchemeDelegationTokenAuthenticationHandler.java | 4 +--
.../org/apache/hadoop/service/AbstractService.java | 2 +-
.../service/launcher/InterruptEscalator.java | 2 +-
.../apache/hadoop/service/launcher/IrqHandler.java | 2 +-
.../hadoop/service/launcher/ServiceLauncher.java | 4 +--
.../org/apache/hadoop/util/AutoCloseableLock.java | 2 +-
.../util/BlockingThreadPoolExecutorService.java | 2 +-
.../org/apache/hadoop/util/ChunkedArrayList.java | 8 ++---
.../hadoop/util/CloseableReferenceCount.java | 2 +-
.../org/apache/hadoop/util/DirectBufferPool.java | 2 +-
.../java/org/apache/hadoop/util/DiskChecker.java | 2 +-
.../apache/hadoop/util/DiskValidatorFactory.java | 2 +-
.../java/org/apache/hadoop/util/FindClass.java | 2 +-
.../java/org/apache/hadoop/util/GcTimeMonitor.java | 2 +-
.../org/apache/hadoop/util/IdentityHashStore.java | 2 +-
.../org/apache/hadoop/util/InstrumentedLock.java | 2 +-
.../apache/hadoop/util/InstrumentedReadLock.java | 2 +-
.../apache/hadoop/util/InstrumentedWriteLock.java | 2 +-
.../apache/hadoop/util/IntrusiveCollection.java | 2 +-
.../org/apache/hadoop/util/JsonSerialization.java | 2 +-
.../org/apache/hadoop/util/JvmPauseMonitor.java | 10 +++---
.../org/apache/hadoop/util/LightWeightCache.java | 4 +--
.../org/apache/hadoop/util/LightWeightGSet.java | 2 +-
.../org/apache/hadoop/util/LimitInputStream.java | 4 +--
.../java/org/apache/hadoop/util/MachineList.java | 2 +-
.../java/org/apache/hadoop/util/NativeCrc32.java | 2 +-
.../hadoop/util/ReadWriteDiskValidatorMetrics.java | 2 +-
.../hadoop/util/SemaphoredDelegatingExecutor.java | 8 ++---
.../java/org/apache/hadoop/util/ServletUtil.java | 2 +-
.../main/java/org/apache/hadoop/util/Shell.java | 2 +-
.../apache/hadoop/util/ShutdownHookManager.java | 4 +--
.../apache/hadoop/util/ShutdownThreadsHelper.java | 2 +-
.../org/apache/hadoop/util/StringInterner.java | 4 +--
.../java/org/apache/hadoop/util/StringUtils.java | 4 +--
.../java/org/apache/hadoop/util/SysInfoLinux.java | 2 +-
.../org/apache/hadoop/util/SysInfoWindows.java | 2 +-
.../main/java/org/apache/hadoop/util/ZKUtil.java | 8 ++---
.../hadoop/util/concurrent/AsyncGetFuture.java | 2 +-
.../apache/hadoop/util/curator/ChildReaper.java | 2 +-
.../hadoop/util/curator/ZKCuratorManager.java | 2 +-
.../org/apache/hadoop/conf/TestConfServlet.java | 2 +-
.../hadoop/conf/TestConfigurationDeprecation.java | 4 +--
.../apache/hadoop/conf/TestReconfiguration.java | 2 +-
.../org/apache/hadoop/crypto/TestCryptoCodec.java | 2 +-
.../apache/hadoop/crypto/key/TestValueQueue.java | 2 +-
.../kms/TestLoadBalancingKMSClientProvider.java | 2 +-
.../org/apache/hadoop/fs/FCStatisticsBaseTest.java | 2 +-
.../apache/hadoop/fs/TestFileSystemCaching.java | 4 +--
.../org/apache/hadoop/fs/TestLocalFileSystem.java | 2 +-
.../test/java/org/apache/hadoop/fs/TestPath.java | 2 +-
.../AbstractContractMultipartUploaderTest.java | 2 +-
.../apache/hadoop/fs/ftp/TestFTPFileSystem.java | 2 +-
.../hadoop/fs/loadGenerator/LoadGenerator.java | 2 +-
.../org/apache/hadoop/ha/ClientBaseWithFixes.java | 2 +-
.../java/org/apache/hadoop/ha/DummyHAService.java | 2 +-
.../java/org/apache/hadoop/ha/MiniZKFCCluster.java | 4 +--
.../hadoop/ha/TestActiveStandbyElectorRealZK.java | 2 +-
.../java/org/apache/hadoop/ha/TestHAAdmin.java | 4 +--
.../java/org/apache/hadoop/ha/TestNodeFencer.java | 2 +-
.../apache/hadoop/ha/TestShellCommandFencer.java | 2 +-
.../test/java/org/apache/hadoop/io/TestText.java | 4 +--
.../io/compress/CompressDecompressTester.java | 8 ++---
.../io/compress/TestCompressorDecompressor.java | 2 +-
.../zlib/TestZlibCompressorDecompressor.java | 2 +-
.../rawcoder/RawErasureCoderBenchmark.java | 2 +-
.../org/apache/hadoop/ipc/RPCCallBenchmark.java | 2 +-
.../test/java/org/apache/hadoop/ipc/TestIPC.java | 4 +--
.../metrics2/impl/TestMetricsSourceAdapter.java | 2 +-
.../metrics2/impl/TestMetricsSystemImpl.java | 2 +-
.../apache/hadoop/net/MockDomainNameResolver.java | 2 +-
.../org/apache/hadoop/net/TestTableMapping.java | 4 +--
.../apache/hadoop/net/unix/TestDomainSocket.java | 2 +-
.../hadoop/net/unix/TestDomainSocketWatcher.java | 2 +-
.../TestLdapGroupsMappingWithBindUserSwitch.java | 2 +-
.../apache/hadoop/security/TestSecurityUtil.java | 2 +-
.../hadoop/security/TestShellBasedIdMapping.java | 4 +--
.../org/apache/hadoop/test/GenericTestUtils.java | 4 +--
.../org/apache/hadoop/test/LambdaTestUtils.java | 2 +-
.../org/apache/hadoop/test/MetricsAsserts.java | 2 +-
.../java/org/apache/hadoop/util/JarFinder.java | 2 +-
.../hadoop/util/TestApplicationClassLoader.java | 4 +--
.../apache/hadoop/util/TestDirectBufferPool.java | 2 +-
.../hadoop/util/TestGenericOptionsParser.java | 2 +-
.../org/apache/hadoop/util/TestMachineList.java | 2 +-
.../java/org/apache/hadoop/util/TestZKUtil.java | 4 +--
.../hadoop/util/bloom/BloomFilterCommonTester.java | 4 +--
.../apache/hadoop/util/bloom/TestBloomFilters.java | 6 ++--
hadoop-common-project/hadoop-kms/pom.xml | 4 +--
.../apache/hadoop/crypto/key/kms/server/KMS.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSACLs.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSAudit.java | 18 +++++------
.../key/kms/server/KMSAuthenticationFilter.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSMDCFilter.java | 2 +-
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 6 ++--
.../key/kms/server/SimpleKMSAuditLogger.java | 4 +--
.../hadoop/crypto/key/kms/server/MiniKMS.java | 2 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 2 +-
hadoop-common-project/hadoop-nfs/pom.xml | 4 +--
.../java/org/apache/hadoop/nfs/NfsExports.java | 2 +-
.../hadoop/nfs/nfs3/request/LOOKUP3Request.java | 2 +-
.../hadoop/nfs/nfs3/request/READ3Request.java | 2 +-
.../hadoop/nfs/nfs3/response/READDIR3Response.java | 2 +-
.../nfs/nfs3/response/READDIRPLUS3Response.java | 2 +-
.../org/apache/hadoop/oncrpc/RpcCallCache.java | 2 +-
.../java/org/apache/hadoop/oncrpc/RpcProgram.java | 2 +-
.../java/org/apache/hadoop/oncrpc/RpcReply.java | 2 +-
.../main/java/org/apache/hadoop/oncrpc/XDR.java | 4 +--
.../apache/hadoop/oncrpc/security/Credentials.java | 2 +-
.../hadoop/oncrpc/security/CredentialsNone.java | 2 +-
.../hadoop/oncrpc/security/CredentialsSys.java | 2 +-
.../hadoop/oncrpc/security/VerifierNone.java | 2 +-
.../java/org/apache/hadoop/portmap/Portmap.java | 2 +-
hadoop-common-project/hadoop-registry/pom.xml | 4 +--
.../apache/hadoop/registry/cli/RegistryCli.java | 2 +-
.../registry/client/api/DNSOperationsFactory.java | 2 +-
.../client/api/RegistryOperationsFactory.java | 2 +-
.../registry/client/binding/RegistryPathUtils.java | 2 +-
.../registry/client/binding/RegistryTypeUtils.java | 2 +-
.../registry/client/binding/RegistryUtils.java | 4 +--
.../client/impl/FSRegistryOperationsService.java | 4 +--
.../registry/client/impl/zk/CuratorService.java | 4 +--
.../client/impl/zk/RegistryOperationsService.java | 2 +-
.../registry/client/impl/zk/RegistrySecurity.java | 6 ++--
.../registry/client/impl/zk/ZKPathDumper.java | 4 +--
.../hadoop/registry/client/types/Endpoint.java | 2 +-
.../registry/client/types/ServiceRecord.java | 2 +-
.../hadoop/registry/server/dns/RegistryDNS.java | 2 +-
.../registry/server/dns/RegistryDNSServer.java | 2 +-
.../registry/server/dns/ReverseZoneUtils.java | 2 +-
.../integration/SelectByYarnPersistence.java | 2 +-
.../server/services/MicroZookeeperService.java | 2 +-
.../server/services/RegistryAdminService.java | 2 +-
.../java/org/apache/hadoop/hdfs/ClientContext.java | 2 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 10 +++---
.../apache/hadoop/hdfs/DFSClientFaultInjector.java | 2 +-
.../org/apache/hadoop/hdfs/DFSInputStream.java | 2 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 4 +--
.../apache/hadoop/hdfs/DFSStripedInputStream.java | 2 +-
.../apache/hadoop/hdfs/DFSStripedOutputStream.java | 4 +--
.../java/org/apache/hadoop/hdfs/DFSUtilClient.java | 8 ++---
.../java/org/apache/hadoop/hdfs/DataStreamer.java | 12 +++----
.../org/apache/hadoop/hdfs/DeadNodeDetector.java | 2 +-
.../apache/hadoop/hdfs/DistributedFileSystem.java | 6 ++--
.../org/apache/hadoop/hdfs/KeyProviderCache.java | 10 +++---
.../apache/hadoop/hdfs/NameNodeProxiesClient.java | 4 +--
.../java/org/apache/hadoop/hdfs/PeerCache.java | 6 ++--
.../apache/hadoop/hdfs/PositionStripeReader.java | 2 +-
.../apache/hadoop/hdfs/StatefulStripeReader.java | 2 +-
.../java/org/apache/hadoop/hdfs/StripeReader.java | 2 +-
.../apache/hadoop/hdfs/StripedDataStreamer.java | 2 +-
.../java/org/apache/hadoop/hdfs/XAttrHelper.java | 6 ++--
.../hadoop/hdfs/client/HdfsDataInputStream.java | 2 +-
.../hadoop/hdfs/client/HdfsDataOutputStream.java | 2 +-
.../hdfs/client/impl/BlockReaderFactory.java | 8 ++---
.../hadoop/hdfs/client/impl/BlockReaderLocal.java | 4 +--
.../hadoop/hdfs/client/impl/BlockReaderRemote.java | 2 +-
.../hadoop/hdfs/client/impl/DfsClientConf.java | 4 +--
.../hadoop/hdfs/client/impl/LeaseRenewer.java | 2 +-
.../client/impl/SnapshotDiffReportGenerator.java | 2 +-
.../impl/metrics/BlockReaderLocalMetrics.java | 2 +-
.../hadoop/hdfs/protocol/BlockStoragePolicy.java | 2 +-
.../hadoop/hdfs/protocol/CacheDirectiveInfo.java | 2 +-
.../hdfs/protocol/CacheDirectiveIterator.java | 2 +-
.../apache/hadoop/hdfs/protocol/DatanodeID.java | 2 +-
.../hadoop/hdfs/protocol/ErasureCodingPolicy.java | 2 +-
.../hdfs/protocol/ErasureCodingPolicyInfo.java | 2 +-
.../hadoop/hdfs/protocol/HdfsPartialListing.java | 2 +-
.../apache/hadoop/hdfs/protocol/LocatedBlock.java | 4 +--
.../hadoop/hdfs/protocol/ReencryptionStatus.java | 6 ++--
.../hadoop/hdfs/protocol/SnapshotDiffReport.java | 2 +-
.../hdfs/protocol/SnapshotDiffReportListing.java | 2 +-
.../hdfs/protocol/ZoneReencryptionStatus.java | 2 +-
.../hdfs/protocol/datatransfer/PacketHeader.java | 6 ++--
.../hdfs/protocol/datatransfer/PacketReceiver.java | 4 +--
.../hdfs/protocol/datatransfer/PipelineAck.java | 2 +-
.../datatransfer/sasl/DataTransferSaslUtil.java | 8 ++---
.../datatransfer/sasl/SaslDataTransferClient.java | 6 ++--
.../ClientNamenodeProtocolTranslatorPB.java | 2 +-
.../hadoop/hdfs/protocolPB/PBHelperClient.java | 12 +++----
.../protocolPB/ReconfigurationProtocolUtils.java | 2 +-
.../security/token/block/BlockTokenIdentifier.java | 2 +-
.../delegation/DelegationTokenIdentifier.java | 2 +-
.../hdfs/server/datanode/BlockMetadataHeader.java | 2 +-
.../hdfs/server/datanode/DiskBalancerWorkItem.java | 2 +-
.../server/datanode/DiskBalancerWorkStatus.java | 2 +-
.../namenode/ha/ObserverReadProxyProvider.java | 2 +-
.../hdfs/server/protocol/SlowDiskReports.java | 2 +-
.../hdfs/server/protocol/SlowPeerReports.java | 2 +-
.../hadoop/hdfs/shortcircuit/DfsClientShm.java | 2 +-
.../hdfs/shortcircuit/DfsClientShmManager.java | 4 +--
.../hdfs/shortcircuit/DomainSocketFactory.java | 8 ++---
.../hdfs/shortcircuit/ShortCircuitCache.java | 6 ++--
.../hdfs/shortcircuit/ShortCircuitReplica.java | 4 +--
.../hadoop/hdfs/shortcircuit/ShortCircuitShm.java | 6 ++--
.../apache/hadoop/hdfs/util/ByteArrayManager.java | 2 +-
.../apache/hadoop/hdfs/util/StripedBlockUtil.java | 4 +--
.../hadoop/hdfs/web/ByteRangeInputStream.java | 4 +--
.../org/apache/hadoop/hdfs/web/JsonUtilClient.java | 6 ++--
.../org/apache/hadoop/hdfs/web/TokenAspect.java | 2 +-
.../hadoop/hdfs/web/URLConnectionFactory.java | 2 +-
.../apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 8 ++---
.../hdfs/web/resources/AclPermissionParam.java | 2 +-
.../hadoop/hdfs/web/resources/UserParam.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestPeerCache.java | 2 +-
.../ha/TestRequestHedgingProxyProvider.java | 2 +-
.../hadoop/hdfs/web/TestByteRangeInputStream.java | 2 +-
.../hadoop/hdfs/web/TestURLConnectionFactory.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 +--
.../hadoop/fs/http/client/HttpFSFileSystem.java | 8 ++---
.../apache/hadoop/fs/http/server/HttpFSServer.java | 2 +-
.../apache/hadoop/lib/servlet/ServerWebApp.java | 2 +-
.../org/apache/hadoop/lib/wsrs/Parameters.java | 2 +-
.../apache/hadoop/lib/wsrs/ParametersProvider.java | 2 +-
.../hadoop/fs/http/client/BaseTestHttpFSWith.java | 2 +-
.../hadoop/fs/http/server/TestHttpFSServer.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 4 +--
.../hadoop/hdfs/nfs/mount/RpcProgramMountd.java | 2 +-
.../hadoop/hdfs/nfs/nfs3/DFSClientCache.java | 16 +++++-----
.../java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java | 2 +-
.../apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java | 2 +-
.../apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 4 +--
.../hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java | 6 ++--
.../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +-
.../org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java | 4 +--
.../apache/hadoop/hdfs/nfs/nfs3/WriteManager.java | 2 +-
.../metrics/FederationRPCPerformanceMonitor.java | 2 +-
.../federation/metrics/NamenodeBeanMetrics.java | 6 ++--
.../hdfs/server/federation/metrics/RBFMetrics.java | 2 +-
.../federation/metrics/StateStoreMetrics.java | 2 +-
.../federation/resolver/MountTableResolver.java | 6 ++--
.../MultipleDestinationMountTableResolver.java | 2 +-
.../resolver/order/AvailableSpaceResolver.java | 2 +-
.../federation/resolver/order/HashResolver.java | 2 +-
.../federation/resolver/order/LocalResolver.java | 4 +--
.../federation/resolver/order/RandomResolver.java | 2 +-
.../federation/router/ConnectionManager.java | 2 +-
.../server/federation/router/ConnectionPool.java | 2 +-
.../server/federation/router/ConnectionPoolId.java | 2 +-
.../router/MountTableRefresherService.java | 14 ++++----
.../server/federation/router/PeriodicService.java | 2 +-
.../hdfs/server/federation/router/Quota.java | 4 +--
.../hdfs/server/federation/router/Router.java | 2 +-
.../federation/router/RouterAdminServer.java | 4 +--
.../federation/router/RouterClientProtocol.java | 2 +-
.../federation/router/RouterHeartbeatService.java | 2 +-
.../server/federation/router/RouterRpcClient.java | 4 +--
.../server/federation/router/RouterRpcServer.java | 2 +-
.../router/security/RouterSecurityManager.java | 2 +-
.../server/federation/store/StateStoreService.java | 2 +-
.../store/driver/impl/StateStoreFileBaseImpl.java | 2 +-
.../store/driver/impl/StateStoreFileImpl.java | 2 +-
.../federation/store/records/BaseRecord.java | 2 +-
.../router/TestRouterPolicyProvider.java | 2 +-
.../server/federation/router/TestRouterRpc.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 +--
.../main/java/org/apache/hadoop/hdfs/DFSUtil.java | 10 +++---
.../main/java/org/apache/hadoop/hdfs/HAUtil.java | 6 ++--
.../apache/hadoop/hdfs/net/DFSNetworkTopology.java | 4 +--
.../hadoop/hdfs/net/DFSTopologyNodeImpl.java | 4 +--
.../hadoop/hdfs/protocol/BlockListAsLongs.java | 4 +--
.../hadoop/hdfs/protocol/CacheDirective.java | 4 +--
.../apache/hadoop/hdfs/protocol/LayoutFlags.java | 8 ++---
.../datatransfer/sasl/SaslDataTransferServer.java | 6 ++--
.../DatanodeProtocolClientSideTranslatorPB.java | 2 +-
.../DatanodeProtocolServerSideTranslatorPB.java | 2 +-
.../hadoop/hdfs/qjournal/client/AsyncLogger.java | 2 +-
.../hdfs/qjournal/client/AsyncLoggerSet.java | 12 +++----
.../hdfs/qjournal/client/IPCLoggerChannel.java | 20 ++++++------
.../qjournal/client/IPCLoggerChannelMetrics.java | 2 +-
.../hadoop/hdfs/qjournal/client/QuorumCall.java | 14 ++++----
.../hdfs/qjournal/client/QuorumException.java | 4 +--
.../hdfs/qjournal/client/QuorumJournalManager.java | 8 ++---
.../qjournal/client/SegmentRecoveryComparator.java | 6 ++--
.../hadoop/hdfs/qjournal/server/JNStorage.java | 2 +-
.../hadoop/hdfs/qjournal/server/Journal.java | 8 ++---
.../hdfs/qjournal/server/JournalFaultInjector.java | 2 +-
.../hadoop/hdfs/qjournal/server/JournalNode.java | 8 ++---
.../hdfs/qjournal/server/JournalNodeRpcServer.java | 2 +-
.../hdfs/qjournal/server/JournalNodeSyncer.java | 6 ++--
.../hdfs/qjournal/server/JournaledEditsCache.java | 2 +-
.../token/block/BlockPoolTokenSecretManager.java | 2 +-
.../token/block/BlockTokenSecretManager.java | 10 +++---
.../delegation/DelegationTokenSecretManager.java | 4 +--
.../hdfs/server/aliasmap/InMemoryAliasMap.java | 4 +--
.../hadoop/hdfs/server/balancer/Balancer.java | 6 ++--
.../hadoop/hdfs/server/balancer/Dispatcher.java | 4 +--
.../hdfs/server/balancer/NameNodeConnector.java | 6 ++--
.../AvailableSpaceBlockPlacementPolicy.java | 2 +-
.../server/blockmanagement/BlockIdManager.java | 4 +--
.../hdfs/server/blockmanagement/BlockInfo.java | 2 +-
.../blockmanagement/BlockInfoContiguous.java | 2 +-
.../server/blockmanagement/BlockInfoStriped.java | 4 +--
.../hdfs/server/blockmanagement/BlockManager.java | 4 +--
.../blockmanagement/BlockManagerFaultInjector.java | 2 +-
.../blockmanagement/BlockManagerSafeMode.java | 4 +--
.../blockmanagement/BlockPlacementPolicy.java | 2 +-
.../BlockPlacementPolicyDefault.java | 4 +--
.../blockmanagement/BlockReportLeaseManager.java | 2 +-
.../blockmanagement/BlockStoragePolicySuite.java | 6 ++--
.../server/blockmanagement/BlockToMarkCorrupt.java | 2 +-
.../blockmanagement/CacheReplicationMonitor.java | 2 +-
.../blockmanagement/CombinedHostFileManager.java | 8 ++---
.../server/blockmanagement/CorruptReplicasMap.java | 2 +-
.../DatanodeAdminBackoffMonitor.java | 2 +-
.../DatanodeAdminDefaultMonitor.java | 2 +-
.../blockmanagement/DatanodeAdminManager.java | 6 ++--
.../server/blockmanagement/DatanodeDescriptor.java | 2 +-
.../server/blockmanagement/DatanodeManager.java | 6 ++--
.../blockmanagement/DatanodeStorageInfo.java | 2 +-
.../blockmanagement/ExcessRedundancyMap.java | 2 +-
.../server/blockmanagement/HeartbeatManager.java | 2 +-
.../server/blockmanagement/HostFileManager.java | 2 +-
.../hdfs/server/blockmanagement/HostSet.java | 8 ++---
.../server/blockmanagement/InvalidateBlocks.java | 2 +-
.../blockmanagement/PendingDataNodeMessages.java | 4 +--
.../PendingReconstructionBlocks.java | 2 +-
.../blockmanagement/PendingRecoveryBlocks.java | 2 +-
.../server/blockmanagement/ProvidedStorageMap.java | 2 +-
.../server/blockmanagement/SlowDiskTracker.java | 8 ++---
.../server/blockmanagement/SlowPeerTracker.java | 6 ++--
.../hdfs/server/common/HdfsServerConstants.java | 2 +-
.../apache/hadoop/hdfs/server/common/Storage.java | 4 +--
.../hadoop/hdfs/server/common/StorageInfo.java | 2 +-
.../org/apache/hadoop/hdfs/server/common/Util.java | 4 +--
.../blockaliasmap/impl/TextFileRegionAliasMap.java | 2 +-
.../hdfs/server/datanode/BPOfferService.java | 8 ++---
.../hdfs/server/datanode/BPServiceActor.java | 4 +--
.../hdfs/server/datanode/BlockChecksumHelper.java | 2 +-
.../hdfs/server/datanode/BlockPoolManager.java | 10 +++---
.../server/datanode/BlockPoolSliceStorage.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockReceiver.java | 2 +-
.../hdfs/server/datanode/BlockRecoveryWorker.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockScanner.java | 6 ++--
.../hadoop/hdfs/server/datanode/BlockSender.java | 4 +--
.../hadoop/hdfs/server/datanode/DataNode.java | 14 ++++----
.../server/datanode/DataNodeFaultInjector.java | 2 +-
.../hadoop/hdfs/server/datanode/DataStorage.java | 8 ++---
.../hadoop/hdfs/server/datanode/DataXceiver.java | 4 +--
.../hdfs/server/datanode/DataXceiverServer.java | 4 +--
.../hdfs/server/datanode/DirectoryScanner.java | 6 ++--
.../hadoop/hdfs/server/datanode/DiskBalancer.java | 4 +--
.../datanode/IncrementalBlockReportManager.java | 4 +--
.../hadoop/hdfs/server/datanode/LocalReplica.java | 2 +-
.../hdfs/server/datanode/ProvidedReplica.java | 2 +-
.../server/datanode/SecureDataNodeStarter.java | 2 +-
.../hdfs/server/datanode/ShortCircuitRegistry.java | 8 ++---
.../hadoop/hdfs/server/datanode/VolumeScanner.java | 8 ++---
.../server/datanode/VolumeScannerCBInjector.java | 2 +-
.../server/datanode/checker/AbstractFuture.java | 20 ++++++------
.../hdfs/server/datanode/checker/AsyncChecker.java | 2 +-
.../datanode/checker/DatasetVolumeChecker.java | 16 +++++-----
.../datanode/checker/StorageLocationChecker.java | 6 ++--
.../datanode/checker/ThrottledAsyncChecker.java | 10 +++---
.../server/datanode/checker/TimeoutFuture.java | 4 +--
.../datanode/erasurecode/ErasureCodingWorker.java | 2 +-
.../server/datanode/erasurecode/StripedReader.java | 2 +-
.../datanode/erasurecode/StripedReconstructor.java | 2 +-
.../server/datanode/erasurecode/StripedWriter.java | 2 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 2 +-
.../server/datanode/fsdataset/impl/CacheStats.java | 2 +-
.../datanode/fsdataset/impl/FsDatasetCache.java | 4 +--
.../datanode/fsdataset/impl/FsDatasetImpl.java | 8 ++---
.../datanode/fsdataset/impl/FsDatasetUtil.java | 2 +-
.../datanode/fsdataset/impl/FsVolumeImpl.java | 8 ++---
.../fsdataset/impl/FsVolumeImplBuilder.java | 2 +-
.../fsdataset/impl/MappableBlockLoader.java | 2 +-
.../impl/NativePmemMappableBlockLoader.java | 2 +-
.../datanode/fsdataset/impl/PmemVolumeManager.java | 2 +-
.../fsdataset/impl/ProvidedVolumeImpl.java | 2 +-
.../fsdataset/impl/RamDiskReplicaLruTracker.java | 2 +-
.../fsdataset/impl/RamDiskReplicaTracker.java | 2 +-
.../datanode/metrics/DataNodeDiskMetrics.java | 6 ++--
.../server/datanode/metrics/OutlierDetector.java | 4 +--
.../HostRestrictingAuthorizationFilterHandler.java | 2 +-
.../datanode/web/webhdfs/DataNodeUGIProvider.java | 6 ++--
.../datanode/web/webhdfs/ExceptionHandler.java | 2 +-
.../datanode/web/webhdfs/WebHdfsHandler.java | 2 +-
.../server/diskbalancer/command/CancelCommand.java | 2 +-
.../hdfs/server/diskbalancer/command/Command.java | 6 ++--
.../diskbalancer/command/ExecuteCommand.java | 2 +-
.../server/diskbalancer/command/HelpCommand.java | 2 +-
.../server/diskbalancer/command/PlanCommand.java | 4 +--
.../server/diskbalancer/command/QueryCommand.java | 2 +-
.../server/diskbalancer/command/ReportCommand.java | 4 +--
.../connectors/DBNameNodeConnector.java | 2 +-
.../diskbalancer/connectors/JsonNodeConnector.java | 2 +-
.../datamodel/DiskBalancerCluster.java | 2 +-
.../datamodel/DiskBalancerDataNode.java | 2 +-
.../datamodel/DiskBalancerVolumeSet.java | 2 +-
.../server/diskbalancer/planner/GreedyPlanner.java | 2 +-
.../hdfs/server/diskbalancer/planner/NodePlan.java | 2 +-
.../org/apache/hadoop/hdfs/server/mover/Mover.java | 6 ++--
.../hdfs/server/namenode/AclEntryStatusFormat.java | 2 +-
.../hadoop/hdfs/server/namenode/AclFeature.java | 4 +--
.../hadoop/hdfs/server/namenode/AclStorage.java | 6 ++--
.../hdfs/server/namenode/AclTransformation.java | 8 ++---
.../hadoop/hdfs/server/namenode/BackupImage.java | 4 +--
.../hadoop/hdfs/server/namenode/BackupNode.java | 2 +-
.../hadoop/hdfs/server/namenode/CacheManager.java | 8 ++---
.../hadoop/hdfs/server/namenode/CachePool.java | 2 +-
.../hdfs/server/namenode/CheckpointConf.java | 2 +-
.../hdfs/server/namenode/CheckpointSignature.java | 2 +-
.../hadoop/hdfs/server/namenode/Checkpointer.java | 4 +--
.../namenode/ContentSummaryComputationContext.java | 2 +-
.../server/namenode/EditLogBackupInputStream.java | 2 +-
.../server/namenode/EditLogFileInputStream.java | 6 ++--
.../server/namenode/EditLogFileOutputStream.java | 2 +-
.../hdfs/server/namenode/EditsDoubleBuffer.java | 2 +-
.../server/namenode/EncryptionFaultInjector.java | 2 +-
.../server/namenode/EncryptionZoneManager.java | 8 ++---
.../namenode/ErasureCodingPolicyManager.java | 4 +--
.../hadoop/hdfs/server/namenode/FSDirAclOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirAppendOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirAttrOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirConcatOp.java | 2 +-
.../server/namenode/FSDirEncryptionZoneOp.java | 4 +--
.../hdfs/server/namenode/FSDirErasureCodingOp.java | 4 +--
.../hadoop/hdfs/server/namenode/FSDirMkdirOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirRenameOp.java | 2 +-
.../namenode/FSDirSatisfyStoragePolicyOp.java | 2 +-
.../server/namenode/FSDirStatAndListingOp.java | 2 +-
.../hdfs/server/namenode/FSDirTruncateOp.java | 2 +-
.../hdfs/server/namenode/FSDirWriteFileOp.java | 2 +-
.../hadoop/hdfs/server/namenode/FSDirXAttrOp.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSDirectory.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSEditLog.java | 6 ++--
.../hdfs/server/namenode/FSEditLogAsync.java | 4 +--
.../hdfs/server/namenode/FSEditLogLoader.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSEditLogOp.java | 10 +++---
.../hadoop/hdfs/server/namenode/FSImage.java | 6 ++--
.../hadoop/hdfs/server/namenode/FSImageFormat.java | 4 +--
.../hdfs/server/namenode/FSImageFormatPBINode.java | 4 +--
.../server/namenode/FSImageFormatProtobuf.java | 4 +--
.../hdfs/server/namenode/FSImageSerialization.java | 2 +-
.../FSImageTransactionalStorageInspector.java | 4 +--
.../hadoop/hdfs/server/namenode/FSNamesystem.java | 14 ++++----
.../hdfs/server/namenode/FSNamesystemLock.java | 2 +-
.../hdfs/server/namenode/FSPermissionChecker.java | 2 +-
.../hdfs/server/namenode/FSTreeTraverser.java | 2 +-
.../hdfs/server/namenode/FileJournalManager.java | 10 +++---
.../apache/hadoop/hdfs/server/namenode/INode.java | 8 ++---
.../server/namenode/INodeAttributeProvider.java | 2 +-
.../hdfs/server/namenode/INodeDirectory.java | 4 +--
.../server/namenode/INodeDirectoryAttributes.java | 2 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 4 +--
.../hadoop/hdfs/server/namenode/INodeMap.java | 2 +-
.../hdfs/server/namenode/INodeReference.java | 2 +-
.../server/namenode/INodeWithAdditionalFields.java | 2 +-
.../hadoop/hdfs/server/namenode/INodesInPath.java | 2 +-
.../hadoop/hdfs/server/namenode/ImageServlet.java | 4 +--
.../namenode/InotifyFSEditLogOpTranslator.java | 2 +-
.../hadoop/hdfs/server/namenode/JournalSet.java | 8 ++---
.../hadoop/hdfs/server/namenode/LeaseManager.java | 6 ++--
.../hadoop/hdfs/server/namenode/NNStorage.java | 6 ++--
.../server/namenode/NNStorageRetentionManager.java | 8 ++---
.../hadoop/hdfs/server/namenode/NNUpgradeUtil.java | 2 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 10 +++---
.../hdfs/server/namenode/NameNodeHttpServer.java | 2 +-
.../server/namenode/NameNodeResourceChecker.java | 2 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 4 +--
.../hadoop/hdfs/server/namenode/NameNodeUtils.java | 2 +-
.../hadoop/hdfs/server/namenode/NamenodeFsck.java | 2 +-
.../server/namenode/QuotaByStorageTypeEntry.java | 2 +-
.../hadoop/hdfs/server/namenode/QuotaCounts.java | 2 +-
.../namenode/RedundantEditLogInputStream.java | 4 +--
.../hdfs/server/namenode/ReencryptionHandler.java | 6 ++--
.../hdfs/server/namenode/ReencryptionUpdater.java | 6 ++--
.../hdfs/server/namenode/SaveNamespaceContext.java | 2 +-
.../hdfs/server/namenode/SecondaryNameNode.java | 6 ++--
.../hdfs/server/namenode/TransferFsImage.java | 4 +--
.../hadoop/hdfs/server/namenode/XAttrFeature.java | 2 +-
.../hadoop/hdfs/server/namenode/XAttrFormat.java | 4 +--
.../server/namenode/XAttrPermissionFilter.java | 4 +--
.../hdfs/server/namenode/ha/BootstrapStandby.java | 4 +--
.../hdfs/server/namenode/ha/EditLogTailer.java | 8 ++---
.../server/namenode/ha/RemoteNameNodeInfo.java | 4 +--
.../server/namenode/ha/StandbyCheckpointer.java | 8 ++---
.../namenode/snapshot/AbstractINodeDiff.java | 2 +-
.../namenode/snapshot/DiffListBySkipList.java | 2 +-
.../snapshot/DirectorySnapshottableFeature.java | 6 ++--
.../snapshot/DirectoryWithSnapshotFeature.java | 2 +-
.../namenode/snapshot/FSImageFormatPBSnapshot.java | 4 +--
.../server/namenode/snapshot/SnapshotDiffInfo.java | 4 +--
.../namenode/snapshot/SnapshotDiffListingInfo.java | 2 +-
.../namenode/snapshot/SnapshotFSImageFormat.java | 2 +-
.../server/namenode/snapshot/SnapshotManager.java | 4 +--
.../sps/BlockStorageMovementAttemptedItems.java | 2 +-
.../namenode/sps/BlockStorageMovementNeeded.java | 2 +-
.../namenode/sps/StoragePolicySatisfier.java | 4 +--
.../namenode/sps/StoragePolicySatisfyManager.java | 2 +-
.../hdfs/server/namenode/top/TopAuditLogger.java | 2 +-
.../hadoop/hdfs/server/namenode/top/TopConf.java | 4 +--
.../server/namenode/top/metrics/TopMetrics.java | 2 +-
.../namenode/top/window/RollingWindowManager.java | 2 +-
.../web/resources/NamenodeWebHdfsMethods.java | 6 ++--
.../protocol/BlockECReconstructionCommand.java | 2 +-
.../hdfs/server/protocol/BlockRecoveryCommand.java | 2 +-
.../hdfs/server/protocol/BlocksWithLocations.java | 2 +-
.../hdfs/server/protocol/DatanodeRegistration.java | 2 +-
.../hadoop/hdfs/server/protocol/NamespaceInfo.java | 4 +--
.../hadoop/hdfs/server/protocol/RemoteEditLog.java | 2 +-
.../server/protocol/RemoteEditLogManifest.java | 4 +--
.../org/apache/hadoop/hdfs/tools/AdminHelper.java | 2 +-
.../org/apache/hadoop/hdfs/tools/CacheAdmin.java | 2 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 4 +--
.../org/apache/hadoop/hdfs/tools/DFSHAAdmin.java | 6 ++--
.../hadoop/hdfs/tools/DFSZKFailoverController.java | 2 +-
.../org/apache/hadoop/hdfs/tools/DebugAdmin.java | 2 +-
.../hadoop/hdfs/tools/DelegationTokenFetcher.java | 2 +-
.../hadoop/hdfs/tools/NNHAServiceTarget.java | 2 +-
.../offlineEditsViewer/OfflineEditsXmlLoader.java | 2 +-
.../offlineEditsViewer/StatisticsEditsVisitor.java | 2 +-
.../tools/offlineImageViewer/FSImageHandler.java | 2 +-
.../tools/offlineImageViewer/FSImageLoader.java | 8 ++---
.../FileDistributionCalculator.java | 2 +-
.../OfflineImageReconstructor.java | 6 ++--
.../PBImageCorruptionDetector.java | 2 +-
.../offlineImageViewer/PBImageTextWriter.java | 6 ++--
.../tools/offlineImageViewer/PBImageXmlWriter.java | 4 +--
.../offlineImageViewer/TextWriterImageVisitor.java | 2 +-
.../tools/offlineImageViewer/WebImageViewer.java | 2 +-
.../hadoop/hdfs/util/BestEffortLongFile.java | 4 +--
.../java/org/apache/hadoop/hdfs/util/Diff.java | 2 +-
.../org/apache/hadoop/hdfs/util/EnumCounters.java | 2 +-
.../org/apache/hadoop/hdfs/util/EnumDoubles.java | 2 +-
.../org/apache/hadoop/hdfs/util/MD5FileUtils.java | 2 +-
.../hadoop/hdfs/util/PersistentLongFile.java | 2 +-
.../apache/hadoop/hdfs/util/ReferenceCountMap.java | 4 +--
.../java/org/apache/hadoop/hdfs/web/JsonUtil.java | 4 +--
.../hdfs/web/resources/ExceptionHandler.java | 2 +-
.../hadoop/fs/TestEnhancedByteBufferAccess.java | 2 +-
.../java/org/apache/hadoop/fs/TestGlobPaths.java | 2 +-
.../fs/viewfs/TestViewFileSystemWithAcls.java | 2 +-
.../hadoop/fs/viewfs/TestViewFsWithAcls.java | 2 +-
.../apache/hadoop/hdfs/AdminStatesBaseTest.java | 2 +-
.../java/org/apache/hadoop/hdfs/DFSTestUtil.java | 14 ++++----
.../hdfs/ErasureCodeBenchmarkThroughput.java | 2 +-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 12 +++----
.../org/apache/hadoop/hdfs/MiniDFSNNTopology.java | 4 +--
.../apache/hadoop/hdfs/StripedFileTestUtil.java | 2 +-
.../hadoop/hdfs/TestAppendSnapshotTruncate.java | 2 +-
.../hadoop/hdfs/TestBatchedListDirectories.java | 2 +-
.../apache/hadoop/hdfs/TestBlockStoragePolicy.java | 4 +--
.../org/apache/hadoop/hdfs/TestDFSFinalize.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSRollback.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestDFSShell.java | 2 +-
.../TestDFSStripedOutputStreamWithFailureBase.java | 2 +-
.../org/apache/hadoop/hdfs/TestDFSUpgrade.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestDFSUtil.java | 2 +-
.../org/apache/hadoop/hdfs/TestDecommission.java | 2 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 2 +-
.../hadoop/hdfs/TestErasureCodingExerciseAPIs.java | 2 +-
.../org/apache/hadoop/hdfs/TestExtendedAcls.java | 2 +-
.../hadoop/hdfs/TestExternalBlockReader.java | 2 +-
.../apache/hadoop/hdfs/TestHDFSPolicyProvider.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestHdfsAdmin.java | 2 +-
.../hadoop/hdfs/TestLeaseRecoveryStriped.java | 2 +-
.../apache/hadoop/hdfs/TestMaintenanceState.java | 2 +-
.../org/apache/hadoop/hdfs/TestMiniDFSCluster.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestQuota.java | 4 +--
.../java/org/apache/hadoop/hdfs/TestSafeMode.java | 2 +-
.../hadoop/hdfs/TestSafeModeWithStripedFile.java | 2 +-
.../hdfs/TestTrashWithSecureEncryptionZones.java | 2 +-
.../org/apache/hadoop/hdfs/UpgradeUtilities.java | 6 ++--
.../hdfs/client/impl/TestBlockReaderFactory.java | 2 +-
.../hadoop/hdfs/net/TestDFSNetworkTopology.java | 2 +-
.../protocol/datatransfer/TestPacketReceiver.java | 2 +-
.../hadoop/hdfs/protocolPB/TestPBHelper.java | 8 ++---
.../hadoop/hdfs/qjournal/MiniJournalCluster.java | 4 +--
.../apache/hadoop/hdfs/qjournal/QJMTestUtil.java | 2 +-
.../hdfs/qjournal/client/TestEpochsAreUnique.java | 4 +--
.../hdfs/qjournal/client/TestQJMWithFaults.java | 6 ++--
.../hdfs/qjournal/client/TestQuorumCall.java | 6 ++--
.../qjournal/client/TestQuorumJournalManager.java | 2 +-
.../client/TestQuorumJournalManagerUnit.java | 10 +++---
.../client/TestSegmentRecoveryComparator.java | 2 +-
.../hadoop/hdfs/qjournal/server/TestJournal.java | 2 +-
.../hdfs/qjournal/server/TestJournalNode.java | 6 ++--
.../hdfs/qjournal/server/TestJournalNodeSync.java | 2 +-
.../qjournal/server/TestJournaledEditsCache.java | 2 +-
.../blockmanagement/BlockManagerTestUtil.java | 2 +-
.../server/blockmanagement/TestBlockManager.java | 8 ++---
.../TestBlockReportRateLimiting.java | 4 +--
.../TestPendingDataNodeMessages.java | 2 +-
.../blockmanagement/TestRBWBlockInvalidation.java | 2 +-
.../blockmanagement/TestSlowDiskTracker.java | 4 +--
.../impl/TestInMemoryLevelDBAliasMapClient.java | 4 +--
.../impl/TestLevelDbMockAliasMapClient.java | 2 +-
.../hdfs/server/datanode/FsDatasetTestUtils.java | 2 +-
.../server/datanode/InternalDataNodeTestUtils.java | 2 +-
.../hdfs/server/datanode/SimulatedFSDataset.java | 2 +-
.../hdfs/server/datanode/TestBPOfferService.java | 4 +--
.../hdfs/server/datanode/TestBlockRecovery.java | 2 +-
.../datanode/TestDataNodeHotSwapVolumes.java | 4 +--
.../hdfs/server/datanode/TestDataNodeMetrics.java | 2 +-
.../hdfs/server/datanode/TestDatanodeRegister.java | 2 +-
.../server/datanode/TestReadOnlySharedStorage.java | 2 +-
.../hdfs/server/datanode/TestRefreshNamenodes.java | 4 +--
.../datanode/checker/TestDatasetVolumeChecker.java | 4 +--
.../checker/TestThrottledAsyncChecker.java | 2 +-
.../checker/TestThrottledAsyncCheckerTimeout.java | 8 ++---
.../fsdataset/impl/FsDatasetImplTestUtils.java | 2 +-
.../fsdataset/impl/LazyPersistTestCase.java | 2 +-
.../impl/TestCacheByPmemMappableBlockLoader.java | 2 +-
.../fsdataset/impl/TestFsDatasetCache.java | 2 +-
.../datanode/fsdataset/impl/TestFsDatasetImpl.java | 2 +-
.../fsdataset/impl/TestPmemCacheRecovery.java | 2 +-
.../fsdataset/impl/TestScrLazyPersistFiles.java | 2 +-
.../datanode/metrics/TestSlowNodeDetector.java | 6 ++--
.../web/webhdfs/TestDataNodeUGIProvider.java | 2 +-
.../server/diskbalancer/DiskBalancerTestUtil.java | 2 +-
.../hdfs/server/diskbalancer/TestDiskBalancer.java | 2 +-
.../TestDiskBalancerWithMockMover.java | 2 +-
.../command/TestDiskBalancerCommand.java | 2 +-
.../apache/hadoop/hdfs/server/mover/TestMover.java | 2 +-
.../hadoop/hdfs/server/mover/TestStorageMover.java | 4 +--
.../hadoop/hdfs/server/namenode/FSAclBaseTest.java | 4 +--
.../hdfs/server/namenode/FSImageTestUtil.java | 14 ++++----
.../hdfs/server/namenode/FSXAttrBaseTest.java | 4 +--
.../server/namenode/NNThroughputBenchmark.java | 2 +-
.../hdfs/server/namenode/TestAclConfigFlag.java | 2 +-
.../server/namenode/TestAclTransformation.java | 4 +--
.../hdfs/server/namenode/TestAuditLogAtDebug.java | 2 +-
.../hdfs/server/namenode/TestAuditLogger.java | 2 +-
.../hdfs/server/namenode/TestBackupNode.java | 6 ++--
.../hdfs/server/namenode/TestCheckpoint.java | 10 +++---
.../hadoop/hdfs/server/namenode/TestEditLog.java | 4 +--
.../hdfs/server/namenode/TestFSDirectory.java | 4 +--
.../hdfs/server/namenode/TestFSEditLogLoader.java | 4 +--
.../hadoop/hdfs/server/namenode/TestFSImage.java | 2 +-
.../hdfs/server/namenode/TestFSImageWithAcl.java | 2 +-
.../server/namenode/TestFileJournalManager.java | 4 +--
.../hadoop/hdfs/server/namenode/TestFsck.java | 2 +-
.../namenode/TestINodeAttributeProvider.java | 4 +--
.../hadoop/hdfs/server/namenode/TestINodeFile.java | 2 +-
.../hdfs/server/namenode/TestLeaseManager.java | 2 +-
.../namenode/TestNNStorageRetentionFunctional.java | 2 +-
.../namenode/TestNNStorageRetentionManager.java | 8 ++---
.../hdfs/server/namenode/TestNameEditsConfigs.java | 4 +--
.../hdfs/server/namenode/TestNameNodeMXBean.java | 2 +-
.../hdfs/server/namenode/TestNameNodeRecovery.java | 2 +-
.../server/namenode/TestProtectedDirectories.java | 6 ++--
.../namenode/TestSecondaryNameNodeUpgrade.java | 2 +-
.../namenode/TestStartupProgressServlet.java | 2 +-
.../hdfs/server/namenode/TestStorageRestore.java | 2 +-
.../hdfs/server/namenode/TestTransferFsImage.java | 2 +-
.../hadoop/hdfs/server/namenode/ha/HATestUtil.java | 2 +-
.../server/namenode/ha/TestBootstrapStandby.java | 2 +-
.../namenode/ha/TestBootstrapStandbyWithQJM.java | 2 +-
.../server/namenode/ha/TestDFSUpgradeWithHA.java | 2 +-
.../hdfs/server/namenode/ha/TestDNFencing.java | 2 +-
.../namenode/ha/TestDelegationTokensWithHA.java | 2 +-
.../namenode/ha/TestEditLogsDuringFailover.java | 4 +--
.../server/namenode/ha/TestFailureOfSharedDir.java | 2 +-
.../server/namenode/ha/TestFailureToReadEdits.java | 2 +-
.../server/namenode/ha/TestHAConfiguration.java | 2 +-
.../hdfs/server/namenode/ha/TestHASafeMode.java | 2 +-
.../server/namenode/ha/TestHAStateTransitions.java | 2 +-
.../namenode/ha/TestObserverReadProxyProvider.java | 2 +-
.../server/namenode/ha/TestStandbyCheckpoints.java | 6 ++--
.../namenode/ha/TestStandbyInProgressTail.java | 4 +--
.../namenode/metrics/TestNameNodeMetrics.java | 2 +-
.../namenode/snapshot/TestAclWithSnapshot.java | 2 +-
.../snapshot/TestFileWithSnapshotFeature.java | 2 +-
.../hdfs/shortcircuit/TestShortCircuitCache.java | 4 +--
.../org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 2 +-
.../hadoop/hdfs/tools/TestDFSAdminWithHA.java | 2 +-
.../apache/hadoop/hdfs/tools/TestDFSHAAdmin.java | 4 +--
.../hdfs/tools/TestDFSHAAdminMiniCluster.java | 6 ++--
.../org/apache/hadoop/hdfs/tools/TestGetConf.java | 2 +-
...stViewFileSystemOverloadSchemeWithDFSAdmin.java | 2 +-
...ViewFileSystemOverloadSchemeWithFSCommands.java | 2 +-
.../offlineEditsViewer/TestOfflineEditsViewer.java | 2 +-
.../offlineImageViewer/TestOfflineImageViewer.java | 6 ++--
.../TestOfflineImageViewerForAcl.java | 4 +--
.../hdfs/util/TestAtomicFileOutputStream.java | 2 +-
.../hadoop/hdfs/util/TestStripedBlockUtil.java | 2 +-
.../org/apache/hadoop/hdfs/web/TestJsonUtil.java | 2 +-
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 2 +-
.../java/org/apache/hadoop/tools/TestTools.java | 4 +--
.../hadoop/mapred/LocalContainerLauncher.java | 4 +--
.../hadoop/mapred/TaskAttemptListenerImpl.java | 2 +-
.../java/org/apache/hadoop/mapred/YarnChild.java | 2 +-
.../jobhistory/JobHistoryEventHandler.java | 2 +-
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 2 +-
.../mapreduce/v2/app/TaskHeartbeatHandler.java | 2 +-
.../v2/app/commit/CommitterEventHandler.java | 2 +-
.../hadoop/mapreduce/v2/app/job/impl/JobImpl.java | 4 +--
.../mapreduce/v2/app/job/impl/TaskAttemptImpl.java | 4 +--
.../hadoop/mapreduce/v2/app/job/impl/TaskImpl.java | 2 +-
.../v2/app/launcher/ContainerLauncherImpl.java | 2 +-
.../hadoop/mapreduce/v2/app/rm/RMCommunicator.java | 2 +-
.../mapreduce/v2/app/rm/RMContainerAllocator.java | 2 +-
.../mapreduce/v2/app/rm/RMContainerRequestor.java | 2 +-
.../v2/app/speculate/DefaultSpeculator.java | 2 +-
.../mapreduce/v2/app/webapp/AMWebServices.java | 2 +-
.../mapreduce/v2/app/webapp/AppController.java | 2 +-
.../hadoop/mapreduce/v2/app/MockAppContext.java | 2 +-
.../apache/hadoop/mapreduce/v2/app/MockJobs.java | 6 ++--
.../mapreduce/v2/app/job/impl/TestTaskAttempt.java | 4 +--
.../mapreduce/v2/app/webapp/TestAMWebApp.java | 2 +-
.../mapreduce/v2/app/webapp/TestAMWebServices.java | 2 +-
.../mapred/LocalDistributedCacheManager.java | 4 +--
.../org/apache/hadoop/mapred/LocalJobRunner.java | 2 +-
.../apache/hadoop/mapreduce/v2/util/MRApps.java | 2 +-
.../hadoop/mapreduce/v2/util/MRWebAppUtil.java | 4 +--
.../v2/jobhistory/TestJobHistoryUtils.java | 2 +-
.../java/org/apache/hadoop/mapred/Counters.java | 2 +-
.../org/apache/hadoop/mapred/FileInputFormat.java | 2 +-
.../java/org/apache/hadoop/mapred/JobConf.java | 2 +-
.../org/apache/hadoop/mapred/JobQueueClient.java | 2 +-
.../hadoop/mapred/LocatedFileStatusFetcher.java | 16 +++++-----
.../main/java/org/apache/hadoop/mapred/Task.java | 2 +-
.../java/org/apache/hadoop/mapred/TaskLog.java | 2 +-
.../org/apache/hadoop/mapred/TextInputFormat.java | 2 +-
.../java/org/apache/hadoop/mapreduce/Cluster.java | 2 +-
.../main/java/org/apache/hadoop/mapreduce/Job.java | 2 +-
.../hadoop/mapreduce/JobResourceUploader.java | 2 +-
.../hadoop/mapreduce/JobSubmissionFiles.java | 2 +-
.../org/apache/hadoop/mapreduce/JobSubmitter.java | 2 +-
.../hadoop/mapreduce/counters/AbstractCounter.java | 2 +-
.../mapreduce/counters/AbstractCounterGroup.java | 2 +-
.../mapreduce/counters/AbstractCounters.java | 6 ++--
.../mapreduce/counters/CounterGroupFactory.java | 4 +--
.../mapreduce/counters/FileSystemCounterGroup.java | 10 +++---
.../mapreduce/counters/FrameworkCounterGroup.java | 6 ++--
.../hadoop/mapreduce/jobhistory/EventWriter.java | 2 +-
.../jobhistory/JobUnsuccessfulCompletionEvent.java | 2 +-
.../lib/input/CombineFileInputFormat.java | 6 ++--
.../mapreduce/lib/input/FileInputFormat.java | 2 +-
.../mapreduce/lib/input/TextInputFormat.java | 2 +-
.../mapreduce/lib/output/FileOutputCommitter.java | 4 +--
.../mapreduce/lib/output/FileOutputFormat.java | 2 +-
.../lib/output/NamedCommitterFactory.java | 2 +-
.../lib/output/PartialFileOutputCommitter.java | 2 +-
.../mapreduce/lib/output/PathOutputCommitter.java | 2 +-
.../mapreduce/security/SecureShuffleUtils.java | 2 +-
.../hadoop/mapreduce/task/reduce/Fetcher.java | 2 +-
.../mapreduce/task/reduce/MergeManagerImpl.java | 2 +-
.../mapreduce/task/reduce/OnDiskMapOutput.java | 2 +-
.../task/reduce/ShuffleClientMetrics.java | 2 +-
.../task/reduce/ShuffleSchedulerImpl.java | 2 +-
.../org/apache/hadoop/mapreduce/tools/CLI.java | 4 +--
.../hadoop/mapreduce/util/CountersStrings.java | 2 +-
.../apache/hadoop/mapred/TestFileInputFormat.java | 2 +-
.../mapreduce/lib/input/TestFileInputFormat.java | 4 +--
.../mapreduce/v2/hs/CachedHistoryStorage.java | 14 ++++----
.../mapreduce/v2/hs/HistoryClientService.java | 2 +-
.../hadoop/mapreduce/v2/hs/HistoryFileManager.java | 4 +--
.../apache/hadoop/mapreduce/v2/hs/JobHistory.java | 4 +--
.../hadoop/mapreduce/v2/hs/JobHistoryServer.java | 2 +-
.../mapreduce/v2/hs/server/HSAdminServer.java | 2 +-
.../mapreduce/v2/hs/webapp/HsWebServices.java | 2 +-
.../hadoop/mapreduce/v2/hs/webapp/dao/JobInfo.java | 2 +-
.../hadoop/mapreduce/v2/hs/MockHistoryJobs.java | 2 +-
.../hadoop/mapreduce/v2/hs/TestJobHistory.java | 2 +-
.../v2/hs/webapp/TestHsWebServicesLogs.java | 2 +-
.../hadoop/mapred/ClientServiceDelegate.java | 2 +-
.../apache/hadoop/mapred/ResourceMgrDelegate.java | 2 +-
.../java/org/apache/hadoop/mapred/YARNRunner.java | 2 +-
.../hadoop/mapred/TestMRTimelineEventHandling.java | 2 +-
.../org/apache/hadoop/mapred/TestYARNRunner.java | 4 +--
.../lib/input/TestCombineFileInputFormat.java | 2 +-
.../NativeMapOutputCollectorDelegator.java | 2 +-
.../hadoop/mapred/nativetask/NativeRuntime.java | 2 +-
.../nativetask/buffer/ByteBufferDataWriter.java | 2 +-
.../hadoop/mapred/nativetask/util/BytesUtil.java | 4 +--
.../hadoop/mapred/nativetask/util/ConfigUtil.java | 2 +-
.../mapred/nativetask/util/ReadWriteBuffer.java | 2 +-
.../hadoop/mapred/nativetask/kvtest/KVJob.java | 2 +-
.../hadoop/mapred/nativetask/kvtest/KVTest.java | 4 +--
.../mapred/nativetask/testutil/BytesFactory.java | 6 ++--
.../mapred/nativetask/utils/TestBytesUtil.java | 4 +--
.../apache/hadoop/mapred/FadvisedChunkedFile.java | 2 +-
.../apache/hadoop/mapred/FadvisedFileRegion.java | 2 +-
.../org/apache/hadoop/mapred/ShuffleHandler.java | 14 ++++----
.../hadoop/mapred/uploader/FrameworkUploader.java | 2 +-
.../mapred/uploader/TestFrameworkUploader.java | 2 +-
.../hadoop-mapreduce-client/pom.xml | 4 +--
.../hadoop-mapreduce-examples/pom.xml | 4 +--
.../hadoop/examples/BaileyBorweinPlouffe.java | 2 +-
.../java/org/apache/hadoop/examples/WordMean.java | 2 +-
.../org/apache/hadoop/examples/WordMedian.java | 2 +-
.../hadoop/examples/WordStandardDeviation.java | 2 +-
.../examples/dancing/DistributedPentomino.java | 2 +-
.../org/apache/hadoop/examples/dancing/Sudoku.java | 2 +-
.../java/org/apache/hadoop/examples/pi/Parser.java | 2 +-
.../java/org/apache/hadoop/examples/pi/Util.java | 2 +-
.../hadoop/examples/terasort/TeraScheduler.java | 2 +-
hadoop-maven-plugins/pom.xml | 4 +++
.../maven/plugin/resourcegz/ResourceGzMojo.java | 2 +-
hadoop-project/pom.xml | 37 ++++++++++++++++++++--
.../fs/aliyun/oss/AliyunOSSBlockOutputStream.java | 8 ++---
.../hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java | 4 +--
.../hadoop/fs/aliyun/oss/AliyunOSSInputStream.java | 2 +-
.../hadoop/fs/aliyun/oss/AliyunOSSUtils.java | 2 +-
hadoop-tools/hadoop-archive-logs/pom.xml | 4 +--
.../org/apache/hadoop/tools/HadoopArchiveLogs.java | 2 +-
.../hadoop/tools/HadoopArchiveLogsRunner.java | 2 +-
.../org/apache/hadoop/tools/HadoopArchives.java | 2 +-
.../apache/hadoop/fs/s3a/AWSClientIOException.java | 2 +-
.../hadoop/fs/s3a/AWSCredentialProviderList.java | 4 +--
.../hadoop/fs/s3a/FailureInjectionPolicy.java | 2 +-
.../hadoop/fs/s3a/InconsistentAmazonS3Client.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/Invoker.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/Listing.java | 4 +--
.../apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 10 +++---
.../org/apache/hadoop/fs/s3a/S3ADataBlocks.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 6 ++--
.../org/apache/hadoop/fs/s3a/S3AInputStream.java | 4 +--
.../apache/hadoop/fs/s3a/S3AInstrumentation.java | 2 +-
.../apache/hadoop/fs/s3a/S3ALocatedFileStatus.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AOpContext.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3AReadOpContext.java | 4 +--
.../org/apache/hadoop/fs/s3a/S3ARetryPolicy.java | 2 +-
.../java/org/apache/hadoop/fs/s3a/S3AUtils.java | 6 ++--
.../fs/s3a/SimpleAWSCredentialsProvider.java | 2 +-
.../apache/hadoop/fs/s3a/WriteOperationHelper.java | 6 ++--
.../auth/AbstractSessionCredentialsProvider.java | 2 +-
.../fs/s3a/auth/AssumedRoleCredentialProvider.java | 4 +--
.../fs/s3a/auth/MarshalledCredentialBinding.java | 2 +-
.../fs/s3a/auth/MarshalledCredentialProvider.java | 2 +-
.../hadoop/fs/s3a/auth/MarshalledCredentials.java | 2 +-
.../org/apache/hadoop/fs/s3a/auth/RoleModel.java | 2 +-
.../apache/hadoop/fs/s3a/auth/RolePolicies.java | 2 +-
.../hadoop/fs/s3a/auth/STSClientFactory.java | 2 +-
.../fs/s3a/auth/delegation/AbstractDTService.java | 2 +-
.../delegation/FullCredentialsTokenBinding.java | 2 +-
.../fs/s3a/auth/delegation/RoleTokenBinding.java | 4 +--
.../s3a/auth/delegation/S3ADelegationTokens.java | 6 ++--
.../s3a/auth/delegation/SessionTokenBinding.java | 2 +-
.../hadoop/fs/s3a/commit/AbstractS3ACommitter.java | 6 ++--
.../hadoop/fs/s3a/commit/CommitOperations.java | 2 +-
.../hadoop/fs/s3a/commit/MagicCommitPaths.java | 2 +-
.../fs/s3a/commit/files/SinglePendingCommit.java | 2 +-
.../fs/s3a/commit/magic/MagicCommitTracker.java | 2 +-
.../apache/hadoop/fs/s3a/commit/staging/Paths.java | 12 +++----
.../fs/s3a/commit/staging/StagingCommitter.java | 2 +-
.../hadoop/fs/s3a/impl/AbstractStoreOperation.java | 2 +-
.../hadoop/fs/s3a/impl/ChangeDetectionPolicy.java | 2 +-
.../apache/hadoop/fs/s3a/impl/ChangeTracker.java | 4 +--
.../apache/hadoop/fs/s3a/impl/DeleteOperation.java | 4 +--
.../fs/s3a/impl/ExecutingStoreOperation.java | 2 +-
.../hadoop/fs/s3a/impl/InternalConstants.java | 2 +-
.../fs/s3a/impl/MultiObjectDeleteSupport.java | 4 +--
.../apache/hadoop/fs/s3a/impl/RenameOperation.java | 4 +--
.../hadoop/fs/s3a/impl/S3AMultipartUploader.java | 6 ++--
.../apache/hadoop/fs/s3a/impl/StoreContext.java | 2 +-
.../hadoop/fs/s3a/impl/StoreContextBuilder.java | 2 +-
.../s3a/s3guard/AuthoritativeAuditOperation.java | 2 +-
.../hadoop/fs/s3a/s3guard/DescendantsIterator.java | 2 +-
.../hadoop/fs/s3a/s3guard/DirListingMetadata.java | 2 +-
.../fs/s3a/s3guard/DumpS3GuardDynamoTable.java | 4 +--
.../fs/s3a/s3guard/DynamoDBClientFactory.java | 2 +-
.../fs/s3a/s3guard/DynamoDBMetadataStore.java | 8 ++---
.../s3guard/DynamoDBMetadataStoreTableManager.java | 4 +--
.../hadoop/fs/s3a/s3guard/ImportOperation.java | 2 +-
.../hadoop/fs/s3a/s3guard/LocalMetadataStore.java | 8 ++---
.../hadoop/fs/s3a/s3guard/MetadataStore.java | 2 +-
.../s3guard/MetadataStoreListFilesIterator.java | 2 +-
.../apache/hadoop/fs/s3a/s3guard/PathMetadata.java | 2 +-
.../s3guard/PathMetadataDynamoDBTranslation.java | 4 +--
.../fs/s3a/s3guard/ProgressiveRenameTracker.java | 2 +-
.../fs/s3a/s3guard/PurgeS3GuardDynamoTable.java | 2 +-
.../hadoop/fs/s3a/s3guard/RenameTracker.java | 2 +-
.../org/apache/hadoop/fs/s3a/s3guard/S3Guard.java | 4 +--
.../apache/hadoop/fs/s3a/s3guard/S3GuardFsck.java | 2 +-
.../hadoop/fs/s3a/s3guard/S3GuardTableAccess.java | 2 +-
.../apache/hadoop/fs/s3a/s3guard/S3GuardTool.java | 4 +--
.../apache/hadoop/fs/s3a/select/SelectBinding.java | 4 +--
.../hadoop/fs/s3a/select/SelectInputStream.java | 4 +--
.../org/apache/hadoop/fs/s3a/tools/MarkerTool.java | 4 +--
.../apache/hadoop/fs/s3native/S3xLoginHelper.java | 4 +--
.../fs/contract/s3a/ITestS3AContractSeek.java | 2 +-
.../ITestBlockingThreadPoolExecutorService.java | 2 +-
.../hadoop/fs/s3a/ITestS3AFailureHandling.java | 2 +-
.../hadoop/fs/s3a/ITestS3ARemoteFileChanged.java | 2 +-
.../hadoop/fs/s3a/ITestS3GuardListConsistency.java | 2 +-
.../apache/hadoop/fs/s3a/MockS3AFileSystem.java | 2 +-
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 2 +-
.../hadoop/fs/s3a/StorageStatisticsTracker.java | 2 +-
.../fs/s3a/TestS3AAWSCredentialsProvider.java | 2 +-
.../delegation/ILoadTestSessionCredentials.java | 2 +-
.../delegation/MiniKerberizedHadoopCluster.java | 2 +-
.../fs/s3a/commit/AbstractYarnClusterITest.java | 2 +-
.../fs/s3a/commit/ITestCommitOperations.java | 2 +-
.../hadoop/fs/s3a/commit/TestMagicCommitPaths.java | 2 +-
.../org/apache/hadoop/fs/s3a/commit/TestTasks.java | 2 +-
.../commit/integration/ITestS3ACommitterMRJob.java | 2 +-
.../fs/s3a/commit/staging/StagingTestBase.java | 4 +--
.../staging/TestDirectoryCommitterScale.java | 2 +-
.../s3a/commit/staging/TestStagingCommitter.java | 2 +-
.../staging/TestStagingPartitionedFileListing.java | 2 +-
.../staging/TestStagingPartitionedTaskCommit.java | 4 +--
.../fs/s3a/impl/ITestPartialRenamesDeletes.java | 4 +--
.../fs/s3a/impl/TestPartialDeleteFailures.java | 2 +-
.../s3a/s3guard/AbstractS3GuardToolTestBase.java | 2 +-
.../fs/s3a/s3guard/ITestDynamoDBMetadataStore.java | 4 +--
.../s3guard/ITestDynamoDBMetadataStoreScale.java | 2 +-
.../s3a/s3guard/ITestS3GuardDDBRootOperations.java | 2 +-
.../fs/s3a/s3guard/MetadataStoreTestBase.java | 2 +-
.../fs/s3a/s3guard/TestLocalMetadataStore.java | 6 ++--
.../TestPathMetadataDynamoDBTranslation.java | 2 +-
.../fs/s3a/s3guard/TestPathOrderComparators.java | 2 +-
.../scale/ILoadTestS3ABulkDeleteThrottling.java | 4 +--
.../org/apache/hadoop/fs/s3a/select/CsvFile.java | 2 +-
.../hadoop/fs/s3a/select/ITestS3SelectCLI.java | 2 +-
.../org/apache/hadoop/fs/adl/AdlFileSystem.java | 4 +--
hadoop-tools/hadoop-azure/pom.xml | 4 +--
.../azure/AzureFileSystemThreadPoolExecutor.java | 2 +-
.../fs/azure/AzureNativeFileSystemStore.java | 2 +-
.../hadoop/fs/azure/BlockBlobAppendStream.java | 4 +--
.../apache/hadoop/fs/azure/CachingAuthorizer.java | 4 +--
.../hadoop/fs/azure/ClientThrottlingAnalyzer.java | 4 +--
.../hadoop/fs/azure/NativeAzureFileSystem.java | 4 +--
.../fs/azure/NativeAzureFileSystemHelper.java | 2 +-
.../hadoop/fs/azure/NativeFileSystemStore.java | 2 +-
.../hadoop/fs/azure/PageBlobOutputStream.java | 2 +-
.../hadoop/fs/azure/RemoteWasbAuthorizerImpl.java | 2 +-
.../apache/hadoop/fs/azure/SelfRenewingLease.java | 2 +-
.../java/org/apache/hadoop/fs/azure/WasbFsck.java | 2 +-
.../hadoop/fs/azure/WasbRemoteCallHelper.java | 2 +-
.../hadoop/fs/azurebfs/AbfsConfiguration.java | 4 +--
.../hadoop/fs/azurebfs/AbfsCountersImpl.java | 2 +-
.../hadoop/fs/azurebfs/AzureBlobFileSystem.java | 4 +--
.../fs/azurebfs/AzureBlobFileSystemStore.java | 6 ++--
.../fs/azurebfs/oauth2/AzureADAuthenticator.java | 2 +-
.../azurebfs/oauth2/ClientCredsTokenProvider.java | 2 +-
.../oauth2/CustomTokenProviderAdapter.java | 2 +-
.../fs/azurebfs/oauth2/IdentityTransformer.java | 2 +-
.../oauth2/RefreshTokenBasedTokenProvider.java | 2 +-
.../azurebfs/oauth2/UserPasswordTokenProvider.java | 2 +-
.../security/AbfsDelegationTokenManager.java | 4 +--
.../hadoop/fs/azurebfs/services/AbfsClient.java | 4 +--
.../services/AbfsClientThrottlingAnalyzer.java | 4 +--
.../hadoop/fs/azurebfs/services/AbfsCounters.java | 2 +-
.../fs/azurebfs/services/AbfsInputStream.java | 4 +--
.../fs/azurebfs/services/AbfsOutputStream.java | 4 +--
.../fs/azurebfs/services/AbfsRestOperation.java | 2 +-
.../azurebfs/services/ExponentialRetryPolicy.java | 2 +-
.../fs/azurebfs/services/ReadBufferManager.java | 2 +-
.../hadoop/fs/azurebfs/utils/CachedSASToken.java | 2 +-
.../utils/TextFileBasedIdentityHandler.java | 4 +--
.../TestNativeAzureFileSystemAuthorization.java | 2 +-
.../fs/azurebfs/ITestAbfsIdentityTransformer.java | 2 +-
.../ITestAzureBlobFileSystemCheckAccess.java | 4 +--
.../fs/azurebfs/ITestAzureBlobFilesystemAcl.java | 2 +-
.../extensions/ClassicDelegationTokenManager.java | 2 +-
.../extensions/StubAbfsTokenIdentifier.java | 2 +-
.../java/org/apache/hadoop/tools/CopyListing.java | 2 +-
.../apache/hadoop/tools/CopyListingFileStatus.java | 6 ++--
.../main/java/org/apache/hadoop/tools/DistCp.java | 4 +--
.../org/apache/hadoop/tools/DistCpOptions.java | 4 +--
.../org/apache/hadoop/tools/OptionsParser.java | 2 +-
.../org/apache/hadoop/tools/RegexCopyFilter.java | 2 +-
.../org/apache/hadoop/tools/SimpleCopyListing.java | 4 +--
.../hadoop/tools/mapred/DeletedDirTracker.java | 6 ++--
.../tools/mapred/RetriableFileCopyCommand.java | 2 +-
.../org/apache/hadoop/tools/util/DistCpUtils.java | 2 +-
.../hadoop/tools/TestDistCpWithRawXAttrs.java | 2 +-
.../apache/hadoop/tools/TestDistCpWithXAttrs.java | 2 +-
.../apache/hadoop/tools/util/TestDistCpUtils.java | 2 +-
.../hadoop-dynamometer-infra/pom.xml | 4 +--
.../apache/hadoop/tools/dynamometer/AMOptions.java | 2 +-
.../tools/dynamometer/ApplicationMaster.java | 6 ++--
.../apache/hadoop/tools/dynamometer/Client.java | 10 +++---
.../hadoop/tools/dynamometer/DynoInfraUtils.java | 2 +-
.../tools/dynamometer/TestDynamometerInfra.java | 2 +-
.../workloadgenerator/CreateFileMapper.java | 2 +-
.../audit/AuditLogDirectParser.java | 2 +-
.../workloadgenerator/audit/AuditReplayMapper.java | 2 +-
.../workloadgenerator/audit/AuditReplayThread.java | 2 +-
.../hadoop/hdfs/server/namenode/ImageWriter.java | 2 +-
.../hadoop/hdfs/server/namenode/TreePath.java | 2 +-
.../TotalHeapUsageEmulatorPlugin.java | 2 +-
.../org/apache/hadoop/metrics2/sink/KafkaSink.java | 2 +-
.../hadoop/metrics2/impl/TestKafkaMetrics.java | 2 +-
.../hadoop/yarn/sls/appmaster/DAGAMSimulator.java | 2 +-
.../hadoop/yarn/sls/nodemanager/NMSimulator.java | 2 +-
.../yarn/sls/scheduler/FairSchedulerMetrics.java | 2 +-
.../hadoop-yarn/hadoop-yarn-api/pom.xml | 4 +--
.../yarn/api/records/ResourceInformation.java | 4 +--
.../org/apache/hadoop/yarn/api/records/URL.java | 2 +-
.../records/timeline/TimelineEntityGroupId.java | 2 +-
.../java/org/apache/hadoop/yarn/conf/HAUtil.java | 2 +-
.../util/constraint/PlacementConstraintParser.java | 2 +-
.../hadoop/yarn/util/csi/CsiConfigUtils.java | 2 +-
.../hadoop/yarn/util/resource/ResourceUtils.java | 2 +-
.../resource/TestPlacementConstraintParser.java | 2 +-
.../hadoop/yarn/conf/TestResourceInformation.java | 4 +--
.../pom.xml | 4 +--
.../distributedshell/ApplicationMaster.java | 4 +--
.../yarn/applications/distributedshell/Client.java | 4 +--
.../TestDSWithMultipleNodeManager.java | 2 +-
.../hadoop-yarn-services-api/pom.xml | 4 +--
.../yarn/service/client/ApiServiceClient.java | 4 +--
.../service/client/SystemServiceManagerImpl.java | 2 +-
.../hadoop/yarn/service/webapp/ApiServer.java | 6 ++--
.../apache/hadoop/yarn/service/TestApiServer.java | 2 +-
.../yarn/service/client/TestApiServiceClient.java | 2 +-
.../hadoop-yarn-services-core/pom.xml | 4 +--
.../apache/hadoop/yarn/service/ServiceContext.java | 4 +--
.../apache/hadoop/yarn/service/ServiceManager.java | 4 +--
.../apache/hadoop/yarn/service/ServiceMaster.java | 2 +-
.../hadoop/yarn/service/ServiceScheduler.java | 6 ++--
.../service/api/records/ResourceInformation.java | 4 +--
.../hadoop/yarn/service/client/ServiceClient.java | 2 +-
.../hadoop/yarn/service/component/Component.java | 4 +--
.../yarn/service/component/ComponentEvent.java | 2 +-
.../component/instance/ComponentInstance.java | 2 +-
.../component/instance/ComponentInstanceEvent.java | 2 +-
.../service/containerlaunch/AbstractLauncher.java | 4 +--
.../containerlaunch/CommandLineBuilder.java | 2 +-
.../containerlaunch/ContainerLaunchService.java | 2 +-
.../containerlaunch/JavaCommandLineBuilder.java | 2 +-
.../yarn/service/provider/ProviderService.java | 2 +-
.../defaultImpl/DefaultClientProvider.java | 2 +-
.../registry/YarnRegistryViewForProviders.java | 2 +-
.../yarn/service/utils/ClientRegistryBinder.java | 2 +-
.../hadoop/yarn/service/utils/ConfigHelper.java | 2 +-
.../hadoop/yarn/service/utils/CoreFileSystem.java | 2 +-
.../utils/PublishedConfigurationOutputter.java | 4 +--
.../hadoop/yarn/service/utils/ServiceApiUtil.java | 10 +++---
.../hadoop/yarn/service/utils/ServiceUtils.java | 2 +-
.../hadoop/yarn/service/utils/ZookeeperUtils.java | 2 +-
.../yarn/service/MockRunningServiceContext.java | 2 +-
.../apache/hadoop/yarn/service/MockServiceAM.java | 2 +-
.../hadoop/yarn/service/ServiceTestUtils.java | 6 ++--
.../TestDefaultUpgradeComponentsFinder.java | 2 +-
.../apache/hadoop/yarn/service/TestServiceAM.java | 2 +-
.../yarn/service/TestYarnNativeServices.java | 4 +--
.../yarn/service/client/TestServiceClient.java | 2 +-
.../component/instance/TestComponentInstance.java | 2 +-
.../provider/TestAbstractProviderService.java | 2 +-
.../hadoop/yarn/service/utils/TestFilterUtils.java | 2 +-
.../hadoop-yarn/hadoop-yarn-client/pom.xml | 4 +--
.../apache/hadoop/yarn/client/api/AMRMClient.java | 6 ++--
.../hadoop/yarn/client/api/NMTokenCache.java | 2 +-
.../yarn/client/api/async/AMRMClientAsync.java | 4 +--
.../yarn/client/api/async/NMClientAsync.java | 2 +-
.../client/api/async/impl/AMRMClientAsyncImpl.java | 2 +-
.../client/api/async/impl/NMClientAsyncImpl.java | 4 +--
.../yarn/client/api/impl/AHSv2ClientImpl.java | 2 +-
.../yarn/client/api/impl/AMRMClientImpl.java | 6 ++--
.../api/impl/ContainerManagementProtocolProxy.java | 2 +-
.../hadoop/yarn/client/api/impl/NMClientImpl.java | 2 +-
.../client/api/impl/SharedCacheClientImpl.java | 2 +-
.../yarn/client/api/impl/YarnClientImpl.java | 2 +-
.../hadoop/yarn/client/cli/ApplicationCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/ClusterCLI.java | 2 +-
.../org/apache/hadoop/yarn/client/cli/LogsCLI.java | 2 +-
.../hadoop/yarn/client/cli/NodeAttributesCLI.java | 4 +--
.../apache/hadoop/yarn/client/cli/QueueCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/RMAdminCLI.java | 4 +--
.../hadoop/yarn/client/cli/SchedConfCLI.java | 2 +-
.../org/apache/hadoop/yarn/client/cli/TopCLI.java | 6 ++--
.../hadoop/yarn/client/util/YarnClientUtils.java | 4 +--
.../hadoop/yarn/client/cli/TestClusterCLI.java | 2 +-
.../apache/hadoop/yarn/client/cli/TestLogsCLI.java | 2 +-
.../yarn/client/cli/TestNodeAttributesCLI.java | 10 +++---
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 +--
.../apache/hadoop/yarn/client/cli/TestYarnCLI.java | 4 +--
.../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 +--
.../impl/pb/GetNodesToLabelsResponsePBImpl.java | 2 +-
.../impl/pb/GetPluginInfoRequestPBImpl.java | 2 +-
.../impl/pb/GetPluginInfoResponsePBImpl.java | 2 +-
.../impl/pb/NodePublishVolumeRequestPBImpl.java | 4 +--
.../impl/pb/NodePublishVolumeResponsePBImpl.java | 2 +-
.../impl/pb/NodeUnpublishVolumeRequestPBImpl.java | 2 +-
.../impl/pb/NodeUnpublishVolumeResponsePBImpl.java | 2 +-
.../ValidateVolumeCapabilitiesRequestPBImpl.java | 2 +-
.../ValidateVolumeCapabilitiesResponsePBImpl.java | 2 +-
.../impl/pb/ApplicationAttemptIdPBImpl.java | 2 +-
.../api/records/impl/pb/ApplicationIdPBImpl.java | 2 +-
.../api/records/impl/pb/ContainerIdPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/NodeIdPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/ProtoUtils.java | 4 +--
.../api/records/impl/pb/ReservationIdPBImpl.java | 2 +-
.../api/records/impl/pb/ResourceOptionPBImpl.java | 2 +-
.../yarn/api/records/impl/pb/ResourcePBImpl.java | 4 +--
.../apache/hadoop/yarn/client/ClientRMProxy.java | 4 +--
.../org/apache/hadoop/yarn/client/RMProxy.java | 2 +-
.../org/apache/hadoop/yarn/client/ServerProxy.java | 2 +-
.../yarn/client/api/impl/TimelineClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineConnector.java | 6 ++--
.../client/api/impl/TimelineReaderClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineV2ClientImpl.java | 2 +-
.../yarn/client/api/impl/TimelineWriter.java | 2 +-
.../apache/hadoop/yarn/event/AsyncDispatcher.java | 2 +-
.../apache/hadoop/yarn/event/EventDispatcher.java | 2 +-
.../AggregatedLogDeletionService.java | 2 +-
.../yarn/logaggregation/AggregatedLogFormat.java | 6 ++--
.../yarn/logaggregation/LogAggregationUtils.java | 2 +-
.../hadoop/yarn/logaggregation/LogCLIHelpers.java | 2 +-
.../LogAggregationFileController.java | 2 +-
.../LogAggregationFileControllerFactory.java | 4 +--
.../ifile/LogAggregationIndexedFileController.java | 2 +-
.../yarn/nodelabels/CommonNodeLabelsManager.java | 4 +--
.../hadoop/yarn/nodelabels/NodeLabelUtil.java | 2 +-
.../nodelabels/store/op/NodeAttributeMirrorOp.java | 2 +-
.../nodelabels/store/op/RemoveClusterLabelOp.java | 2 +-
.../yarn/security/YarnAuthorizationProvider.java | 2 +-
.../client/YARNDelegationTokenIdentifier.java | 2 +-
.../impl/pb/ReplaceLabelsOnNodeRequestPBImpl.java | 2 +-
.../server/security/ApplicationACLsManager.java | 2 +-
.../apache/hadoop/yarn/util/AdHocLogDumper.java | 2 +-
.../apache/hadoop/yarn/util/BoundedAppender.java | 4 +--
.../org/apache/hadoop/yarn/util/FSDownload.java | 8 ++---
.../org/apache/hadoop/yarn/util/RackResolver.java | 4 +--
.../org/apache/hadoop/yarn/util/StringHelper.java | 4 +--
.../util/resource/DefaultResourceCalculator.java | 2 +-
.../hadoop/yarn/util/timeline/TimelineUtils.java | 2 +-
.../org/apache/hadoop/yarn/webapp/Controller.java | 2 +-
.../org/apache/hadoop/yarn/webapp/Dispatcher.java | 4 +--
.../apache/hadoop/yarn/webapp/ResponseInfo.java | 2 +-
.../java/org/apache/hadoop/yarn/webapp/Router.java | 10 +++---
.../java/org/apache/hadoop/yarn/webapp/WebApp.java | 6 ++--
.../org/apache/hadoop/yarn/webapp/WebApps.java | 2 +-
.../hadoop/yarn/webapp/hamlet/HamletGen.java | 2 +-
.../hadoop/yarn/webapp/hamlet/HamletImpl.java | 8 ++---
.../hadoop/yarn/webapp/hamlet2/HamletGen.java | 2 +-
.../hadoop/yarn/webapp/hamlet2/HamletImpl.java | 8 ++---
.../hadoop/yarn/webapp/view/DefaultPage.java | 2 +-
.../apache/hadoop/yarn/webapp/view/JQueryUI.java | 2 +-
.../hadoop/yarn/webapp/view/TwoColumnLayout.java | 2 +-
.../test/java/org/apache/hadoop/yarn/MockApps.java | 2 +-
.../hadoop/yarn/api/BasePBImplRecordsTest.java | 6 ++--
.../apache/hadoop/yarn/api/TestPBImplRecords.java | 2 +-
.../hadoop/yarn/nodelabels/NodeLabelTestBase.java | 4 +--
.../nodelabels/TestCommonNodeLabelsManager.java | 6 ++--
.../nodelabels/TestFileSystemNodeLabelsStore.java | 2 +-
.../hadoop/yarn/nodelabels/TestNodeLabelUtil.java | 2 +-
.../resourcetypes/ResourceTypesTestHelper.java | 2 +-
.../apache/hadoop/yarn/util/TestFSDownload.java | 6 ++--
.../CustomResourceTypesConfigurationProvider.java | 2 +-
.../yarn/util/resource/TestResourceCalculator.java | 2 +-
.../hadoop-yarn/hadoop-yarn-csi/pom.xml | 12 +++++++
.../pom.xml | 4 +--
.../ApplicationHistoryClientService.java | 2 +-
.../ApplicationHistoryManagerImpl.java | 2 +-
.../ApplicationHistoryManagerOnTimelineStore.java | 2 +-
.../ApplicationHistoryServer.java | 2 +-
.../webapp/AHSWebServices.java | 2 +-
.../yarn/server/timeline/LeveldbTimelineStore.java | 4 +--
.../timeline/RollingLevelDBTimelineStore.java | 4 +--
.../yarn/server/timeline/TimelineDataManager.java | 2 +-
.../recovery/LeveldbTimelineStateStore.java | 2 +-
.../timeline/security/TimelineACLsManager.java | 2 +-
.../hadoop-yarn-server-common/pom.xml | 4 +--
.../yarn/server/AMHeartbeatRequestHandler.java | 4 +--
.../hadoop/yarn/server/AMRMClientRelayer.java | 2 +-
.../hadoop/yarn/server/api/ServerRMProxy.java | 2 +-
.../FederationRMFailoverProxyProvider.java | 4 +--
.../federation/policies/FederationPolicyUtils.java | 2 +-
.../federation/policies/RouterPolicyFacade.java | 2 +-
.../LocalityMulticastAMRMProxyPolicy.java | 4 +--
.../manager/PriorityBroadcastPolicyManager.java | 2 +-
.../manager/WeightedLocalityPolicyManager.java | 2 +-
.../metrics/FederationStateStoreClientMetrics.java | 2 +-
.../records/impl/pb/SubClusterInfoPBImpl.java | 2 +-
.../federation/utils/FederationRegistryClient.java | 2 +-
.../utils/FederationStateStoreFacade.java | 2 +-
.../server/metrics/AMRMClientRelayerMetrics.java | 2 +-
.../metrics/OpportunisticSchedulerMetrics.java | 2 +-
.../scheduler/OpportunisticContainerContext.java | 2 +-
.../TimelineAuthenticationFilterInitializer.java | 2 +-
.../yarn/server/uam/UnmanagedAMPoolManager.java | 2 +-
.../server/uam/UnmanagedApplicationManager.java | 4 +--
.../hadoop/yarn/server/utils/BuilderUtils.java | 2 +-
.../server/volume/csi/VolumeCapabilityRange.java | 2 +-
.../yarn/server/volume/csi/VolumeMetaData.java | 2 +-
.../hadoop/yarn/server/webapp/ContainerBlock.java | 2 +-
.../hadoop/yarn/server/webapp/LogServlet.java | 4 +--
.../hadoop/yarn/server/webapp/LogWebService.java | 4 +--
.../yarn/server/webapp/LogWebServiceUtils.java | 2 +-
.../yarn/server/MockResourceManagerFacade.java | 2 +-
.../api/protocolrecords/TestProtocolRecords.java | 2 +-
.../yarn/server/webapp/ContainerBlockTest.java | 2 +-
.../hadoop-yarn-server-nodemanager/pom.xml | 4 +--
.../yarn/server/nodemanager/ContainerExecutor.java | 2 +-
.../nodemanager/DefaultContainerExecutor.java | 2 +-
.../yarn/server/nodemanager/DeletionService.java | 2 +-
.../server/nodemanager/DirectoryCollection.java | 4 +--
.../server/nodemanager/LinuxContainerExecutor.java | 2 +-
.../nodemanager/LocalDirsHandlerService.java | 2 +-
.../yarn/server/nodemanager/NodeManager.java | 2 +-
.../server/nodemanager/NodeStatusUpdaterImpl.java | 2 +-
.../nodemanager/amrmproxy/AMRMProxyMetrics.java | 2 +-
.../nodemanager/amrmproxy/AMRMProxyService.java | 2 +-
.../amrmproxy/AMRMProxyTokenSecretManager.java | 2 +-
.../amrmproxy/AbstractRequestInterceptor.java | 2 +-
.../amrmproxy/DefaultRequestInterceptor.java | 4 +--
.../amrmproxy/FederationInterceptor.java | 4 +--
.../nodemanager/api/ResourceLocalizationSpec.java | 2 +-
.../nodemanager/containermanager/AuxServices.java | 4 +--
.../containermanager/ContainerManagerImpl.java | 2 +-
.../application/ApplicationImpl.java | 2 +-
.../containermanager/container/ContainerImpl.java | 2 +-
.../container/SlidingWindowRetryPolicy.java | 2 +-
.../launcher/ContainerCleanup.java | 2 +-
.../containermanager/launcher/ContainerLaunch.java | 2 +-
.../launcher/ContainersLauncher.java | 4 +--
.../resources/CGroupElasticMemoryController.java | 2 +-
.../resources/CGroupsBlkioResourceHandlerImpl.java | 2 +-
.../resources/CGroupsCpuResourceHandlerImpl.java | 2 +-
.../linux/resources/CGroupsHandlerImpl.java | 4 +--
.../CGroupsMemoryResourceHandlerImpl.java | 2 +-
.../linux/resources/CGroupsResourceCalculator.java | 2 +-
.../linux/resources/DefaultOOMHandler.java | 2 +-
.../resources/NetworkPacketTaggingHandlerImpl.java | 2 +-
.../resources/NetworkTagMappingJsonManager.java | 2 +-
.../linux/resources/ResourceHandlerChain.java | 2 +-
.../linux/resources/ResourceHandlerModule.java | 2 +-
.../resources/fpga/FpgaResourceAllocator.java | 4 +--
.../resources/fpga/FpgaResourceHandlerImpl.java | 2 +-
.../linux/resources/gpu/GpuResourceAllocator.java | 10 +++---
.../resources/numa/NumaResourceAllocation.java | 2 +-
.../resources/numa/NumaResourceAllocator.java | 4 +--
.../runtime/DelegatingLinuxContainerRuntime.java | 2 +-
.../linux/runtime/DockerLinuxContainerRuntime.java | 2 +-
.../linux/runtime/OCIContainerRuntime.java | 2 +-
.../linux/runtime/RuncContainerRuntime.java | 2 +-
.../linux/runtime/docker/DockerImagesCommand.java | 2 +-
.../runc/HdfsManifestToResourcesPlugin.java | 6 ++--
.../localizer/ContainerLocalizer.java | 6 ++--
.../localizer/LocalCacheDirectoryManager.java | 2 +-
.../localizer/LocalResourcesTrackerImpl.java | 2 +-
.../localizer/LocalizerContext.java | 2 +-
.../localizer/ResourceLocalizationService.java | 8 ++---
.../sharedcache/SharedCacheUploadService.java | 2 +-
.../localizer/sharedcache/SharedCacheUploader.java | 2 +-
.../logaggregation/AppLogAggregatorImpl.java | 4 +--
.../logaggregation/LogAggregationService.java | 4 +--
.../loghandler/NonAggregatingLogHandler.java | 2 +-
.../monitor/ContainersMonitorImpl.java | 4 +--
.../resourceplugin/ResourcePluginManager.java | 6 ++--
.../resourceplugin/com/nec/NECVEPlugin.java | 2 +-
.../resourceplugin/com/nec/VEDeviceDiscoverer.java | 2 +-
.../com/nvidia/NvidiaGPUPluginForRuntimeV2.java | 4 +--
.../deviceframework/DeviceMappingManager.java | 8 ++---
.../deviceframework/DevicePluginAdapter.java | 2 +-
.../deviceframework/DeviceResourceHandlerImpl.java | 2 +-
.../resourceplugin/fpga/FpgaDevice.java | 2 +-
.../resourceplugin/fpga/FpgaDiscoverer.java | 6 ++--
.../resourceplugin/fpga/IntelFpgaOpenclPlugin.java | 2 +-
.../resourceplugin/gpu/GpuDiscoverer.java | 8 ++---
.../gpu/NvidiaDockerV1CommandPlugin.java | 2 +-
.../gpu/NvidiaDockerV2CommandPlugin.java | 2 +-
.../scheduler/ContainerScheduler.java | 2 +-
.../volume/csi/ContainerVolumePublisher.java | 4 +--
.../health/NodeHealthCheckerService.java | 6 ++--
.../health/TimedHealthReporterService.java | 2 +-
.../nodemanager/metrics/NodeManagerMetrics.java | 2 +-
.../AbstractNodeDescriptorsProvider.java | 2 +-
.../ConfigurationNodeAttributesProvider.java | 6 ++--
.../recovery/NMLeveldbStateStoreService.java | 6 ++--
.../scheduler/DistributedScheduler.java | 2 +-
.../security/NMTokenSecretManagerInNM.java | 2 +-
.../timelineservice/NMTimelinePublisher.java | 2 +-
.../util/CgroupsLCEResourcesHandler.java | 2 +-
.../server/nodemanager/TestContainerExecutor.java | 2 +-
.../TestNodeStatusUpdaterForAttributes.java | 2 +-
.../containermanager/TestAuxServices.java | 4 +--
.../containermanager/TestContainerManager.java | 2 +-
.../container/TestResourceMappings.java | 2 +-
.../launcher/TestContainerLaunch.java | 2 +-
.../fpga/TestFpgaResourceHandlerImpl.java | 4 +--
.../resources/gpu/TestGpuResourceAllocator.java | 2 +-
.../resources/gpu/TestGpuResourceHandlerImpl.java | 4 +--
.../localizer/TestResourceLocalizationService.java | 2 +-
.../com/nec/TestVEDeviceDiscoverer.java | 2 +-
.../resourceplugin/gpu/TestGpuResourcePlugin.java | 2 +-
.../gpu/TestNvidiaDockerV1CommandPlugin.java | 4 +--
.../gpu/TestNvidiaDockerV2CommandPlugin.java | 4 +--
.../health/TestNodeHealthCheckerService.java | 4 +--
.../nodemanager/webapp/TestNMWebServices.java | 2 +-
.../hadoop-yarn-server-resourcemanager/pom.xml | 4 +--
.../ActiveStandbyElectorBasedElectorService.java | 2 +-
.../yarn/server/resourcemanager/AdminService.java | 2 +-
.../resourcemanager/ApplicationMasterService.java | 2 +-
.../server/resourcemanager/ClientRMService.java | 2 +-
.../server/resourcemanager/ClusterMetrics.java | 2 +-
.../CuratorBasedElectorService.java | 2 +-
.../yarn/server/resourcemanager/DBManager.java | 2 +-
.../server/resourcemanager/NodesListManager.java | 2 +-
.../OpportunisticContainerAllocatorAMService.java | 2 +-
.../yarn/server/resourcemanager/RMAppManager.java | 4 +--
.../yarn/server/resourcemanager/RMContextImpl.java | 2 +-
.../resourcemanager/RMSecretManagerService.java | 2 +-
.../yarn/server/resourcemanager/RMServerUtils.java | 2 +-
.../server/resourcemanager/ResourceManager.java | 2 +-
.../resourcemanager/ResourceTrackerService.java | 4 +--
.../ahs/RMApplicationHistoryWriter.java | 2 +-
.../resourcemanager/amlauncher/AMLauncher.java | 2 +-
.../amlauncher/ApplicationMasterLauncher.java | 2 +-
.../federation/FederationStateStoreService.java | 2 +-
.../metrics/TimelineServiceV2Publisher.java | 2 +-
.../resourcemanager/monitor/SchedulingMonitor.java | 2 +-
.../monitor/SchedulingMonitorManager.java | 2 +-
.../capacity/PreemptionCandidatesSelector.java | 2 +-
.../ProportionalCapacityPreemptionPolicy.java | 4 +--
.../QueuePriorityContainerCandidateSelector.java | 4 +--
.../invariants/MetricsInvariantChecker.java | 4 +--
.../nodelabels/NodeAttributesManagerImpl.java | 6 ++--
.../nodelabels/RMDelegatedNodeLabelsUpdater.java | 2 +-
.../nodelabels/RMNodeLabelsManager.java | 2 +-
.../placement/DefaultPlacementRule.java | 2 +-
.../resourcemanager/placement/FSPlacementRule.java | 2 +-
.../placement/PlacementManager.java | 2 +-
.../placement/UserGroupMappingPlacementRule.java | 2 +-
.../SubmissionContextPreProcessor.java | 2 +-
.../recovery/FileSystemRMStateStore.java | 2 +-
.../recovery/LeveldbRMStateStore.java | 2 +-
.../recovery/MemoryRMStateStore.java | 2 +-
.../resourcemanager/recovery/RMStateStore.java | 4 +--
.../recovery/RMStateUpdateAppEvent.java | 2 +-
.../resourcemanager/recovery/ZKRMStateStore.java | 2 +-
.../PeriodicRLESparseResourceAllocation.java | 2 +-
.../reservation/ReservationAllocation.java | 2 +-
.../planning/SimpleCapacityReplanner.java | 2 +-
.../resource/ResourceProfilesManagerImpl.java | 2 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 2 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 2 +-
.../rmcontainer/RMContainerImpl.java | 2 +-
.../server/resourcemanager/rmnode/RMNodeImpl.java | 2 +-
.../scheduler/AbstractYarnScheduler.java | 4 +--
.../resourcemanager/scheduler/Allocation.java | 2 +-
.../scheduler/ClusterNodeTracker.java | 4 +--
.../resourcemanager/scheduler/QueueMetrics.java | 4 +--
.../scheduler/QueueMetricsCustomResource.java | 2 +-
.../scheduler/SchedulerApplicationAttempt.java | 6 ++--
.../resourcemanager/scheduler/SchedulerNode.java | 4 +--
.../resourcemanager/scheduler/SchedulerUtils.java | 6 ++--
.../resourcemanager/scheduler/YarnScheduler.java | 2 +-
.../scheduler/activities/ActivitiesManager.java | 4 +--
.../scheduler/capacity/AbstractCSQueue.java | 4 +--
.../capacity/CSMaxRunningAppsEnforcer.java | 4 +--
.../scheduler/capacity/CSQueue.java | 2 +-
.../scheduler/capacity/CSQueueStore.java | 6 ++--
.../scheduler/capacity/CSQueueUtils.java | 2 +-
.../scheduler/capacity/CapacityScheduler.java | 6 ++--
.../capacity/CapacitySchedulerConfiguration.java | 6 ++--
.../capacity/CapacitySchedulerMetrics.java | 2 +-
.../capacity/CapacitySchedulerQueueManager.java | 2 +-
.../scheduler/capacity/LeafQueue.java | 4 +--
.../capacity/QueueManagementDynamicEditPolicy.java | 2 +-
.../scheduler/capacity/UsersManager.java | 2 +-
.../capacity/WorkflowPriorityMappingsManager.java | 2 +-
.../conf/FSSchedulerConfigurationStore.java | 2 +-
.../capacity/conf/LeveldbConfigurationStore.java | 2 +-
.../conf/MutableCSConfigurationProvider.java | 4 +--
.../capacity/conf/ZKConfigurationStore.java | 2 +-
.../PriorityUtilizationQueueOrderingPolicy.java | 2 +-
.../capacity/preemption/PreemptionManager.java | 2 +-
.../GuaranteedOrZeroCapacityOverTimePolicy.java | 2 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 2 +-
.../scheduler/constraint/AllocationTags.java | 2 +-
.../constraint/AllocationTagsManager.java | 4 +--
.../scheduler/constraint/TargetApplications.java | 4 +--
.../constraint/TargetApplicationsNamespace.java | 4 +--
.../processor/PlacementConstraintProcessor.java | 2 +-
...CentralizedOpportunisticContainerAllocator.java | 2 +-
.../distributed/NodeQueueLoadMonitor.java | 2 +-
.../scheduler/fair/AllocationConfiguration.java | 2 +-
.../fair/AllocationFileLoaderService.java | 2 +-
.../scheduler/fair/FSAppAttempt.java | 2 +-
.../scheduler/fair/FSLeafQueue.java | 2 +-
.../scheduler/fair/FSOpDurations.java | 2 +-
.../scheduler/fair/FSParentQueue.java | 2 +-
.../resourcemanager/scheduler/fair/FSQueue.java | 2 +-
.../scheduler/fair/FSQueueMetrics.java | 2 +-
.../scheduler/fair/FSSchedulerNode.java | 4 +--
.../scheduler/fair/FairScheduler.java | 8 ++---
.../scheduler/fair/FairSchedulerConfiguration.java | 2 +-
.../scheduler/fair/FairSchedulerUtilities.java | 2 +-
.../scheduler/fair/MaxRunningAppsEnforcer.java | 6 ++--
.../scheduler/fair/QueueManager.java | 6 ++--
.../fair/ReservationQueueConfiguration.java | 2 +-
.../fair/allocation/AllocationFileParser.java | 4 +--
.../fair/converter/DryRunResultHolder.java | 2 +-
.../FSConfigToCSConfigArgumentHandler.java | 2 +-
.../converter/FSConfigToCSConfigConverter.java | 2 +-
.../converter/FSConfigToCSConfigRuleHandler.java | 2 +-
.../policies/DominantResourceFairnessPolicy.java | 2 +-
.../scheduler/fair/policies/FairSharePolicy.java | 2 +-
.../scheduler/fair/policies/FifoPolicy.java | 2 +-
.../scheduler/fifo/FifoScheduler.java | 2 +-
.../scheduler/placement/MultiNodeSorter.java | 2 +-
.../placement/SimpleCandidateNodeSet.java | 2 +-
.../SingleConstraintAppPlacementAllocator.java | 2 +-
.../scheduler/policy/FairOrderingPolicy.java | 2 +-
.../security/AMRMTokenSecretManager.java | 2 +-
.../security/ClientToAMTokenSecretManagerInRM.java | 2 +-
.../security/DelegationTokenRenewer.java | 4 +--
.../security/NMTokenSecretManagerInRM.java | 2 +-
.../resourcemanager/security/QueueACLsManager.java | 2 +-
.../security/RMContainerTokenSecretManager.java | 2 +-
.../security/RMDelegationTokenSecretManager.java | 2 +-
.../volume/csi/VolumeManagerImpl.java | 4 +--
.../volume/csi/lifecycle/VolumeImpl.java | 6 ++--
.../webapp/ApplicationsRequestBuilder.java | 2 +-
.../resourcemanager/webapp/RMWebAppFilter.java | 2 +-
.../resourcemanager/webapp/RMWebServices.java | 2 +-
.../resourcemanager/webapp/dao/ActivitiesInfo.java | 2 +-
.../webapp/dao/ActivityNodeInfo.java | 2 +-
.../webapp/dao/AppActivitiesInfo.java | 2 +-
.../server/resourcemanager/webapp/dao/AppInfo.java | 4 +--
.../webapp/dao/AppRequestAllocationInfo.java | 2 +-
.../resourcemanager/webapp/dao/NodeInfo.java | 2 +-
.../ApplicationMasterServiceTestBase.java | 2 +-
.../resourcemanager/MockMemoryRMStateStore.java | 2 +-
.../yarn/server/resourcemanager/MockNodes.java | 4 +--
.../server/resourcemanager/TestAppManager.java | 6 ++--
.../TestApplicationMasterServiceFair.java | 2 +-
.../resourcemanager/TestClientRMService.java | 4 +--
.../server/resourcemanager/TestRMAdminService.java | 6 ++--
.../resourcemanager/TestRMHAForNodeLabels.java | 2 +-
.../yarn/server/resourcemanager/TestRMRestart.java | 4 +--
.../TestResourceTrackerService.java | 4 +--
.../applicationsmanager/MockAsm.java | 2 +-
.../applicationsmanager/TestAMRestart.java | 4 +--
.../TestFileSystemNodeAttributeStore.java | 2 +-
.../nodelabels/TestNodeAttributesManager.java | 4 +--
.../TestRMDelegatedNodeLabelsUpdater.java | 4 +--
.../nodelabels/TestRMNodeLabelsManager.java | 4 +--
.../TestUserGroupMappingPlacementRule.java | 2 +-
.../recovery/TestZKRMStateStore.java | 6 ++--
.../rmapp/TestRMAppTransitions.java | 2 +-
.../rmcontainer/TestRMContainerImpl.java | 2 +-
.../scheduler/AppMetricsChecker.java | 2 +-
.../scheduler/ResourceMetricsChecker.java | 2 +-
.../scheduler/TestAbstractYarnScheduler.java | 4 +--
.../TestQueueMetricsForCustomResources.java | 4 +--
.../scheduler/TestSchedulerUtils.java | 6 ++--
.../capacity/CapacitySchedulerTestBase.java | 2 +-
.../scheduler/capacity/TestApplicationLimits.java | 6 ++--
.../capacity/TestApplicationLimitsByPartition.java | 4 +--
.../scheduler/capacity/TestCapacityScheduler.java | 6 ++--
.../TestCapacitySchedulerAsyncScheduling.java | 2 +-
.../TestCapacitySchedulerAutoCreatedQueueBase.java | 4 +--
.../TestCapacitySchedulerAutoQueueCreation.java | 2 +-
.../TestCapacitySchedulerLazyPreemption.java | 2 +-
.../TestCapacitySchedulerMaxParallelApps.java | 2 +-
.../TestCapacitySchedulerNodeLabelUpdate.java | 6 ++--
...stCapacitySchedulerSchedulingRequestUpdate.java | 4 +--
.../TestCapacitySchedulerSurgicalPreemption.java | 4 +--
...estCapacitySchedulerWithMultiResourceTypes.java | 2 +-
...stCapacitySchedulerWorkflowPriorityMapping.java | 4 +--
.../scheduler/capacity/TestLeafQueue.java | 2 +-
.../capacity/TestNodeLabelContainerAllocation.java | 6 ++--
.../scheduler/capacity/TestQueueParsing.java | 2 +-
.../scheduler/capacity/TestReservations.java | 2 +-
.../TestSchedulingRequestContainerAllocation.java | 4 +--
...tSchedulingRequestContainerAllocationAsync.java | 2 +-
.../scheduler/capacity/TestUtils.java | 2 +-
.../TestWorkPreservingRMRestartForNodeLabel.java | 6 ++--
...TestPriorityUtilizationQueueOrderingPolicy.java | 4 +--
.../constraint/TestAllocationTagsManager.java | 2 +-
.../constraint/TestAllocationTagsNamespace.java | 4 +--
.../TestPlacementConstraintManagerService.java | 2 +-
.../constraint/TestPlacementConstraintsUtil.java | 4 +--
.../algorithm/TestLocalAllocationTagsManager.java | 2 +-
.../scheduler/fair/FairSchedulerTestBase.java | 2 +-
.../scheduler/fair/TestFSLeafQueue.java | 2 +-
.../scheduler/fair/TestFSQueueMetrics.java | 2 +-
.../scheduler/fair/TestFairScheduler.java | 4 +--
.../fair/TestFairSchedulerConfiguration.java | 2 +-
.../scheduler/fair/TestQueueManager.java | 4 +--
.../fair/allocationfile/AllocationFileQueue.java | 2 +-
.../AllocationFileQueuePlacementPolicy.java | 2 +-
.../AllocationFileQueuePlacementRule.java | 2 +-
.../TestFSConfigToCSConfigArgumentHandler.java | 2 +-
.../fair/converter/TestFSQueueConverter.java | 2 +-
.../converter/TestQueuePlacementConverter.java | 2 +-
.../volume/csi/TestVolumeProcessor.java | 6 ++--
.../webapp/ActivitiesTestUtils.java | 2 +-
.../webapp/TestApplicationsRequestBuilder.java | 2 +-
.../resourcemanager/webapp/TestRMWebApp.java | 2 +-
.../webapp/TestRMWebAppFairScheduler.java | 2 +-
.../webapp/TestRMWebServiceAppsNodelabel.java | 4 +--
.../resourcemanager/webapp/TestRMWebServices.java | 2 +-
.../webapp/TestRMWebServicesApps.java | 2 +-
.../TestRMWebServicesForCSWithPartitions.java | 6 ++--
.../webapp/TestRMWebServicesNodes.java | 2 +-
.../FairSchedulerJsonVerifications.java | 2 +-
.../FairSchedulerXmlVerifications.java | 2 +-
.../helper/ResourceRequestsJsonVerifications.java | 4 +--
.../helper/ResourceRequestsXmlVerifications.java | 6 ++--
.../apache/hadoop/yarn/server/router/Router.java | 2 +-
.../hadoop/yarn/server/router/RouterMetrics.java | 2 +-
.../clientrm/DefaultClientRequestInterceptor.java | 2 +-
.../clientrm/FederationClientInterceptor.java | 4 +--
.../router/clientrm/RouterClientRMService.java | 2 +-
.../rmadmin/DefaultRMAdminRequestInterceptor.java | 2 +-
.../router/rmadmin/RouterRMAdminService.java | 2 +-
.../router/webapp/FederationInterceptorREST.java | 4 +--
.../server/router/webapp/RouterWebServices.java | 2 +-
.../router/webapp/TestRouterWebServicesREST.java | 2 +-
.../server/sharedcachemanager/CleanerService.java | 2 +-
.../sharedcachemanager/SharedCacheManager.java | 2 +-
.../sharedcachemanager/store/InMemorySCMStore.java | 4 +--
.../server/sharedcachemanager/store/SCMStore.java | 2 +-
.../hadoop-yarn-server-tests/pom.xml | 4 +--
.../apache/hadoop/yarn/server/MiniYARNCluster.java | 2 +-
.../pom.xml | 4 +--
.../timeline/EntityGroupFSTimelineStore.java | 4 +--
.../hadoop/yarn/server/timeline/LogInfo.java | 2 +-
.../server/timeline/EntityGroupPlugInForTest.java | 2 +-
.../cosmosdb/CosmosDBDocumentStoreReader.java | 4 +--
.../cosmosdb/CosmosDBDocumentStoreWriter.java | 2 +-
.../pom.xml | 6 ++++
.../TestTimelineReaderWebServicesHBaseStorage.java | 4 +--
.../pom.xml | 4 +--
.../storage/HBaseTimelineSchemaCreator.java | 2 +-
.../storage/reader/ApplicationEntityReader.java | 2 +-
.../storage/reader/EntityTypeReader.java | 2 +-
.../storage/reader/FlowActivityEntityReader.java | 2 +-
.../storage/reader/FlowRunEntityReader.java | 2 +-
.../storage/reader/GenericEntityReader.java | 2 +-
.../storage/reader/SubApplicationEntityReader.java | 2 +-
.../pom.xml | 4 +--
.../storage/common/TestSeparator.java | 2 +-
.../pom.xml | 4 +--
.../timelineservice/storage/flow/FlowScanner.java | 2 +-
.../pom.xml | 4 +--
.../timelineservice/storage/flow/FlowScanner.java | 2 +-
.../hadoop-yarn-server-timelineservice/pom.xml | 4 +--
.../collector/AppLevelTimelineCollector.java | 4 +--
.../AppLevelTimelineCollectorWithAgg.java | 2 +-
.../collector/NodeTimelineCollectorManager.java | 4 +--
.../PerNodeTimelineCollectorsAuxService.java | 2 +-
.../collector/TimelineCollectorManager.java | 2 +-
.../PerNodeAggTimelineCollectorMetrics.java | 2 +-
.../metrics/TimelineReaderMetrics.java | 2 +-
.../reader/TimelineReaderServer.java | 2 +-
.../reader/TimelineReaderUtils.java | 2 +-
.../reader/TimelineReaderWebServices.java | 2 +-
.../storage/FileSystemTimelineReaderImpl.java | 2 +-
.../storage/FileSystemTimelineWriterImpl.java | 2 +-
.../storage/TimelineSchemaCreator.java | 2 +-
.../storage/common/OfflineAggregationInfo.java | 2 +-
.../collector/TestTimelineCollector.java | 2 +-
.../reader/TestTimelineReaderWebServicesUtils.java | 2 +-
.../hadoop-yarn-server-web-proxy/pom.xml | 4 +--
.../hadoop/yarn/server/webproxy/ProxyCA.java | 2 +-
.../hadoop/yarn/server/webproxy/WebAppProxy.java | 2 +-
.../yarn/server/webproxy/WebAppProxyServlet.java | 2 +-
.../webproxy/amfilter/AmFilterInitializer.java | 2 +-
.../yarn/server/webproxy/amfilter/AmIpFilter.java | 2 +-
.../yarn/server/webproxy/TestProxyUriUtils.java | 2 +-
1746 files changed, 2812 insertions(+), 2735 deletions(-)
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 56e699f..bea6599 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -322,6 +322,10 @@
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Add optional runtime dependency on the in-development timeline server module
@@ -492,6 +496,10 @@
<artifactId>jetty-util</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -547,6 +555,10 @@
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
diff --git a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNFileSystem.java b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNFileSystem.java
index 333b349..94b10ad 100644
--- a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNFileSystem.java
+++ b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNFileSystem.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNOutputStream.java b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNOutputStream.java
index c437dde..bd44962 100644
--- a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNOutputStream.java
+++ b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/CosNOutputStream.java
@@ -32,10 +32,10 @@ import java.security.NoSuchAlgorithmException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
import com.qcloud.cos.model.PartETag;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/COSCredentialsProviderList.java b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/COSCredentialsProviderList.java
index e4c59a5..d2d2f8c 100644
--- a/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/COSCredentialsProviderList.java
+++ b/hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/COSCredentialsProviderList.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import com.qcloud.cos.auth.AnonymousCOSCredentials;
import com.qcloud.cos.auth.COSCredentials;
import com.qcloud.cos.auth.COSCredentialsProvider;
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index e35c5d4..2f270be 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -184,9 +184,14 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
index 64d4330..3bfa349 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.client;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.lang.reflect.Constructor;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.security.authentication.server.HttpConstants;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationHandlerUtil.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationHandlerUtil.java
index d881c65..79739a4 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationHandlerUtil.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationHandlerUtil.java
@@ -20,7 +20,7 @@ import static org.apache.hadoop.security.authentication.server.HttpConstants.DIG
import java.util.Locale;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* This is a utility class designed to provide functionality related to
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
index 884398c..5e4b0e8 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/JWTRedirectAuthenticationHandler.java
@@ -28,7 +28,7 @@ import java.text.ParseException;
import java.security.interfaces.RSAPublicKey;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.hadoop.security.authentication.util.CertificateUtil;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
index 50eeb2a..703842f 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.server;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.hadoop.security.authentication.client.KerberosAuthenticator;
import org.apache.commons.codec.binary.Base64;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/LdapAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/LdapAuthenticationHandler.java
index 8cc8d03..94ed5d4 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/LdapAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/LdapAuthenticationHandler.java
@@ -38,8 +38,8 @@ import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* The {@link LdapAuthenticationHandler} implements the BASIC authentication
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
index 58a0adb..b2499ff 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
@@ -30,8 +30,8 @@ import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
/**
* The {@link MultiSchemeAuthenticationHandler} supports configuring multiple
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/FileSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/FileSignerSecretProvider.java
index e8aa160..c037037 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/FileSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/FileSignerSecretProvider.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.util;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
index 67c2c10..a308cef 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
@@ -26,7 +26,7 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RandomSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RandomSignerSecretProvider.java
index 9245887..a57b744 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RandomSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RandomSignerSecretProvider.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.security.SecureRandom;
import java.util.Random;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RolloverSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RolloverSignerSecretProvider.java
index e516b5b..69a09c1 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RolloverSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/RolloverSignerSecretProvider.java
@@ -18,7 +18,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.servlet.ServletContext;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
index f0c350e..a1cd6de 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.nio.ByteBuffer;
import java.security.SecureRandom;
import java.util.Collections;
diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProvider.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProvider.java
index 7e5b10e..a774739 100644
--- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProvider.java
@@ -17,7 +17,7 @@ import java.nio.charset.Charset;
import java.util.Properties;
import javax.servlet.ServletContext;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProviderCreator.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProviderCreator.java
index e567e7b..cb59c20 100644
--- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProviderCreator.java
+++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/StringSignerSecretProviderCreator.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.security.authentication.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceStability;
/**
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 8daf557..7e49a2f 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -48,6 +48,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
+ </dependency>
+ <!--Guava is required during runtime for curator-->
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>compile</scope>
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java
index cce744e..836f381 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.http.HttpServer2;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A servlet to print out the running configuration data.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 955558b..aedde6b 100755
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -24,7 +24,7 @@ import com.ctc.wstx.io.SystemId;
import com.ctc.wstx.stax.WstxInputFactory;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.BufferedInputStream;
import java.io.DataInput;
@@ -83,7 +83,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.commons.collections.map.UnmodifiableMap;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -107,8 +107,8 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
index 8cacbdc..0352025 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.conf;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/AesCtrCryptoCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/AesCtrCryptoCodec.java
index 3e52560..a1ddca6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/AesCtrCryptoCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/AesCtrCryptoCodec.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.crypto;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import java.io.IOException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoCodec.java
index bcf4a65..3061020 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoCodec.java
@@ -31,8 +31,8 @@ import org.apache.hadoop.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_CRYPTO_CODEC_CLASSES_KEY_PREFIX;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_CRYPTO_CIPHER_SUITE_KEY;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
index 9e601e2..30817a2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java
@@ -30,7 +30,7 @@ import java.util.EnumSet;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.ByteBufferPositionedReadable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoOutputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoOutputStream.java
index 8d11043..aeb6e4d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoOutputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoOutputStream.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.fs.CanSetDropBehind;
import org.apache.hadoop.fs.StreamCapabilities;
import org.apache.hadoop.fs.Syncable;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* CryptoOutputStream encrypts data. It is not thread-safe. AES CTR mode is
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoStreamUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoStreamUtils.java
index b55f842..9d2b4b9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoStreamUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoStreamUtils.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Seekable;
import org.apache.hadoop.util.CleanerUtil;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/JceAesCtrCryptoCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/JceAesCtrCryptoCodec.java
index de0e5dd..1c670f7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/JceAesCtrCryptoCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/JceAesCtrCryptoCodec.java
@@ -29,7 +29,7 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java
index a127925..0963cb6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslAesCtrCryptoCodec.java
@@ -29,7 +29,7 @@ import java.util.Random;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.crypto.random.OpensslSecureRandom;
import org.apache.hadoop.util.ReflectionUtils;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslCipher.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslCipher.java
index 0a2ba52..0fe81d7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslCipher.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/OpensslCipher.java
@@ -29,7 +29,7 @@ import javax.crypto.ShortBufferException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.NativeCodeLoader;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.util.PerformanceAdvisory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/CachingKeyProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/CachingKeyProvider.java
index 7a66e1e..4f456e5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/CachingKeyProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/CachingKeyProvider.java
@@ -22,9 +22,9 @@ import java.security.NoSuchAlgorithmException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
/**
* A <code>KeyProviderExtension</code> implementation providing a short lived
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
index 7951af5..3c3099e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.crypto.key;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -32,7 +32,7 @@ import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import javax.crypto.spec.SecretKeySpec;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
index 00d7a7d..8aa64e2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
@@ -29,7 +29,7 @@ import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CryptoCodec;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderDelegationTokenExtension.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderDelegationTokenExtension.java
index 05d99ed..e23d8b8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderDelegationTokenExtension.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderDelegationTokenExtension.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.crypto.key;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.security.Credentials;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java
index f2f6f18..2cc011c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyShell.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.StringUtils;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
index 71ed455..bc56f0e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
@@ -79,9 +79,9 @@ import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension.CryptoExtension;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
import static org.apache.hadoop.util.KMSUtil.checkNotEmpty;
import static org.apache.hadoop.util.KMSUtil.checkNotNull;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
index ee2295c..4d19ea3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
@@ -50,8 +50,8 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* A simple LoadBalancing KMSClientProvider that round-robins requests
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java
index 7d26acb..5ec78b3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java
@@ -33,11 +33,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OpensslSecureRandom.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OpensslSecureRandom.java
index 1863f5e..a7a609c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OpensslSecureRandom.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/random/OpensslSecureRandom.java
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.NativeCodeLoader;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.util.PerformanceAdvisory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
index 1c01d09..b911e0d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
@@ -56,7 +56,7 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.LambdaUtils;
import org.apache.hadoop.util.Progressable;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java
index c31c29b..5708c90 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ByteBufferUtil.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.ByteBufferPool;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
@InterfaceAudience.Private
@InterfaceStability.Evolving
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
index cc9c284..f081742 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
@@ -29,7 +29,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
index 7a94088..30c2fae 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Shell;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/** Filesystem disk space usage statistics.
* Uses the unix 'df' program to get mount points, and java.io.File for
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
index 6e374c9..89ac7c3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.fs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
index 2feb937..193c52c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.fs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.lang.ref.WeakReference;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStreamBuilder.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStreamBuilder.java
index 62a3182..7a67928 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStreamBuilder.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataOutputStreamBuilder.java
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.EnumSet;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_DEFAULT;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
index 672ab15..b3b3fac 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
@@ -21,7 +21,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
index cddac52..422eae9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
@@ -65,8 +65,8 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.ShutdownHookManager;
-import com.google.common.base.Preconditions;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.htrace.core.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileEncryptionInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileEncryptionInfo.java
index 4cfce2e..5444103 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileEncryptionInfo.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileEncryptionInfo.java
@@ -24,8 +24,8 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.crypto.CipherSuite;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* FileEncryptionInfo encapsulates all the encryption-related information for
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index c7b8467..528f6c2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -86,12 +86,12 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.htrace.core.Tracer;
import org.apache.htrace.core.TraceScope;
-import com.google.common.base.Preconditions;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.*;
import static org.apache.hadoop.fs.impl.PathCapabilitiesSupport.validatePathCapabilityArgs;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemStorageStatistics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemStorageStatistics.java
index 43c23ab..f717e03 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemStorageStatistics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemStorageStatistics.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.fs;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FileSystem.Statistics.StatisticsData;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsTracer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsTracer.java
index e422336..6fab4bd 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsTracer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsTracer.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.fs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
index c5429d2..11b3e91 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
@@ -24,7 +24,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobalStorageStatistics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobalStorageStatistics.java
index 2dba525..0cf3b62 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobalStorageStatistics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobalStorageStatistics.java
@@ -23,7 +23,7 @@ import java.util.NavigableMap;
import java.util.NoSuchElementException;
import java.util.TreeMap;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java
index f301f22..9cdcb4a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java
@@ -32,7 +32,7 @@ import org.apache.htrace.core.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* Implementation of {@link FileSystem#globStatus(Path, PathFilter)}.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
index 8b47dfe..30f793d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.Shell.ExitCodeException;
import org.apache.hadoop.util.Shell.ShellCommandExecutor;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import static java.nio.file.Files.createLink;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/PartialListing.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/PartialListing.java
index 043f846..80d173e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/PartialListing.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/PartialListing.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.fs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 72eeb99..ba29f74 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.fs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.BufferedOutputStream;
import java.io.DataOutput;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java
index 5e80a14..d230087 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.Shell;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Wrapper for the Unix stat(1) command. Used to workaround the lack of
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
index 18972ea..7682992 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/UnionStorageStatistics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/UnionStorageStatistics.java
index 3d5b6af..2497ded 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/UnionStorageStatistics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/UnionStorageStatistics.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.fs;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
index e15968d..bfd4daf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
@@ -25,7 +25,7 @@ import org.apache.commons.codec.binary.Hex;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* The value of <code>XAttr</code> is byte[], this class is to
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
index 28db2c9..6899bb8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
@@ -24,8 +24,8 @@ import java.io.OutputStream;
import java.net.ConnectException;
import java.net.URI;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractFSBuilderImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractFSBuilderImpl.java
index 5fc92e9..9cf8b3d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractFSBuilderImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractFSBuilderImpl.java
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -36,8 +36,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathHandle;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* Builder for filesystem/filecontext operations of various kinds,
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractMultipartUploader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractMultipartUploader.java
index d8b7fe0..ed4bcc8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractMultipartUploader.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractMultipartUploader.java
@@ -24,14 +24,14 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.fs.MultipartUploader;
import org.apache.hadoop.fs.PartHandle;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.UploadHandle;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
/**
* Standard base class for Multipart Uploaders.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FileSystemMultipartUploader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FileSystemMultipartUploader.java
index ae0def0..7c5a5d9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FileSystemMultipartUploader.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FileSystemMultipartUploader.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FsLinkResolution.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FsLinkResolution.java
index f5ef8c4..8d4bebd 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FsLinkResolution.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FsLinkResolution.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.fs.impl;
import java.io.IOException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/MultipartUploaderBuilderImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/MultipartUploaderBuilderImpl.java
index 6c3336e..88c573a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/MultipartUploaderBuilderImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/MultipartUploaderBuilderImpl.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_DEFAULT;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/PathCapabilitiesSupport.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/PathCapabilitiesSupport.java
index 9332ac6..1e3e435 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/PathCapabilitiesSupport.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/PathCapabilitiesSupport.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathCapabilities;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
@InterfaceAudience.Private
@InterfaceStability.Evolving
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/WrappedIOException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/WrappedIOException.java
index 1de1ecb..ae1d548 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/WrappedIOException.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/WrappedIOException.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.fs.impl;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
index a902488..04a0452 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclStatus.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclStatus.java
index 385fed2..674b880 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclStatus.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclStatus.java
@@ -22,9 +22,9 @@ import java.util.List;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* An AclStatus contains the ACL information of a specific file. AclStatus
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java
index 4249252..58b24f2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclUtil.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* AclUtil contains utility methods for manipulating ACLs.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/sftp/SFTPFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/sftp/SFTPFileSystem.java
index a91b50f..898f615 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/sftp/SFTPFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/sftp/SFTPFileSystem.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.Progressable;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import com.jcraft.jsch.SftpATTRS;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
index 5a60ef2..dcff009 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java
index 5afafaf..f25b689 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java
@@ -21,7 +21,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.LinkedList;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
index 39958a9..77f6317 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FSDataInputStream;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
index efc541c..b50eb69 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Ls.java
@@ -25,7 +25,7 @@ import java.util.Comparator;
import java.util.Date;
import java.util.LinkedList;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.StringUtils;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
index 4bd596a..75dc86e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotDirectoryException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Snapshot related operations
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java
index 8a75a60..22dd32b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Tail.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.PathIsDirectoryException;
import org.apache.hadoop.io.IOUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Get a listing of all files in that match the file patterns.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
index be174b5..66b9059 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/TouchCommands.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.fs.PathIsDirectoryException;
import org.apache.hadoop.fs.PathNotFoundException;
import org.apache.hadoop.util.StringUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Unix touch like commands
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
index 6301776..2fe7c85 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
index 2a38693..fd7b561 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.fs.viewfs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URI;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
index 0b4e68b..473b514 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
@@ -43,7 +43,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
index e74c409..a7d56fa 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java
@@ -34,7 +34,7 @@ import java.util.Map.Entry;
import java.util.Set;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
index 828a17b..08f6df5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
@@ -43,8 +43,8 @@ import org.apache.zookeeper.AsyncCallback.*;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.KeeperException.Code;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FailoverController.java
index 5ad71f3..e7ed730 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FailoverController.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/FailoverController.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.ha.HAServiceProtocol.StateChangeRequestInfo;
import org.apache.hadoop.ha.HAServiceProtocol.RequestSource;
import org.apache.hadoop.ipc.RPC;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
index 0950ea7..b23c855 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.ha.HAServiceProtocol.RequestSource;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceTarget.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceTarget.java
index ff9658f..2e6b1fe 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceTarget.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceTarget.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.ha.protocolPB.HAServiceProtocolClientSideTranslatorPB;
import org.apache.hadoop.ha.protocolPB.ZKFCProtocolClientSideTranslatorPB;
import org.apache.hadoop.net.NetUtils;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* Represents a target of the client side HA administration commands.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java
index 16c3075..7320586 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.util.Daemon;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
index b0cead5..7f4a079 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
@@ -27,8 +27,8 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java
index 6363063..3ae8394 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.hadoop.conf.Configured;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.Shell;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
index e0c2f4d..a13b592 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configured;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
index 3718b7c..16d7bf7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
@@ -50,9 +50,9 @@ import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.hadoop.util.ToolRunner;
import org.apache.zookeeper.data.ACL;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index 8b69d57..dfc9436 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -50,9 +50,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import com.sun.jersey.spi.container.servlet.ServletContainer;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
index 44e0bdc..8f8c55d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Abstract base class for MapWritable and SortedMapWritable
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java
index 4c2fa67..e21dc2f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataOutputBuffer.java
@@ -23,7 +23,7 @@ import java.io.*;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** A reusable {@link DataOutput} implementation that writes to an in-memory
* buffer.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
index 0350db3..6a162c3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io;
-import com.google.common.collect.ComparisonChain;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ComparisonChain;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import java.nio.ByteBuffer;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FastByteComparisons.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FastByteComparisons.java
index 5af6602..1ef2119 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FastByteComparisons.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FastByteComparisons.java
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.misc.Unsafe;
-import com.google.common.primitives.UnsignedBytes;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.UnsignedBytes;
/**
* Utility code to do optimized byte-array comparison.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ReadaheadPool.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ReadaheadPool.java
index 804d365..34ae2c6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ReadaheadPool.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ReadaheadPool.java
@@ -29,8 +29,8 @@ import org.apache.hadoop.io.nativeio.NativeIO;
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.POSIX_FADV_WILLNEED;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
index 9d3c3c1..2f1eecd 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.nativeio.NativeIO;
import org.apache.hadoop.io.nativeio.NativeIO.POSIX.Stat;
import org.apache.hadoop.security.UserGroupInformation;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class provides secure APIs for opening and creating files on the local
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
index fec0a4a..3f4649f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
@@ -24,7 +24,7 @@ import java.util.*;
import java.rmi.server.UID;
import java.security.MessageDigest;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.Options;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.fs.Options.CreateOpts;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
index f103aad..2ac2ca6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecPool.java
@@ -28,9 +28,9 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java
index 756ccf3..d66b6f0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DecompressorStream.java
@@ -22,7 +22,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
index 07afbab..7b30998 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibFactory.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel;
import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy;
import org.apache.hadoop.util.NativeCodeLoader;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.java
index ec1e35a..8b1b6db 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.io.compress.zstd;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecRegistry.java
index daf91e2..359e07e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecRegistry.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecRegistry.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io.erasurecode;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawErasureCoderFactory;
import org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawErasureCoderFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecUtil.java
index 5ba6e9c..c871ce3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/CodecUtil.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io.erasurecode;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.erasurecode.codec.ErasureCodec;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java
index c4347e0..6eee025 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Compression.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.compress.CodecPool;
import org.apache.hadoop.io.compress.CompressionCodec;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
index 160b8e0..06eb7a6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
@@ -47,7 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.misc.Unsafe;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* JNI wrappers for various native IO-related calls not available in Java.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AsyncCallHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AsyncCallHandler.java
index 69e1233..d4921f7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AsyncCallHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/AsyncCallHandler.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.io.retry;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.ipc.Client;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/CallReturn.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/CallReturn.java
index 022b785..7ccd6de 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/CallReturn.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/CallReturn.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io.retry;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** The call return from a method invocation. */
class CallReturn {
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
index 64824a1..8f299aa 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io.retry;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.io.retry.FailoverProxyProvider.ProxyInfo;
import org.apache.hadoop.io.retry.RetryPolicy.RetryAction;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
index fcbcc86..e6ccd76 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
@@ -43,7 +43,7 @@ import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
import org.ietf.jgss.GSSException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java
index 518c3cd..661d716 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto.RpcStatusProto;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index 3212046..d486805 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -19,9 +19,9 @@
package org.apache.hadoop.ipc;
import org.apache.hadoop.security.AccessControlException;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientId.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientId.java
index c95dbb9..cc65816 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientId.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientId.java
@@ -22,7 +22,7 @@ import java.util.UUID;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* A class defining a set of static helper methods to provide conversion between
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/DecayRpcScheduler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/DecayRpcScheduler.java
index 0ef481b..cdd62fe 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/DecayRpcScheduler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/DecayRpcScheduler.java
@@ -38,8 +38,8 @@ import javax.management.ObjectName;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.AtomicDoubleArray;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.AtomicDoubleArray;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.hadoop.conf.Configuration;
@@ -55,7 +55,7 @@ import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.metrics2.util.Metrics2Util.NameValuePair;
import org.apache.hadoop.metrics2.util.Metrics2Util.TopN;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java
index d15a710..26b1c25 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java
@@ -31,7 +31,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
index 220ad1d..b7b7ad4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ipc;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.BlockingService;
import com.google.protobuf.Descriptors.MethodDescriptor;
import com.google.protobuf.Message;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine2.java
index 3031534..fa1f106 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine2.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine2.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ipc;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.*;
import org.apache.hadoop.thirdparty.protobuf.Descriptors.MethodDescriptor;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
index 69d18ea..e1a1f0e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableFactories;
import org.apache.hadoop.io.WritableFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
public class ProtocolSignature implements Writable {
static { // register a ctor
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProxyCombiner.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProxyCombiner.java
index 99eb487..835d806 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProxyCombiner.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProxyCombiner.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.ipc;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java
index e67e8d9..95f1323 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RefreshRegistry.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.ipc;
import java.util.ArrayList;
import java.util.Collection;
-import com.google.common.base.Joiner;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
index 4bde261..d71edde 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RetryCache.java
@@ -28,8 +28,8 @@ import org.apache.hadoop.util.LightWeightCache;
import org.apache.hadoop.util.LightWeightGSet;
import org.apache.hadoop.util.LightWeightGSet.LinkedElement;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 12aed52..d6a19a0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -123,7 +123,7 @@ import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
import org.apache.hadoop.thirdparty.protobuf.CodedOutputStream;
import org.apache.hadoop.thirdparty.protobuf.Message;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/DecayRpcSchedulerDetailedMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/DecayRpcSchedulerDetailedMetrics.java
index 04a6c0e..ce65e9c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/DecayRpcSchedulerDetailedMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/DecayRpcSchedulerDetailedMetrics.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.metrics2.lib.MutableRatesWithAggregation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class is for maintaining queue (priority) level related
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
index bb4bfcf..439b873 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.ipc.metrics;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
index 79eae12..829d276 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Jdk14Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
index eb147ca..6bf75f9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.log;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java
index e2574f6..a9e777b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java
@@ -18,13 +18,13 @@
package org.apache.hadoop.metrics2;
-import com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import java.util.StringJoiner;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* The immutable metric
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java
index db8a5d9..26973f8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java
@@ -18,13 +18,13 @@
package org.apache.hadoop.metrics2;
-import com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import java.util.StringJoiner;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* Immutable tag for metrics (for grouping on host/queue/username etc.)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
index ca1d7f9..7e3257d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/filter/AbstractPatternFilter.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.metrics2.filter;
import java.util.Map;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
index a4632c6..28348c7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.metrics2.impl;
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
import org.apache.hadoop.metrics2.MetricsRecord;
import java.util.StringJoiner;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
index cdd0ba4..a297072 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MBeanInfoBuilder.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsInfo;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
index 5345c1b..4b4b70b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsCollectorImpl.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.metrics2.impl;
import java.util.Iterator;
import java.util.List;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsInfo;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
index a1f4d23..2d22b75 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
@@ -29,10 +29,10 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.PropertiesConfiguration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
index f66ec5c..19e4c3b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordBuilderImpl.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.metrics2.impl;
import java.util.Collections;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsInfo;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
index 5674dfb..58ebbcf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordFiltered.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.metrics2.impl;
import java.util.Iterator;
import java.util.Collection;
-import com.google.common.collect.AbstractIterator;
+import org.apache.hadoop.thirdparty.com.google.common.collect.AbstractIterator;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsFilter;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
index 8eb6cb8..14b930e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsRecordImpl.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.metrics2.impl;
import java.util.List;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.AbstractMetric;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
index f2e607b..836d9d5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java
@@ -22,7 +22,7 @@ import java.io.Closeable;
import java.util.Random;
import java.util.concurrent.*;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.metrics2.lib.MutableGaugeInt;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index f12ec67..852f319 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -29,10 +29,10 @@ import javax.management.MBeanInfo;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import static com.google.common.base.Preconditions.*;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.metrics2.AbstractMetric;
import org.apache.hadoop.metrics2.MetricsFilter;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
index cf4b4a9..a6edf08 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
@@ -30,10 +30,10 @@ import java.util.Timer;
import java.util.TimerTask;
import javax.management.ObjectName;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.annotations.VisibleForTesting;
-import static com.google.common.base.Preconditions.*;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.math3.util.ArithmeticUtils;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
index 935f47f..83e458f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/DefaultMetricsSystem.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.metrics2.MetricsException;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.impl.MetricsSystemImpl;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* The default metrics system singleton. This class is used by all the daemon
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
index 9b54adc..96eb502 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MethodMetric.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.metrics2.lib;
import java.lang.reflect.Method;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.metrics2.MetricsException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
index e3adc82..e86398f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java
@@ -18,12 +18,12 @@
package org.apache.hadoop.metrics2.lib;
-import com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
import org.apache.hadoop.metrics2.MetricsInfo;
import java.util.StringJoiner;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
/**
* Making implementing metric info a little easier
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
index 6227d09..b71f7f8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.lib;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.metrics2.MetricsException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
index 1fcede4..f400f02 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsSourceBuilder.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsCollector;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
index 8ba7234..e616bb6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableCounter.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.lib;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
index 03384f6..6c77e97 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableGauge.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.lib;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableQuantiles.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableQuantiles.java
index 910805e..0e69c26 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableQuantiles.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableQuantiles.java
@@ -35,8 +35,8 @@ import org.apache.hadoop.metrics2.util.Quantile;
import org.apache.hadoop.metrics2.util.QuantileEstimator;
import org.apache.hadoop.metrics2.util.SampleQuantiles;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* Watches a stream of long values, maintaining online estimates of specific
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java
index 994eb13..c31c2e6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRates.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.metrics2.lib;
import java.lang.reflect.Method;
import java.util.Set;
-import static com.google.common.base.Preconditions.*;
-import com.google.common.collect.Sets;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRatesWithAggregation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRatesWithAggregation.java
index 5fe0083..2079165 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRatesWithAggregation.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRatesWithAggregation.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.lib;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.Iterator;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
index 6803d11..e6111e3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -39,8 +39,8 @@ import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.impl.MetricsCollectorImpl;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import javax.annotation.Nullable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
index 0df852d..2508ee2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/UniqueNames.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.metrics2.lib;
import java.util.Map;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/RollingFileSystemSink.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/RollingFileSystemSink.java
index 1d330c7..4dfe9c6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/RollingFileSystemSink.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/RollingFileSystemSink.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.sink;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.Closeable;
import java.io.IOException;
import java.io.PrintStream;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
index f19a2be..816940b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
@@ -27,8 +27,8 @@ import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java
index 1b50498..ed839a3 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MBeans.java
@@ -28,12 +28,12 @@ import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java
index 6cfbc39..bf6e910 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.metrics2.util;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.metrics2.AbstractMetric;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Quantile.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Quantile.java
index 40e31bd..7a100ed 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Quantile.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Quantile.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.metrics2.util;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.collect.ComparisonChain;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ComparisonChain;
/**
* Specifies a quantile (with error bounds) to be watched by a
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleQuantiles.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleQuantiles.java
index 0c5d98f..7383b2d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleQuantiles.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/SampleQuantiles.java
@@ -26,9 +26,9 @@ import java.util.TreeMap;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Implementation of the Cormode, Korn, Muthukrishnan, and Srivastava algorithm
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java
index 19a64a9..2bd49e9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/Servers.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.metrics2.util;
import java.net.InetSocketAddress;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
index 531ad80..ffe7ee5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.net;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 52e8613..3715e3c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -57,7 +57,7 @@ import org.apache.hadoop.ipc.VersionedProtocol;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
index cd5490d..d37aebc 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.net;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputWrapper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputWrapper.java
index f5cbe17..45f776e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputWrapper.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputWrapper.java
@@ -27,7 +27,7 @@ import java.nio.channels.ReadableByteChannel;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* A wrapper stream around a socket which allows setting of its timeout. If the
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocket.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocket.java
index 9693220..99fde5c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocket.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocket.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang3.SystemUtils;
import org.apache.hadoop.util.NativeCodeLoader;
import org.apache.hadoop.util.CloseableReferenceCount;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
index e36399f..17c7d4b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java
@@ -35,9 +35,9 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.lang3.SystemUtils;
import org.apache.hadoop.util.NativeCodeLoader;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
index b29278b..5ff5778 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Groups.java
@@ -37,18 +37,18 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Ticker;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Ticker;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.FutureCallback;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IngressPortBasedResolver.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IngressPortBasedResolver.java
index a30e4a8..1431ed5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IngressPortBasedResolver.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IngressPortBasedResolver.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.security;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.net.InetAddress;
import java.util.Collection;
import java.util.HashMap;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
index 8e71f69..3e89c27 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
@@ -58,7 +58,7 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
-import com.google.common.collect.Iterators;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterators;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ProviderUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ProviderUtils.java
index d7a6821..23efffc 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ProviderUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ProviderUtils.java
@@ -24,7 +24,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RuleBasedLdapGroupsMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RuleBasedLdapGroupsMapping.java
index 6accf2f..6af28f1 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RuleBasedLdapGroupsMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RuleBasedLdapGroupsMapping.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.security;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
index 215f473..7dc28fb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
@@ -71,7 +71,7 @@ import org.apache.hadoop.security.token.TokenInfo;
import org.apache.hadoop.security.token.TokenSelector;
import org.apache.hadoop.util.ProtoUtil;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
import com.google.re2j.Pattern;
import org.slf4j.Logger;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
index 03c5b58..3b9e9c5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
@@ -57,8 +57,8 @@ import org.xbill.DNS.Name;
import org.xbill.DNS.ResolverConfig;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
/**
* Security Utils.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
index 92ea83d..e517bad 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
@@ -32,9 +32,9 @@ import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.BiMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashBiMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
index 31f4398..96e4402 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
index dcee9f4..b783f82 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
@@ -28,7 +28,7 @@ import static org.apache.hadoop.security.UGIExceptionMessages.*;
import static org.apache.hadoop.util.PlatformName.IBM_JAVA;
import static org.apache.hadoop.util.StringUtils.getTrimmedStringCollection;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.File;
import java.io.IOException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/AbstractJavaKeyStoreProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/AbstractJavaKeyStoreProvider.java
index df783f1..10f8da4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/AbstractJavaKeyStoreProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/AbstractJavaKeyStoreProvider.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.ProviderUtils;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
index 6037724..f172f08 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
@@ -25,7 +25,7 @@ import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.List;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.StringUtils;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/DefaultImpersonationProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/DefaultImpersonationProvider.java
index f645359..f258930 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/DefaultImpersonationProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/DefaultImpersonationProvider.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.MachineList;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
@InterfaceStability.Unstable
@InterfaceAudience.Public
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
index 6829a2a..e7e2a05 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.security.authorize;
import java.net.InetAddress;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
@InterfaceStability.Unstable
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce", "HBase", "Hive"})
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
index b17e02b..c83afc7 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ServiceAuthorizationManager.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.MachineList;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/CrossOriginFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/CrossOriginFilter.java
index 60c2864..6ba651c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/CrossOriginFilter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/http/CrossOriginFilter.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/DelegatingSSLSocketFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/DelegatingSSLSocketFactory.java
index ff650d6..9d7afa9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/DelegatingSSLSocketFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/DelegatingSSLSocketFactory.java
@@ -30,7 +30,7 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
index 3531173..b184e4a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.security.ssl;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java
index b2f0118..7430477 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/ReloadingX509TrustManager.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.security.ssl;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
index 4f0f6fc..e521a7c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.security.token;
-import com.google.common.collect.Maps;
-import com.google.common.primitives.Bytes;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Bytes;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.HadoopIllegalArgumentException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
index a89c998..3f27e45 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenIdentifier.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
import org.apache.hadoop.security.token.TokenIdentifier;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
@InterfaceAudience.Public
@InterfaceStability.Evolving
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
index f329acc..2cf270b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.Time;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index f61590c..6f65574 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -65,8 +65,8 @@ import org.apache.zookeeper.data.Id;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* An implementation of {@link AbstractDelegationTokenSecretManager} that
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticatedURL.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticatedURL.java
index 4e9881b..07507f9 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticatedURL.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticatedURL.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.security.token.delegation.web;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.Text;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationFilter.java
index 5275526..ae42c7c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationFilter.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationFilter.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.security.token.delegation.web;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.curator.framework.CuratorFramework;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java
index 284044f..479517f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* An {@link AuthenticationHandler} that implements Kerberos SPNEGO mechanism
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java
index e1445fb..7e7e794 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.security.token.delegation.ZKDelegationTokenSecretManage
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Delegation Token Manager used by the
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/MultiSchemeDelegationTokenAuthenticationHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/MultiSchemeDelegationTokenAuthenticationHandler.java
index 0661fb2..865977e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/MultiSchemeDelegationTokenAuthenticationHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/MultiSchemeDelegationTokenAuthenticationHandler.java
@@ -36,8 +36,8 @@ import org.apache.hadoop.security.authentication.server.CompositeAuthenticationH
import org.apache.hadoop.security.authentication.server.HttpConstants;
import org.apache.hadoop.security.authentication.server.MultiSchemeAuthenticationHandler;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
/**
* A {@link CompositeAuthenticationHandler} that supports multiple HTTP
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/AbstractService.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/AbstractService.java
index c9fec43..309bfa0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/AbstractService.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/AbstractService.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability.Evolving;
import org.apache.hadoop.conf.Configuration;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/InterruptEscalator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/InterruptEscalator.java
index 594fc5b..ad92d4c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/InterruptEscalator.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/InterruptEscalator.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/IrqHandler.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/IrqHandler.java
index 17aa963..bcb589f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/IrqHandler.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/IrqHandler.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.service.launcher;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.misc.Signal;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/ServiceLauncher.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/ServiceLauncher.java
index 5e8a1f4..903e6ba 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/ServiceLauncher.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/launcher/ServiceLauncher.java
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AutoCloseableLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AutoCloseableLock.java
index d7fe93d..e761858 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AutoCloseableLock.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/AutoCloseableLock.java
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This is a wrap class of a ReentrantLock. Extending AutoCloseable
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/BlockingThreadPoolExecutorService.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/BlockingThreadPoolExecutorService.java
index d49013e..451b5f5 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/BlockingThreadPoolExecutorService.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/BlockingThreadPoolExecutorService.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ChunkedArrayList.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ChunkedArrayList.java
index 84ddc32..ff7197c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ChunkedArrayList.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ChunkedArrayList.java
@@ -23,10 +23,10 @@ import java.util.List;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* Simplified List implementation which stores elements as a list
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CloseableReferenceCount.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CloseableReferenceCount.java
index 388a087..f81a429 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CloseableReferenceCount.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CloseableReferenceCount.java
@@ -21,7 +21,7 @@ import java.nio.channels.AsynchronousCloseException;
import java.nio.channels.ClosedChannelException;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* A closeable object that maintains a reference count.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DirectBufferPool.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DirectBufferPool.java
index 510938b..9f4cc19 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DirectBufferPool.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DirectBufferPool.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceStability;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java
index 2ee53dc..ee70256 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskValidatorFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskValidatorFactory.java
index 7d04db2..1e5e964 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskValidatorFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskValidatorFactory.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.DiskChecker.DiskErrorException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/FindClass.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/FindClass.java
index 690d097..846af7f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/FindClass.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/FindClass.java
@@ -17,7 +17,7 @@
package org.apache.hadoop.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.util.StringUtils;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GcTimeMonitor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GcTimeMonitor.java
index 4247eb7..e8dc8cb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GcTimeMonitor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GcTimeMonitor.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.util;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
index 3ae4bba..81a22a4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.util;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* The IdentityHashStore stores (key, value) mappings in an array.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedLock.java
index cc0ebdf..a5f4f07 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedLock.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedLock.java
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java
index 8ab392e..8417246 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java
index 6842166..710861c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java
@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
/**
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IntrusiveCollection.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IntrusiveCollection.java
index 1ffb7db..126aa6a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IntrusiveCollection.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IntrusiveCollection.java
@@ -23,7 +23,7 @@ import java.util.NoSuchElementException;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JsonSerialization.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JsonSerialization.java
index e043b1d..7a26eca 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JsonSerialization.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JsonSerialization.java
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
index 420ac8b..9c9953f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java
@@ -28,11 +28,11 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightCache.java
index 79de1ac..01ddf37 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightCache.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightCache.java
@@ -24,8 +24,8 @@ import java.util.PriorityQueue;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* A low memory footprint Cache which extends {@link LightWeightGSet}.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
index 7c7878a..d2ea5cf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LightWeightGSet.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A low memory footprint {@link GSet} implementation,
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java
index bd646e0..de95e98 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LimitInputStream.java
@@ -19,8 +19,8 @@
package org.apache.hadoop.util;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
import java.io.FilterInputStream;
import java.io.IOException;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/MachineList.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/MachineList.java
index 3d12b40..f87d059 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/MachineList.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/MachineList.java
@@ -29,7 +29,7 @@ import java.util.Set;
import org.apache.commons.net.util.SubnetUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCrc32.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCrc32.java
index 3142df2..cc41f02 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCrc32.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCrc32.java
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import org.apache.hadoop.fs.ChecksumException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Wrapper around JNI support code to do checksum computation
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReadWriteDiskValidatorMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReadWriteDiskValidatorMetrics.java
index 6201862..83cc6dc 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReadWriteDiskValidatorMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ReadWriteDiskValidatorMetrics.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsInfo;
import org.apache.hadoop.metrics2.MetricsSystem;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SemaphoredDelegatingExecutor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SemaphoredDelegatingExecutor.java
index 4ec77e7..1f29ba8 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SemaphoredDelegatingExecutor.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SemaphoredDelegatingExecutor.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.util;
-import com.google.common.util.concurrent.ForwardingListeningExecutorService;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ForwardingListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
index 9ba9e94..5096b10 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ServletUtil.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
@InterfaceAudience.Private
@InterfaceStability.Unstable
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index e66c81b..8625b21 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -34,7 +34,7 @@ import java.util.TimerTask;
import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.security.alias.AbstractJavaKeyStoreProvider;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
index 76d9006..1b43c5d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.util;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.util.concurrent.HadoopExecutors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java
index 50a728e..296727e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
index 028e49a..4a30ee2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringInterner.java
@@ -21,8 +21,8 @@ package org.apache.hadoop.util;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.collect.Interner;
-import com.google.common.collect.Interners;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Interner;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Interners;
/**
* Provides string interning utility methods. For weak interning,
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
index cf7b04a..9e7b36f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
@@ -42,8 +42,8 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.net.NetUtils;
-import com.google.common.base.Preconditions;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
/**
* General string utils
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoLinux.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoLinux.java
index 3591bb8..6f2f585 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoLinux.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoLinux.java
@@ -30,7 +30,7 @@ import java.util.HashSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
index e894014..4d86153 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.util;
import java.io.IOException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ZKUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ZKUtil.java
index 48cef5f..8e4e67d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ZKUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ZKUtil.java
@@ -27,10 +27,10 @@ import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Id;
-import com.google.common.base.Charsets;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
/**
* Utilities for working with ZooKeeper.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/AsyncGetFuture.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/AsyncGetFuture.java
index 61eb777..46fc8df 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/AsyncGetFuture.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/concurrent/AsyncGetFuture.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.util.concurrent;
-import com.google.common.util.concurrent.AbstractFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.AbstractFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java
index 86142fb..e125dbf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ChildReaper.java
@@ -18,7 +18,7 @@
*/
package org.apache.hadoop.util.curator;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.curator.framework.recipes.locks.Reaper;
import org.apache.curator.utils.CloseableUtils;
import org.apache.curator.framework.CuratorFramework;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
index 36dade2..3e39395 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
@@ -39,7 +39,7 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Helper class that provides utility methods specific to ZK operations.
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
index cf42219..eae9a1f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java
@@ -38,7 +38,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
import org.apache.hadoop.http.HttpServer2;
import org.junit.BeforeClass;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
index efb8131..2c0d602 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationDeprecation.java
@@ -47,8 +47,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
public class TestConfigurationDeprecation {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java
index dd801a5..4948df9 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestReconfiguration.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.conf;
import java.util.function.Supplier;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoCodec.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoCodec.java
index eca23a7..ce4e7ff 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoCodec.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoCodec.java
@@ -43,7 +43,7 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.primitives.Longs;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Longs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestValueQueue.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestValueQueue.java
index 55a9280..9b8638f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestValueQueue.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestValueQueue.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
public class TestValueQueue {
Logger LOG = LoggerFactory.getLogger(TestValueQueue.class);
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java
index 7804c73..616c66b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java
@@ -62,7 +62,7 @@ import org.junit.Test;
import org.junit.rules.Timeout;
import org.mockito.Mockito;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
public class TestLoadBalancingKMSClientProvider {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
index de278dd..2aa5407 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FCStatisticsBaseTest.java
@@ -38,7 +38,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.function.Supplier;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java
index 9ba1797..01abeaa 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCaching.java
@@ -32,8 +32,8 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.test.HadoopTestBase;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
import org.apache.hadoop.util.BlockingThreadPoolExecutorService;
import org.assertj.core.api.Assertions;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
index 517f6ce..1384bb6 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.fs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem.Statistics;
import org.apache.hadoop.fs.permission.FsPermission;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
index c0d79c1..18f8808 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestPath.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.io.AvroTestUtil;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Shell;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows;
import static org.apache.hadoop.test.PlatformAssumptions.assumeWindows;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
index 8a520fa..d0b067a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.assertj.core.api.Assertions;
import org.junit.Assume;
import org.junit.Test;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
index 02d5a48..b25990f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Comparator;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
index 4b3bd2f..1ccc340 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
@@ -47,7 +47,7 @@ import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java
index be61811..666000b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java
@@ -51,7 +51,7 @@ import org.junit.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Copy-paste of ClientBase from ZooKeeper, but without any of the
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
index 0c25307..b5739f7 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.AccessControlException;
import org.mockito.Mockito;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
index f63d267..3c9713b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
@@ -37,8 +37,8 @@ import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.ZooKeeperServer;
-import com.google.common.base.Preconditions;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java
index bbef9ef..badd5af 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import org.mockito.AdditionalMatchers;
import org.mockito.Mockito;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.slf4j.event.Level;
/**
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java
index 63b9c63..13f7ecc 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java
@@ -30,8 +30,8 @@ import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestNodeFencer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestNodeFencer.java
index b929bcb..972113e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestNodeFencer.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestNodeFencer.java
@@ -29,7 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
public class TestNodeFencer {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
index fc36b1d..dcff9e3 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.net.InetSocketAddress;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
import org.apache.hadoop.util.Shell;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
index 59856a4..0fb20ac 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestText.java
@@ -23,8 +23,8 @@ import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.Random;
-import com.google.common.base.Charsets;
-import com.google.common.primitives.Bytes;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Bytes;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
index 8082e3a..ec42e46 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
@@ -39,10 +39,10 @@ import org.apache.hadoop.util.NativeCodeLoader;
import org.apache.log4j.Logger;
import org.junit.Assert;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
import static org.junit.Assert.*;
public class CompressDecompressTester<T extends Compressor, E extends Decompressor> {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
index 1f03597..64e021b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater;
import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Test;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
/**
* Test for pairs:
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java
index 7e2ab24..ac9ea5e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.test.MultithreadedTestUtil;
import org.apache.hadoop.util.NativeCodeLoader;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
public class TestZlibCompressorDecompressor {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/RawErasureCoderBenchmark.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/RawErasureCoderBenchmark.java
index 362bde9..631991a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/RawErasureCoderBenchmark.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/RawErasureCoderBenchmark.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.io.erasurecode.rawcoder;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.io.erasurecode.ErasureCoderOptions;
import org.apache.hadoop.util.StopWatch;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java
index e7130d4..6742425 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.ipc;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
index 2b9828b..3288152 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
@@ -99,8 +99,8 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.util.function.Supplier;
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Bytes;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java
index 3fdf445..0dabe46 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
index 8ebcc0b..5a1f1d1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.util.function.Supplier;
-import com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.hadoop.metrics2.MetricsException;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/MockDomainNameResolver.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/MockDomainNameResolver.java
index 3e436f3..3e3bdb7 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/MockDomainNameResolver.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/MockDomainNameResolver.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This mock resolver class returns the predefined resolving/reverse lookup
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestTableMapping.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestTableMapping.java
index 4b8b02f..86870e1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestTableMapping.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestTableMapping.java
@@ -21,8 +21,8 @@ import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.NET_TOPOLOGY_TA
import static org.junit.Assert.assertEquals;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocket.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocket.java
index c0d204f..466c83e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocket.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocket.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.net.unix.DomainSocket.DomainChannel;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.Shell;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
public class TestDomainSocket {
private static TemporarySocketDirectory sockDir;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocketWatcher.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocketWatcher.java
index aa522f2..ca801da 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocketWatcher.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/unix/TestDomainSocketWatcher.java
@@ -31,7 +31,7 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestLdapGroupsMappingWithBindUserSwitch.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestLdapGroupsMappingWithBindUserSwitch.java
index 4f080b3..3b4c77d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestLdapGroupsMappingWithBindUserSwitch.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestLdapGroupsMappingWithBindUserSwitch.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.security;
-import com.google.common.collect.Iterators;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterators;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.security.alias.CredentialProvider;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
index 016c589..9dcc4ca 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
@@ -46,7 +46,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
public class TestSecurityUtil {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java
index e6fdc2b..939209d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestShellBasedIdMapping.java
@@ -32,8 +32,8 @@ import org.apache.hadoop.security.ShellBasedIdMapping.PassThroughMap;
import org.apache.hadoop.security.ShellBasedIdMapping.StaticMapping;
import org.junit.Test;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.BiMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashBiMap;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
index 79fc008..ade6cb4 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
@@ -62,8 +62,8 @@ import org.junit.Assume;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
/**
* Test provides some very generic helpers which might be used across the tests
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/LambdaTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/LambdaTestUtils.java
index ad265af..3e0d31d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/LambdaTestUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/LambdaTestUtils.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.test;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
index 0cb5288..eb8d938 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.test;
-import static com.google.common.base.Preconditions.*;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.*;
import org.junit.Assert;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java
index 478a29b..5e0bfc2 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java
@@ -13,7 +13,7 @@
*/
package org.apache.hadoop.util;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java
index 570e542..0fb8876 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java
@@ -41,8 +41,8 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
public class TestApplicationClassLoader {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestDirectBufferPool.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestDirectBufferPool.java
index c8fd754..d6da2f8 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestDirectBufferPool.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestDirectBufferPool.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.junit.Test;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
public class TestDirectBufferPool {
final org.apache.hadoop.util.DirectBufferPool pool = new org.apache.hadoop.util.DirectBufferPool();
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
index 0dbfe3d..592b0bd 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
@@ -50,7 +50,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
public class TestGenericOptionsParser {
File testDir;
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestMachineList.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestMachineList.java
index 3cce91f..4d26ac5 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestMachineList.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestMachineList.java
@@ -28,7 +28,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import com.google.common.net.InetAddresses;;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;;
import org.junit.Test;
public class TestMachineList {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestZKUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestZKUtil.java
index 3d985e4..93790eb 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestZKUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestZKUtil.java
@@ -31,8 +31,8 @@ import org.apache.zookeeper.ZooDefs.Perms;
import org.apache.zookeeper.data.ACL;
import org.junit.Test;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
public class TestZKUtil {
private static final String TEST_ROOT_DIR = GenericTestUtils.getTempPath(
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
index ca018a6..f43930d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
@@ -33,8 +33,8 @@ import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.util.hash.Hash;
import org.apache.log4j.Logger;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
public class BloomFilterCommonTester<T extends Filter> {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java
index fbbb6d8..cfd9628 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java
@@ -31,9 +31,9 @@ import org.apache.hadoop.util.hash.Hash;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
public class TestBloomFilters {
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index d39473d..6cdd8b2 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -54,8 +54,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
index b6b42544..be0f8d3 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.crypto.key.kms.server;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.util.KMSUtil;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
index ba0fe82..1b75f9f 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java
@@ -35,7 +35,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Provides access to the <code>AccessControlList</code>s used by KMS,
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
index f546168..4c64a37 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.crypto.key.kms.server;
import static org.apache.hadoop.crypto.key.kms.server.KMSAuditLogger.AuditEvent;
import static org.apache.hadoop.crypto.key.kms.server.KMSAuditLogger.OpStatus;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.kms.server.KMSACLs.Type;
import org.apache.hadoop.crypto.key.kms.server.KeyAuthorizationKeyProvider.KeyOpType;
@@ -31,13 +31,13 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Strings;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.HashSet;
import java.util.concurrent.Callable;
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAuthenticationFilter.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAuthenticationFilter.java
index da542ff..c020af2 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAuthenticationFilter.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAuthenticationFilter.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.crypto.key.kms.server;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.kms.KMSDelegationToken;
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
index f3c0bbd..dc2ba32 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
@@ -21,7 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index da597b4..a92dd10 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletContextListener;
import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.CachingKeyProvider;
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
index 101591b..fe3207b 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
@@ -32,9 +32,9 @@ import org.apache.hadoop.crypto.key.KeyProviderCryptoExtension;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AuthorizationException;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
/**
* A {@link KeyProvider} proxy that checks whether the current user derived via
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
index 4dcbe2c..7482509 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/SimpleKMSAuditLogger.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
import org.apache.hadoop.conf.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/MiniKMS.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/MiniKMS.java
index faa8fa2..bc4bbc3 100644
--- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/MiniKMS.java
+++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/MiniKMS.java
@@ -26,7 +26,7 @@ import java.io.OutputStream;
import java.io.Writer;
import java.net.URL;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
index 5c18c77..3d59e6f 100644
--- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
+++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.crypto.key.kms.server;
import java.util.function.Supplier;
-import com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
import org.apache.curator.test.TestingServer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.key.KeyProviderFactory;
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml
index 15e7dea..5c8becd 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -94,8 +94,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
index 3d5088d..97b8a44 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/NfsExports.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.util.LightWeightGSet;
import org.apache.hadoop.util.LightWeightGSet.LinkedElement;
import org.apache.hadoop.util.StringUtils;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/LOOKUP3Request.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/LOOKUP3Request.java
index 4d31a82..46e4f72 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/LOOKUP3Request.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/LOOKUP3Request.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.hadoop.nfs.nfs3.FileHandle;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* LOOKUP3 Request
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/READ3Request.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/READ3Request.java
index 5898ec5..e2f3e2f 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/READ3Request.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/request/READ3Request.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.hadoop.nfs.nfs3.FileHandle;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* READ3 Request
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
index 5bde2c0..6fbfd5f 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.nfs.nfs3.Nfs3Status;
import org.apache.hadoop.oncrpc.XDR;
import org.apache.hadoop.oncrpc.security.Verifier;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* READDIR3 Response
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
index cf32bd1..5e814c4 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.nfs.nfs3.response.READDIR3Response.Entry3;
import org.apache.hadoop.oncrpc.XDR;
import org.apache.hadoop.oncrpc.security.Verifier;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* READDIRPLUS3 Response
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
index 2d6f30e..8632a38 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class is used for handling the duplicate <em>non-idempotenty</em> Rpc
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
index 5c059aa..d4b2261 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
@@ -22,7 +22,7 @@ import java.net.DatagramSocket;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.oncrpc.RpcAcceptedReply.AcceptState;
import org.apache.hadoop.oncrpc.security.Verifier;
import org.apache.hadoop.oncrpc.security.VerifierNone;
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
index e866a5c..985629e 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.oncrpc;
import org.apache.hadoop.oncrpc.security.RpcAuthInfo;
import org.apache.hadoop.oncrpc.security.Verifier;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Represents an RPC message of type RPC reply as defined in RFC 1831
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
index acdc51c..419eff8 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
@@ -23,8 +23,8 @@ import java.nio.charset.StandardCharsets;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Utility class for building XDR messages based on RFC 4506.
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Credentials.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Credentials.java
index 64edf48..fd832c4 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Credentials.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/Credentials.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.oncrpc.security;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.oncrpc.XDR;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsNone.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsNone.java
index 753edba..f62dc6b 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsNone.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsNone.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.oncrpc.security;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** Credential used by AUTH_NONE */
public class CredentialsNone extends Credentials {
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsSys.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsSys.java
index 19ba320..8713d21 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsSys.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/CredentialsSys.java
@@ -21,7 +21,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.oncrpc.XDR;
/** Credential used by AUTH_SYS */
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
index 8bccd1b..1f8ad7b 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/security/VerifierNone.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.oncrpc.security;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** Verifier used by AUTH_NONE. */
public class VerifierNone extends Verifier {
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java
index 123999d..80f4382 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java
@@ -38,7 +38,7 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.jboss.netty.handler.timeout.IdleStateHandler;
import org.jboss.netty.util.HashedWheelTimer;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml
index 5bd5f1e..594f79a 100644
--- a/hadoop-common-project/hadoop-registry/pom.xml
+++ b/hadoop-common-project/hadoop-registry/pom.xml
@@ -126,8 +126,8 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
</dependency>
<dependency>
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/cli/RegistryCli.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/cli/RegistryCli.java
index 480ce0e..a1349f3 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/cli/RegistryCli.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/cli/RegistryCli.java
@@ -27,7 +27,7 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/DNSOperationsFactory.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/DNSOperationsFactory.java
index 1a8bb3e..8a26b4b 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/DNSOperationsFactory.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/DNSOperationsFactory.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.client.api;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.registry.server.dns.RegistryDNS;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryOperationsFactory.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryOperationsFactory.java
index 5f9c5f3..786bec0 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryOperationsFactory.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryOperationsFactory.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.client.api;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.ServiceStateException;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
index b8e9ba1..09df00d 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.client.binding;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.PathNotFoundException;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java
index 05df325..9a4369c 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.client.binding;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.registry.client.exceptions.InvalidRecordException;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java
index 1b839c2..d862fe6 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.registry.client.binding;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/FSRegistryOperationsService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/FSRegistryOperationsService.java
index 41884a9..6a08dcc 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/FSRegistryOperationsService.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/FSRegistryOperationsService.java
@@ -47,8 +47,8 @@ import org.apache.hadoop.service.CompositeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Filesystem-based implementation of RegistryOperations. This class relies
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java
index 2eb7aa5..a01b715 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.registry.client.impl.zk;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.curator.ensemble.EnsembleProvider;
import org.apache.curator.ensemble.fixed.FixedEnsembleProvider;
import org.apache.curator.framework.CuratorFramework;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistryOperationsService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistryOperationsService.java
index 4c911da..e46a016 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistryOperationsService.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistryOperationsService.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.client.impl.zk;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.registry.client.api.BindFlags;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
index c3cb021..065cbe3 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
@@ -18,9 +18,9 @@
package org.apache.hadoop.registry.client.impl.zk;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java
index 3c4a730..e045c16 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.registry.client.impl.zk;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.GetChildrenBuilder;
import org.apache.zookeeper.data.ACL;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
index 392884f..b92b93d 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.registry.client.types;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.registry.client.binding.JsonSerDeser;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
index 9bb02c3..1a85436 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.registry.client.types;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
index be63d02..eeee581 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
@@ -16,7 +16,7 @@
*/
package org.apache.hadoop.registry.server.dns;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.net.util.Base64;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNSServer.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNSServer.java
index 826b02c..1ff5f26 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNSServer.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNSServer.java
@@ -16,7 +16,7 @@
*/
package org.apache.hadoop.registry.server.dns;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.PathNotFoundException;
import org.apache.hadoop.registry.client.api.DNSOperationsFactory;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/ReverseZoneUtils.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/ReverseZoneUtils.java
index 796f46b..bb37583 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/ReverseZoneUtils.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/ReverseZoneUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.hadoop.registry.server.dns;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/integration/SelectByYarnPersistence.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/integration/SelectByYarnPersistence.java
index 6a1993e..8d395e4 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/integration/SelectByYarnPersistence.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/integration/SelectByYarnPersistence.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.server.integration;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.registry.client.types.RegistryPathStatus;
import org.apache.hadoop.registry.client.types.ServiceRecord;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java
index a7e2611..0ab4cd2 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.registry.server.services;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.ensemble.fixed.FixedEnsembleProvider;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java
index d60797e..3234088 100644
--- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java
+++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.registry.server.services;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientContext.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientContext.java
index 7a03240..b34420d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/ClientContext.java
@@ -43,7 +43,7 @@ import org.apache.hadoop.net.ScriptBasedMapping;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index 72b2113..c7ed163 100755
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -192,11 +192,11 @@ import org.apache.htrace.core.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
/********************************************************
* DFSClient can connect to a Hadoop Filesystem and
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClientFaultInjector.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClientFaultInjector.java
index d36c058..3e4d1df 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClientFaultInjector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClientFaultInjector.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs;
import java.util.concurrent.atomic.AtomicLong;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
index 0676cf9..0a7fc8f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
@@ -88,7 +88,7 @@ import org.apache.hadoop.util.StopWatch;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import javax.annotation.Nonnull;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index a9e44cd..e85e2a2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -72,8 +72,8 @@ import org.apache.htrace.core.TraceScope;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/****************************************************************
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
index ba35d51..6158521 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ReadOption;
import org.apache.hadoop.hdfs.protocol.BlockType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
index bd1a6ec..2ed11ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.CreateFlag;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
index 95aad12..2b3c676 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
-import com.google.common.primitives.SignedBytes;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.SignedBytes;
import java.net.URISyntaxException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
index 1344c3b..d9daa37 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.BlockWrite;
@@ -80,11 +80,11 @@ import org.apache.htrace.core.SpanId;
import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
index a573e8a..fd5e9c3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DeadNodeDetector.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 2104825..53655d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -19,9 +19,9 @@
package org.apache.hadoop.hdfs;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.commons.collections.list.TreeList;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java
index 17d20fe..29073a1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java
@@ -28,11 +28,11 @@ import org.apache.hadoop.crypto.key.KeyProvider;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.util.KMSUtil;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/NameNodeProxiesClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/NameNodeProxiesClient.java
index 68577aa..31bc2d9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/NameNodeProxiesClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/NameNodeProxiesClient.java
@@ -35,8 +35,8 @@ import org.apache.hadoop.ipc.AlignmentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
index 0580ed5..79f3133 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java
@@ -23,9 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.LinkedListMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.LinkedListMultimap;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PositionStripeReader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PositionStripeReader.java
index 65d2c90..efadedb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PositionStripeReader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PositionStripeReader.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.util.StripedBlockUtil;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StatefulStripeReader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StatefulStripeReader.java
index b37501d..8bc6951 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StatefulStripeReader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StatefulStripeReader.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.util.StripedBlockUtil;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
index 8fd38bd..e66d391 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.fs.ChecksumException;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java
index d920f18..e78beb1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.hdfs.util.ByteArrayManager;
import org.apache.hadoop.util.DataChecksum;
import org.apache.hadoop.util.Progressable;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class extends {@link DataStreamer} to support writing striped blocks
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/XAttrHelper.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/XAttrHelper.java
index 0bb9955..f6e32c4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/XAttrHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/XAttrHelper.java
@@ -26,9 +26,9 @@ import org.apache.hadoop.fs.XAttr;
import org.apache.hadoop.fs.XAttr.NameSpace;
import org.apache.hadoop.util.StringUtils;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
@InterfaceAudience.Private
public class XAttrHelper {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java
index 02e5deb..5a615bb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataInputStream.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* The Hdfs implementation of {@link FSDataInputStream}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataOutputStream.java
index d733129..8af3417 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsDataOutputStream.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hdfs.DFSOutputStream;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* The Hdfs implementation of {@link FSDataOutputStream}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderFactory.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderFactory.java
index 028d629..f9fd2b1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderFactory.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderFactory.java
@@ -30,8 +30,8 @@ import java.net.InetSocketAddress;
import java.nio.channels.UnresolvedAddressException;
import java.util.List;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
+import org.apache.hadoop.thirdparty.com.google.common.io.ByteArrayDataOutput;
+import org.apache.hadoop.thirdparty.com.google.common.io.ByteStreams;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
@@ -74,8 +74,8 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.PerformanceAdvisory;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocal.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocal.java
index 9c1ef46..e7ddb98 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocal.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocal.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.client.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.ReadOption;
import org.apache.hadoop.fs.StorageType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderRemote.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderRemote.java
index 0f2f54c..f25f50c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderRemote.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderRemote.java
@@ -51,7 +51,7 @@ import org.apache.hadoop.hdfs.shortcircuit.ClientMmap;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.DataChecksum;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
index e41b608..7105322 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.client.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/LeaseRenewer.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/LeaseRenewer.java
index 8a040f2..d108af9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/LeaseRenewer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/LeaseRenewer.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/SnapshotDiffReportGenerator.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/SnapshotDiffReportGenerator.java
index 4dbe988..89e2e41 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/SnapshotDiffReportGenerator.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/SnapshotDiffReportGenerator.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.client.impl;
import java.util.*;
-import com.google.common.primitives.SignedBytes;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.SignedBytes;
import org.apache.hadoop.util.ChunkedArrayList;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReportListing.DiffReportListingEntry;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/metrics/BlockReaderLocalMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/metrics/BlockReaderLocalMetrics.java
index 61b497e..83bfb8b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/metrics/BlockReaderLocalMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/metrics/BlockReaderLocalMetrics.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.client.impl.metrics;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.annotation.Metric;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/BlockStoragePolicy.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/BlockStoragePolicy.java
index edb81e9..7bd3f96 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/BlockStoragePolicy.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/BlockStoragePolicy.java
@@ -23,7 +23,7 @@ import java.util.EnumSet;
import java.util.LinkedList;
import java.util.List;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.BlockStoragePolicySpi;
import org.apache.hadoop.fs.StorageType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveInfo.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveInfo.java
index e80f12a..3e5a443 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveInfo.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.Path;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.DFSUtilClient;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveIterator.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveIterator.java
index 917457f..db53690 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveIterator.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveIterator.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.fs.BatchedRemoteIterator;
import org.apache.hadoop.fs.InvalidRequestException;
import org.apache.hadoop.ipc.RemoteException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
index 0278fc9..2cb1687 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java
@@ -22,7 +22,7 @@ import org.apache.hadoop.thirdparty.protobuf.ByteString;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.net.InetSocketAddress;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicy.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicy.java
index 3559ab9..02c4f9a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicy.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicy.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.protocol;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicyInfo.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicyInfo.java
index c8a2722..48b581d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicyInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ErasureCodingPolicyInfo.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.protocol;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsPartialListing.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsPartialListing.java
index c3e0ac5..d96c789 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsPartialListing.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsPartialListing.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdfs.protocol;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.ipc.RemoteException;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java
index ed4d668..f2d8135 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java
@@ -22,14 +22,14 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
import org.apache.hadoop.security.token.Token;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* Associates a block with the Datanodes that contain its replicas
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ReencryptionStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ReencryptionStatus.java
index dabecea..5d7b913 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ReencryptionStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ReencryptionStatus.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hdfs.protocol;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.BatchedRemoteIterator.BatchedListEntries;
import org.apache.hadoop.hdfs.protocol.proto.HdfsProtos.ReencryptionInfoProto;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReport.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReport.java
index 7bc95c9..e6f20c9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReport.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReport.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.hadoop.fs.Path;
-import com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
import org.apache.hadoop.hdfs.DFSUtilClient;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReportListing.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReportListing.java
index 79fd543..74329bc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReportListing.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshotDiffReportListing.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hdfs.protocol;
import java.util.Collections;
import java.util.List;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.DFSUtilClient;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
index c7628d8..10884f2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.protocol;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.protocol.proto.HdfsProtos.ReencryptionInfoProto;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketHeader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketHeader.java
index 4869094..cc958e3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketHeader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketHeader.java
@@ -27,9 +27,9 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hdfs.protocol.proto.DataTransferProtos.PacketHeaderProto;
import org.apache.hadoop.hdfs.util.ByteBufferOutputStream;
-import com.google.common.base.Preconditions;
-import com.google.common.primitives.Shorts;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Shorts;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.apache.hadoop.thirdparty.protobuf.InvalidProtocolBufferException;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketReceiver.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketReceiver.java
index 6b717ec..dc6d590 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketReceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PacketReceiver.java
@@ -28,8 +28,8 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.DirectBufferPool;
import org.apache.hadoop.io.IOUtils;
-import com.google.common.base.Preconditions;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
index 6992477..b58fbb8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/DataTransferSaslUtil.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/DataTransferSaslUtil.java
index 8d6e318..94ae400 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/DataTransferSaslUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/DataTransferSaslUtil.java
@@ -57,10 +57,10 @@ import org.apache.hadoop.security.SaslRpcServer.QualityOfProtection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
index acd1e50..86053ee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
@@ -21,7 +21,7 @@ import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_ENCRYPT_DAT
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_ENCRYPT_DATA_OVERWRITE_DOWNSTREAM_NEW_QOP_KEY;
import static org.apache.hadoop.hdfs.protocol.datatransfer.sasl.DataTransferSaslUtil.*;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -64,8 +64,8 @@ import org.apache.hadoop.security.token.Token;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* Negotiates SASL for DataTransferProtocol on behalf of a client. There are
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
index f6a3f5d..35b52b5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java
@@ -24,7 +24,7 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import java.util.Map;
import java.util.concurrent.TimeUnit;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
index 9fc3024..b3932f9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
@@ -28,12 +28,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Lists;
-import com.google.common.primitives.Shorts;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Shorts;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
import org.apache.hadoop.thirdparty.protobuf.CodedInputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java
index a48c401..e387ca7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/ReconfigurationProtocolUtils.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange;
import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetReconfigurationStatusConfigChangeProto;
import org.apache.hadoop.hdfs.protocol.proto.ReconfigurationProtocolProtos.GetReconfigurationStatusResponseProto;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* This is a client side utility class that handles
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenIdentifier.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenIdentifier.java
index 1d395ec..4b2e6cd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenIdentifier.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenIdentifier.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.EnumSet;
import java.util.Optional;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.protocol.proto.HdfsProtos.AccessModeProto;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenIdentifier.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenIdentifier.java
index d753174..dcbf6c8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenIdentifier.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenIdentifier.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A delegation token identifier that is specific to HDFS.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
index 2d1cfc1..c343d00 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockMetadataHeader.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.DataChecksum;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.InvalidChecksumSizeException;
import org.slf4j.Logger;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java
index 505273e..130e8c1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java
@@ -22,7 +22,7 @@ package org.apache.hadoop.hdfs.server.datanode;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkStatus.java
index af34c49..7e3954c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkStatus.java
@@ -23,7 +23,7 @@ package org.apache.hadoop.hdfs.server.datanode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
index 6b99a7f..9cabeb9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
@@ -50,7 +50,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A {@link org.apache.hadoop.io.retry.FailoverProxyProvider} implementation
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowDiskReports.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowDiskReports.java
index 496389a..95078a7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowDiskReports.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowDiskReports.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.protocol;
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowPeerReports.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowPeerReports.java
index 218e30d..a3b3445 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowPeerReports.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/protocol/SlowPeerReports.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdfs.server.protocol;
-import com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShm.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShm.java
index 81cc68d..7bf7689 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShm.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShm.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager.EndpointShmManage
import org.apache.hadoop.net.unix.DomainSocket;
import org.apache.hadoop.net.unix.DomainSocketWatcher;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* DfsClientShm is a subclass of ShortCircuitShm which is used by the
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShmManager.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShmManager.java
index 6b3d8e0..4bd2b9b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShmManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DfsClientShmManager.java
@@ -43,8 +43,8 @@ import org.apache.hadoop.hdfs.shortcircuit.ShortCircuitShm.Slot;
import org.apache.hadoop.net.unix.DomainSocket;
import org.apache.hadoop.net.unix.DomainSocketWatcher;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DomainSocketFactory.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DomainSocketFactory.java
index 760e920..4043639 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DomainSocketFactory.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/DomainSocketFactory.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.hdfs.DFSUtilClient;
@@ -30,9 +30,9 @@ import org.apache.hadoop.hdfs.client.impl.DfsClientConf.ShortCircuitConf;
import org.apache.hadoop.net.unix.DomainSocket;
import org.apache.hadoop.util.PerformanceAdvisory;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
index d4d898c..40e687c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java
@@ -53,9 +53,9 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.Waitable;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitReplica.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitReplica.java
index 14116e2..86218aa 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitReplica.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitReplica.java
@@ -31,8 +31,8 @@ import org.apache.hadoop.hdfs.util.IOUtilsClient;
import org.apache.hadoop.io.nativeio.NativeIO;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitShm.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitShm.java
index b9fcada..1cb123b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitShm.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitShm.java
@@ -39,9 +39,9 @@ import org.slf4j.LoggerFactory;
import sun.misc.Unsafe;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ComparisonChain;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import javax.annotation.Nonnull;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/ByteArrayManager.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/ByteArrayManager.java
index 164b03b..059280e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/ByteArrayManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/ByteArrayManager.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.Time;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/StripedBlockUtil.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/StripedBlockUtil.java
index 012d708..460c611 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/StripedBlockUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/StripedBlockUtil.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdfs.util;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
@@ -28,7 +28,7 @@ import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
import org.apache.hadoop.hdfs.protocol.LocatedBlock;
import org.apache.hadoop.hdfs.protocol.LocatedStripedBlock;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;
import org.apache.hadoop.hdfs.DFSStripedOutputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/ByteRangeInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/ByteRangeInputStream.java
index 31de804..c83ccf9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/ByteRangeInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/ByteRangeInputStream.java
@@ -31,8 +31,8 @@ import org.apache.commons.io.input.BoundedInputStream;
import org.apache.hadoop.fs.FSExceptionMessages;
import org.apache.hadoop.fs.FSInputStream;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.net.HttpHeaders;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.net.HttpHeaders;
import javax.annotation.Nonnull;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java
index e846b56..87932cc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java
@@ -19,9 +19,9 @@ package org.apache.hadoop.hdfs.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.FileChecksum;
import org.apache.hadoop.fs.FileStatus;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/TokenAspect.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/TokenAspect.java
index 870103e..dfc754b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/TokenAspect.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/TokenAspect.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSelect
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class implements the aspects that relate to delegation tokens for all
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/URLConnectionFactory.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/URLConnectionFactory.java
index 8b6c7f7..589afb4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/URLConnectionFactory.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/URLConnectionFactory.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.security.authentication.client.ConnectionConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Utilities for handling URLs
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index 0d1ce76..ca59cf3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -134,10 +134,10 @@ import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import static org.apache.hadoop.fs.impl.PathCapabilitiesSupport.validatePathCapabilityArgs;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/AclPermissionParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/AclPermissionParam.java
index 9ab3ad5..5419219 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/AclPermissionParam.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/AclPermissionParam.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.fs.permission.AclEntry;
/** AclPermission parameter. */
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
index 19efb9d..0ebafe7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.web.resources;
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_WEBHDFS_USER_PATTERN_DEFAULT;
import org.apache.hadoop.security.UserGroupInformation;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.text.MessageFormat;
import java.util.regex.Pattern;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
index b24df2b..3f1ff88 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestPeerCache.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import com.google.common.collect.HashMultiset;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultiset;
import org.apache.hadoop.hdfs.net.Peer;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.net.unix.DomainSocket;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java
index 5704ef0..23e7b74 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java
@@ -56,7 +56,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
public class TestRequestHedgingProxyProvider {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestByteRangeInputStream.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestByteRangeInputStream.java
index 6c426f5..010d7c5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestByteRangeInputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestByteRangeInputStream.java
@@ -34,7 +34,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
-import com.google.common.net.HttpHeaders;
+import org.apache.hadoop.thirdparty.com.google.common.net.HttpHeaders;
import org.apache.hadoop.hdfs.web.ByteRangeInputStream.InputStreamAndFileLength;
import org.apache.hadoop.test.Whitebox;
import org.junit.Test;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestURLConnectionFactory.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestURLConnectionFactory.java
index 2be8bf4..108ce50 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestURLConnectionFactory.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestURLConnectionFactory.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.LoggerFactory;
public final class TestURLConnectionFactory {
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 3cb0fc2..71d91a8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -72,8 +72,8 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
index c77c6fd..cb8468d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonPathCapabilities;
@@ -70,9 +70,9 @@ import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
index 76b0a83..c4c2952 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.fs.http.server;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
index 5e855de..985feed 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.lib.servlet;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.lib.server.Server;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
index e0f6200..c171e92 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import java.util.List;
import java.util.Map;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
index c93f8f2..56a999f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.lib.wsrs;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import com.sun.jersey.api.core.HttpContext;
import com.sun.jersey.core.spi.component.ComponentContext;
import com.sun.jersey.core.spi.component.ComponentScope;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
index 874e615..53b9b7a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
@@ -73,7 +73,7 @@ import org.junit.runners.Parameterized;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
index da70805..1a6ff37 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java
@@ -100,7 +100,7 @@ import org.junit.Test;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import java.util.Properties;
import java.util.regex.Pattern;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
index a344054..7c0bf93 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -84,8 +84,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java
index 2721395..3b0327a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java
@@ -55,7 +55,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.ChannelHandlerContext;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* RPC program corresponding to mountd daemon. See {@link Mountd}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
index e0fb302..41add22 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hdfs.DFSClient;
@@ -40,13 +40,13 @@ import org.apache.hadoop.io.MultipleIOException;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ShutdownHookManager;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Objects;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java
index 8494493..ff64ad5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.hdfs.nfs.mount.Mountd;
import org.apache.hadoop.nfs.nfs3.Nfs3Base;
import org.apache.hadoop.util.StringUtils;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Nfs server. Supports NFS v3 using {@link RpcProgramNfs3}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java
index 764524a..3995fa5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.nfs.nfs3;
import java.util.Comparator;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* OffsetRange is the range of read/write request. A single point (e.g.,[5,5])
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
index 6067a5d..528ead7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
@@ -57,8 +57,8 @@ import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.Time;
import org.jboss.netty.channel.Channel;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java
index 5c915d2..b8db83c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java
@@ -30,9 +30,9 @@ import org.apache.hadoop.nfs.nfs3.FileHandle;
import org.apache.hadoop.util.Daemon;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* A cache saves OpenFileCtx objects for different users. Each cache entry is
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index cb46f44..d436eac 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -134,7 +134,7 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
index 98f3d6c..7685924 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
@@ -29,8 +29,8 @@ import org.apache.hadoop.nfs.nfs3.FileHandle;
import org.apache.hadoop.nfs.nfs3.Nfs3Constant.WriteStableHow;
import org.jboss.netty.channel.Channel;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* WriteCtx saves the context of one write request, such as request, channel,
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java
index 3554239..2889371 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java
@@ -45,7 +45,7 @@ import org.apache.hadoop.oncrpc.security.VerifierNone;
import org.apache.hadoop.security.IdMappingServiceProvider;
import org.jboss.netty.channel.Channel;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Manage the writes and responds asynchronously.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationRPCPerformanceMonitor.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationRPCPerformanceMonitor.java
index 5f06f59..64936e2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationRPCPerformanceMonitor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/FederationRPCPerformanceMonitor.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.metrics2.util.MBeans;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import static org.apache.hadoop.util.Time.monotonicNow;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
index 2e54765..c97e635 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/NamenodeBeanMetrics.java
@@ -61,9 +61,9 @@ import org.eclipse.jetty.util.ajax.JSON;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
/**
* Expose the Namenode metrics as the Router was one.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
index 05398e7..d626c23 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
@@ -88,7 +88,7 @@ import org.eclipse.jetty.util.ajax.JSON;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Implementation of the Router metrics collector.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/StateStoreMetrics.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/StateStoreMetrics.java
index 64bb108..b493221 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/StateStoreMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/StateStoreMetrics.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableGaugeInt;
import org.apache.hadoop.metrics2.lib.MutableRate;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Implementations of the JMX interface for the State Store metrics.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
index 96b560c..797006a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MountTableResolver.java
@@ -61,9 +61,9 @@ import org.apache.hadoop.hdfs.tools.federation.RouterAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
/**
* Mount table to map between global paths and remote locations. This allows the
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MultipleDestinationMountTableResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MultipleDestinationMountTableResolver.java
index b09a883..9beffe7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MultipleDestinationMountTableResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/MultipleDestinationMountTableResolver.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.hdfs.server.federation.router.Router;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Mount table resolver that supports multiple locations for each mount entry.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/AvailableSpaceResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/AvailableSpaceResolver.java
index 883a126..88e2064 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/AvailableSpaceResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/AvailableSpaceResolver.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.hdfs.server.federation.store.records.MembershipState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Order the destinations based on available space. This resolver uses a
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/HashResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/HashResolver.java
index 455a3ed..3f8c354 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/HashResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/HashResolver.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Order the destinations based on consistent hashing.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/LocalResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/LocalResolver.java
index 58a8ed2..3da655e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/LocalResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/LocalResolver.java
@@ -42,8 +42,8 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.net.HostAndPort;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.net.HostAndPort;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/RandomResolver.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/RandomResolver.java
index 13643e5..d21eef5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/RandomResolver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/resolver/order/RandomResolver.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.hdfs.server.federation.resolver.PathLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
/**
* Order the destinations randomly.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionManager.java
index 74bbbb5..9ec3b54 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionManager.java
@@ -32,7 +32,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.Time;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPool.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPool.java
index 6092499..52e7ceb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPool.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPool.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.net.SocketFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPoolId.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPoolId.java
index 7cb343b..8b537f9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPoolId.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/ConnectionPoolId.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/MountTableRefresherService.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/MountTableRefresherService.java
index e998ab0..0246ea9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/MountTableRefresherService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/MountTableRefresherService.java
@@ -40,13 +40,13 @@ import org.apache.hadoop.service.AbstractService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalListener;
+import org.apache.hadoop.thirdparty.com.google.common.cache.RemovalNotification;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* This service is invoked from {@link MountTableStore} when there is change in
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/PeriodicService.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/PeriodicService.java
index 5e12222..b690b86 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/PeriodicService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/PeriodicService.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* Service to periodically execute a runnable.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java
index 2919ddc..9d84559 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Quota.java
@@ -42,8 +42,8 @@ import org.apache.hadoop.security.AccessControlException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ListMultimap;
/**
* Module that implements the quota relevant RPC calls
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
index 64fdabe..d6e5a1c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java
@@ -56,7 +56,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Router that provides a unified view of multiple federated HDFS clusters. It
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java
index 1df0844..159b103 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterAdminServer.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.StorageType;
@@ -90,7 +90,7 @@ import org.apache.hadoop.service.AbstractService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
index 4d3493a..baee979 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java
@@ -96,7 +96,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterHeartbeatService.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterHeartbeatService.java
index c497d85..37407c2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterHeartbeatService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterHeartbeatService.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.server.federation.store.CachedRecordStore;
import org.apache.hadoop.hdfs.server.federation.store.MembershipStore;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java
index 968a722..ef255d9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcClient.java
@@ -75,8 +75,8 @@ import org.eclipse.jetty.util.ajax.JSON;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* A client proxy for Router to NN communication using the NN ClientProtocol.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
index 0f23d1c..559a7a2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
@@ -156,7 +156,7 @@ import org.apache.hadoop.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/RouterSecurityManager.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/RouterSecurityManager.java
index 8e7a343..7b0787f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/RouterSecurityManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/RouterSecurityManager.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdfs.server.federation.router.security;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/StateStoreService.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/StateStoreService.java
index 66c2882..95a3858 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/StateStoreService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/StateStoreService.java
@@ -53,7 +53,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A service to initialize a
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileBaseImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileBaseImpl.java
index 15fc9c1..8352bca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileBaseImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileBaseImpl.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* {@link StateStoreDriver} implementation based on files. In this approach, we
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
index 60dbcdc..cedc784 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hdfs.server.federation.store.records.BaseRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.io.Files;
+import org.apache.hadoop.thirdparty.com.google.common.io.Files;
/**
* StateStoreDriver implementation based on a local file.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/BaseRecord.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/BaseRecord.java
index 86721ea..6b39e20 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/BaseRecord.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/records/BaseRecord.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Abstract base of a data record in the StateStore. All StateStore records are
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterPolicyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterPolicyProvider.java
index 36a00e5..c2577e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterPolicyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterPolicyProvider.java
@@ -41,7 +41,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
/**
* Test suite covering RouterPolicyProvider. We expect that it contains a
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
index f5f0600..bfc712f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpc.java
@@ -130,7 +130,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.function.Supplier;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* The the RPC interface of the {@link Router} implemented by
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 7f1b3bc..58e7034 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -68,8 +68,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.hadoop.thirdparty</groupId>
+ <artifactId>hadoop-shaded-guava</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
index 00f14cd..ad61257 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
@@ -104,11 +104,11 @@ import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.ToolRunner;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
@InterfaceAudience.Private
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
index 43e76c7..53d3b4b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
@@ -56,9 +56,9 @@ import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.ipc.StandbyException;
import org.apache.hadoop.security.UserGroupInformation;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSNetworkTopology.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSNetworkTopology.java
index 9082b91..02d2c43 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSNetworkTopology.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSNetworkTopology.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.net;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.StorageType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSTopologyNodeImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSTopologyNodeImpl.java
index 7a9afab..72c89f5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSTopologyNodeImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/net/DFSTopologyNodeImpl.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.net;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
import org.apache.hadoop.net.InnerNode;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java
index 6d2c0ac..d9baa8f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java
@@ -33,8 +33,8 @@ import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hdfs.protocol.BlockListAsLongs.BlockReportReplica;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.ReplicaState;
import org.apache.hadoop.hdfs.server.datanode.Replica;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
import org.apache.hadoop.thirdparty.protobuf.CodedInputStream;
import org.apache.hadoop.thirdparty.protobuf.CodedOutputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirective.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirective.java
index 2c0d263..aef009a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirective.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirective.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.protocol;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
@@ -28,7 +28,7 @@ import org.apache.hadoop.hdfs.server.namenode.CachePool;
import org.apache.hadoop.util.IntrusiveCollection;
import org.apache.hadoop.util.IntrusiveCollection.Element;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Namenode class that tracks state related to a cached path.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/LayoutFlags.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/LayoutFlags.java
index fc1717f..edc1840 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/LayoutFlags.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/LayoutFlags.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
/**
* LayoutFlags represent features which the FSImage and edit logs can either
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferServer.java
index ae17761..0e2dc71 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferServer.java
@@ -21,7 +21,7 @@ import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_DATA_TRANSF
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_ENCRYPT_DATA_TRANSFER_CIPHER_SUITES_KEY;
import static org.apache.hadoop.hdfs.protocol.datatransfer.sasl.DataTransferSaslUtil.*;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -59,8 +59,8 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* Negotiates SASL for DataTransferProtocol on behalf of a server. There are
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolClientSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolClientSideTranslatorPB.java
index b512d7e..add19e9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolClientSideTranslatorPB.java
@@ -69,7 +69,7 @@ import org.apache.hadoop.ipc.RpcClientUtil;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.UserGroupInformation;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.RpcController;
import org.apache.hadoop.thirdparty.protobuf.ServiceException;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolServerSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolServerSideTranslatorPB.java
index 5ecbcb7..9244b9f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolServerSideTranslatorPB.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolServerSideTranslatorPB.java
@@ -61,7 +61,7 @@ import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks;
import org.apache.hadoop.hdfs.server.protocol.StorageReport;
import org.apache.hadoop.hdfs.server.protocol.VolumeFailureSummary;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.thirdparty.protobuf.RpcController;
import org.apache.hadoop.thirdparty.protobuf.ServiceException;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLogger.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLogger.java
index 5eead67..bf72723 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLogger.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLogger.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
-import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
/**
* Interface for a remote log which is only communicated with asynchronously.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
index f024b0e..684e7dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/AsyncLoggerSet.java
@@ -34,12 +34,12 @@ import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
/**
* Wrapper around a set of Loggers, taking care of fanning out
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
index 01c115e..94e9456 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
@@ -57,16 +57,16 @@ import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.util.StopWatch;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.net.InetAddresses;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.google.common.util.concurrent.UncaughtExceptionHandlers;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.FutureCallback;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.UncaughtExceptionHandlers;
/**
* Channel to a remote JournalNode using Hadoop IPC.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannelMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannelMetrics.java
index fde6b99..6eef8ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannelMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannelMetrics.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableQuantiles;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* The metrics for a journal from the writer's perspective.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumCall.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumCall.java
index 501a77e..e2a169a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumCall.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumCall.java
@@ -24,17 +24,17 @@ import java.util.Map.Entry;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.TimeUnit;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.util.StopWatch;
import org.apache.hadoop.util.Timer;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.FutureCallback;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
import org.apache.hadoop.thirdparty.protobuf.Message;
import org.apache.hadoop.thirdparty.protobuf.TextFormat;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumException.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumException.java
index 446092e..1f60e3d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumException.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumException.java
@@ -22,8 +22,8 @@ import java.util.Map;
import org.apache.hadoop.util.StringUtils;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Exception thrown when too many exceptions occur while gathering
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
index a3ad090..354b250 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/QuorumJournalManager.java
@@ -58,10 +58,10 @@ import org.apache.hadoop.hdfs.web.URLConnectionFactory;
import org.apache.hadoop.log.LogThrottlingHelper;
import org.apache.hadoop.log.LogThrottlingHelper.LogAction;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.thirdparty.protobuf.TextFormat;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/SegmentRecoveryComparator.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/SegmentRecoveryComparator.java
index 61b60aa..4b2a518 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/SegmentRecoveryComparator.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/SegmentRecoveryComparator.java
@@ -23,9 +23,9 @@ import java.util.Map.Entry;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.PrepareRecoveryResponseProto;
import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.SegmentStateProto;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.primitives.Booleans;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ComparisonChain;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Booleans;
/**
* Compares responses to the prepareRecovery RPC. This is responsible for
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
index aaf9d1b..7f82bff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.hdfs.server.namenode.FileJournalManager;
import org.apache.hadoop.hdfs.server.namenode.NNStorage;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-import com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
/**
* A {@link Storage} implementation for the {@link JournalNode}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
index 38b2909..99a087e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/Journal.java
@@ -71,10 +71,10 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StopWatch;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
import org.apache.hadoop.thirdparty.protobuf.TextFormat;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalFaultInjector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalFaultInjector.java
index cefb7b5..f55933f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalFaultInjector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalFaultInjector.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.qjournal.server;
import java.io.IOException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index 3df69f1..82d4638 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java
index ef44f21..d13c98f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
import org.slf4j.Logger;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
index bb141d8..b4997ea 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournaledEditsCache.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournaledEditsCache.java
index 3cd7fff..e0b84d7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournaledEditsCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournaledEditsCache.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockPoolTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockPoolTokenSecretManager.java
index e477eee..d81bc98 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockPoolTokenSecretManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockPoolTokenSecretManager.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier.AccessMo
import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.Token;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.fs.StorageType;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
index c01ab56..1d39378 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hdfs.security.token.block;
-import com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
@@ -44,10 +44,10 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.Timer;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultiset;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Multiset;
/**
* BlockTokenSecretManager can be instantiated in 2 modes, master mode
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
index 49986e9..b061d4b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java
@@ -49,8 +49,8 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager;
import org.apache.hadoop.security.token.delegation.DelegationKey;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
index 2810434..bcf5357 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/aliasmap/InMemoryAliasMap.java
@@ -16,8 +16,8 @@
*/
package org.apache.hadoop.hdfs.server.aliasmap;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.thirdparty.protobuf.InvalidProtocolBufferException;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index 48938bf..33b5fa4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.balancer;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
import static org.apache.hadoop.hdfs.protocol.BlockType.CONTIGUOUS;
import java.io.IOException;
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdfs.DFSUtilClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** <p>The balancer is a tool that balances disk space usage on an HDFS cluster
* when some datanodes become full or when new empty nodes join the cluster.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
index 885cd63..e19fbeb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
@@ -83,8 +83,8 @@ import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/** Dispatching block replica moves between datanodes. */
@InterfaceAudience.Private
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
index bc20863..7f54c63 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
@@ -31,8 +31,8 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.RateLimiter;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.RateLimiter;
import org.apache.hadoop.ha.HAServiceProtocol;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.HAUtil;
@@ -63,7 +63,7 @@ import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ipc.RemoteException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* The class provides utilities for accessing a NameNode.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/AvailableSpaceBlockPlacementPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/AvailableSpaceBlockPlacementPolicy.java
index ad6fa0f..6926c3e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/AvailableSpaceBlockPlacementPolicy.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/AvailableSpaceBlockPlacementPolicy.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java
index bec6ec8..0ac1d53 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockIdManager.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.BlockType;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
index dc6cf32..c6a7bb5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.protocol.Block;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
index 7378e6f..f830678 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.hdfs.protocol.Block;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoStriped.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoStriped.java
index ce186a7..5a13341 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoStriped.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoStriped.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.BlockType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index f59c7ba..6264516 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -126,8 +126,8 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.util.VersionInfo;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerFaultInjector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerFaultInjector.java
index 957c5c0..a529eca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerFaultInjector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerFaultInjector.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.server.blockmanagement;
import java.io.IOException;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.hdfs.server.protocol.BlockReportContext;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java
index aecdb59..cd4c521 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java
@@ -35,8 +35,8 @@ import org.apache.hadoop.hdfs.server.namenode.startupprogress.StepType;
import org.apache.hadoop.net.NetworkTopology;
import org.apache.hadoop.util.Daemon;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicy.java
index 5631838..07df43b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicy.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicy.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.AddBlockFlag;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
index a1ea63d..a1a83b0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -22,7 +22,7 @@ import static org.apache.hadoop.util.Time.monotonicNow;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.AddBlockFlag;
@@ -35,7 +35,7 @@ import org.apache.hadoop.net.NetworkTopology;
import org.apache.hadoop.net.Node;
import org.apache.hadoop.net.NodeBase;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* The class is responsible for choosing the desired number of targets
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockReportLeaseManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockReportLeaseManager.java
index 2a4b6e8..3560a36 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockReportLeaseManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockReportLeaseManager.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.util.Time;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java
index 5af1bf2..ca08fe9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.fs.XAttr;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockToMarkCorrupt.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockToMarkCorrupt.java
index a871390..3ce5ef0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockToMarkCorrupt.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockToMarkCorrupt.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hdfs.server.blockmanagement;
import static org.apache.hadoop.hdfs.server.blockmanagement.CorruptReplicasMap.Reason;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.protocol.Block;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java
index 35e4a2e..eab5812 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java
@@ -55,7 +55,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
/**
* Scans the namesystem, scheduling blocks to be cached as appropriate.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CombinedHostFileManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CombinedHostFileManager.java
index 9a43014..662e2e4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CombinedHostFileManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CombinedHostFileManager.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.UnmodifiableIterator;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.UnmodifiableIterator;
import java.util.stream.Collectors;
import org.slf4j.Logger;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CorruptReplicasMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CorruptReplicasMap.java
index fc31584..fdc8bb7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CorruptReplicasMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CorruptReplicasMap.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hdfs.protocol.BlockType;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.ipc.Server;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Stores information about all corrupt blocks in the File System.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminBackoffMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminBackoffMonitor.java
index af2c12f..c04f3da 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminBackoffMonitor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminBackoffMonitor.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.collect.Iterables;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Iterables;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.server.namenode.INode;
import org.apache.hadoop.hdfs.server.namenode.INodeFile;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
index a5650d1..b372e73 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
import org.apache.hadoop.hdfs.server.namenode.INode;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
index 0771c28..799e0d5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminManager.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkArgument;
import static org.apache.hadoop.util.Time.monotonicNow;
import java.util.Queue;
@@ -33,8 +33,8 @@ import org.apache.hadoop.hdfs.server.namenode.Namesystem;
import org.apache.hadoop.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
/**
* Manages decommissioning and maintenance state for DataNodes. A background
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
index 3f02247..c89f0ef 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.Queue;
import java.util.Set;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 1b474fd..22750ec 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.hdfs.server.blockmanagement;
import static org.apache.hadoop.hdfs.server.protocol.DatanodeProtocol.DNA_ERASURE_CODING_RECONSTRUCTION;
import static org.apache.hadoop.util.Time.monotonicNow;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.net.InetAddresses;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.net.InetAddresses;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java
index 3a56ef1..ee20ada 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeStorageInfo.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage.State;
import org.apache.hadoop.hdfs.server.protocol.StorageReport;
import org.apache.hadoop.hdfs.util.FoldedTreeSet;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* A Datanode has one or more storages. A storage in the Datanode is represented
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ExcessRedundancyMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ExcessRedundancyMap.java
index ccdcf54..41bb7d34 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ExcessRedundancyMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ExcessRedundancyMap.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.hdfs.util.LightWeightHashSet;
import org.slf4j.Logger;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Maps a datnode to the set of excess redundancy details.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java
index 9e4d867..5da47c4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Manage the heartbeats received from datanodes.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostFileManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostFileManager.java
index 4ead0ba..57b6902 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostFileManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostFileManager.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java
index 1d16cae..af0c92d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.UnmodifiableIterator;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.UnmodifiableIterator;
import java.net.InetAddress;
import java.net.InetSocketAddress;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java
index bbe729c..1ce967a 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/InvalidateBlocks.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.hdfs.DFSUtil;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* Keeps a Collection for every named machine containing blocks
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
index 6e9dfa2..8a8501f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
@@ -24,8 +24,8 @@ import java.util.Queue;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.ReplicaState;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* In the Standby Node, we can receive messages about blocks
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingReconstructionBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingReconstructionBlocks.java
index 6e1af57..acf0598 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingReconstructionBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingReconstructionBlocks.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.util.Daemon;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingRecoveryBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingRecoveryBlocks.java
index 3f5f27c..8a432ce 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingRecoveryBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingRecoveryBlocks.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.blockmanagement;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdfs.util.LightWeightHashSet;
import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ProvidedStorageMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ProvidedStorageMap.java
index c8c9bb5..31ab66d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ProvidedStorageMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ProvidedStorageMap.java
@@ -29,7 +29,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentSkipListMap;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
index 894121e..08ebf8e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
@@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.primitives.Doubles;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Doubles;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowPeerTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowPeerTracker.java
index 03a6918..5b30b73 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowPeerTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowPeerTracker.java
@@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.primitives.Ints;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
index 78d4289..b6b4463 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/HdfsServerConstants.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hdfs.server.datanode.DataNodeLayoutVersion;
import org.apache.hadoop.hdfs.server.namenode.FSDirectory;
import org.apache.hadoop.hdfs.server.namenode.MetaRecoveryContext;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.hdfs.server.namenode.NameNodeLayoutVersion;
import org.apache.hadoop.util.StringUtils;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
index e7da44e..ea10f01 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
@@ -53,8 +53,8 @@ import org.apache.hadoop.io.nativeio.NativeIOException;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.util.VersionInfo;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/StorageInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/StorageInfo.java
index 28871e5..23911c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/StorageInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/StorageInfo.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
import org.apache.hadoop.hdfs.server.datanode.DataNodeLayoutVersion;
import org.apache.hadoop.hdfs.server.namenode.NameNodeLayoutVersion;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
/**
* Common class for storage information.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Util.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Util.java
index e9f9bfb..14cc1c4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Util.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Util.java
@@ -36,8 +36,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/TextFileRegionAliasMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/TextFileRegionAliasMap.java
index 4d65142..41b5d33 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/TextFileRegionAliasMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/blockaliasmap/impl/TextFileRegionAliasMap.java
@@ -54,7 +54,7 @@ import org.apache.hadoop.io.compress.CompressionCodecFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class is used for block maps stored as text files,
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
index 209c081..40046b0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
@@ -17,10 +17,10 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.StorageType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
index 70ec247..d2e2ee2 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
@@ -71,8 +71,8 @@ import org.apache.hadoop.util.VersionInfo;
import org.apache.hadoop.util.VersionUtil;
import org.slf4j.Logger;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
/**
* A thread per active or standby namenode to perform:
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockChecksumHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockChecksumHelper.java
index 988c463..13681e5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockChecksumHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockChecksumHelper.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hdfs.DFSUtilClient;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java
index 9a7b6bc..390577f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java
@@ -29,11 +29,11 @@ import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.security.UserGroupInformation;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
import org.slf4j.Logger;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
index 539baf1..5c8e6f4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
@@ -47,9 +47,9 @@ import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.util.Daemon;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
/**
* Manages storage for the set of BlockPoolSlices which share a particular
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
index 2231aea..8233d30 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
@@ -64,7 +64,7 @@ import org.apache.htrace.core.Tracer;
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.POSIX_FADV_DONTNEED;
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.SYNC_FILE_RANGE_WRITE;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
/** A class that receives a block and writes to its own disk, meanwhile
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
index db52d07..d541120 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.protocol.DatanodeID;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java
index dc619f2..485cf00 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockScanner.java
@@ -32,11 +32,11 @@ import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
import org.apache.hadoop.hdfs.server.datanode.VolumeScanner.ScanResultHandler;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeReference;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
index 6102a59..6ea8650 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
@@ -55,8 +55,8 @@ import org.apache.htrace.core.TraceScope;
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.POSIX_FADV_DONTNEED;
import static org.apache.hadoop.io.nativeio.NativeIO.POSIX.POSIX_FADV_SEQUENTIAL;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
/**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 1ddd05d..c6b5e1e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -222,13 +222,13 @@ import org.apache.hadoop.util.concurrent.HadoopExecutors;
import org.apache.htrace.core.Tracer;
import org.eclipse.jetty.util.ajax.JSON;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
import org.apache.hadoop.thirdparty.protobuf.BlockingService;
import org.slf4j.Logger;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeFaultInjector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeFaultInjector.java
index 952fe02..b55d793 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeFaultInjector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNodeFaultInjector.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
index 2447fd7..e917b77 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
@@ -62,10 +62,10 @@ import org.apache.hadoop.hdfs.server.common.StorageInfo;
import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage;
import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.hadoop.util.Daemon;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ComparisonChain;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* Data storage information file.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
index 9c885fc..7df5caf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
@@ -17,8 +17,8 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.thirdparty.protobuf.ByteString;
import javax.crypto.SecretKey;
import org.apache.commons.logging.Log;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
index ea85a47..de5f415 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
@@ -35,8 +35,8 @@ import org.apache.hadoop.hdfs.net.PeerServer;
import org.apache.hadoop.hdfs.util.DataTransferThrottler;
import org.apache.hadoop.util.Daemon;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.slf4j.Logger;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index ce084a7..d835108 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -51,9 +51,9 @@ import org.apache.hadoop.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.collect.ListMultimap;
/**
* Periodically scans the data directories for block and block metadata files.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
index ffa8524..42a5619 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
@@ -18,8 +18,8 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/IncrementalBlockReportManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/IncrementalBlockReportManager.java
index 73cc44b..f55b8c2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/IncrementalBlockReportManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/IncrementalBlockReportManager.java
@@ -37,8 +37,8 @@ import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
/**
* Manage Incremental Block Reports (IBRs).
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/LocalReplica.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/LocalReplica.java
index cb53a64..b711e1a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/LocalReplica.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/LocalReplica.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.util.DataChecksum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
/**
* This class is used for all replicas which are on local storage media
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ProvidedReplica.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ProvidedReplica.java
index bd23021..00640f6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ProvidedReplica.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ProvidedReplica.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.input.BoundedInputStream;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/SecureDataNodeStarter.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/SecureDataNodeStarter.java
index 84fac57..6c66641 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/SecureDataNodeStarter.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/SecureDataNodeStarter.java
@@ -16,7 +16,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
index 3df83cf..fe94de4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ShortCircuitRegistry.java
@@ -30,7 +30,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,9 +46,9 @@ import org.apache.hadoop.net.unix.DomainSocket;
import org.apache.hadoop.net.unix.DomainSocketWatcher;
import org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
+import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
/**
* Manages client short-circuit memory segments on the DataNode.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
index 4728583..6bc25eb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
@@ -30,10 +30,10 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
+import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.BlockLocalPathInfo;
import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScannerCBInjector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScannerCBInjector.java
index 5798bd1..d15d8d4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScannerCBInjector.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScannerCBInjector.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java
index 06867fb..6ae4f01 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java
@@ -20,15 +20,15 @@
*/
package org.apache.hadoop.hdfs.server.datanode.checker;
-import com.google.common.annotations.Beta;
-import com.google.common.annotations.GwtCompatible;
-import com.google.common.base.Preconditions;
-import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import com.google.common.util.concurrent.Uninterruptibles;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.Beta;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.GwtCompatible;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.SettableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater
.newUpdater;
@@ -55,7 +55,7 @@ import java.util.logging.Logger;
* include instantiating a {@link SettableFuture}, submitting a task to a
* {@link ListeningExecutorService}, and deriving a {@code Future} from an
* existing one, typically using methods like {@link Futures#transform
- * (ListenableFuture, com.google.common.base.Function) Futures.transform}
+ * (ListenableFuture, org.apache.hadoop.thirdparty.com.google.common.base.Function) Futures.transform}
* and its overloaded versions.
* <p>
* <p>This class implements all methods in {@code ListenableFuture}.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AsyncChecker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AsyncChecker.java
index d698454..75b0ebe 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AsyncChecker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AsyncChecker.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.hdfs.server.datanode.checker;
import java.util.Optional;
-import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/DatasetVolumeChecker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/DatasetVolumeChecker.java
index 91582fe..7bea216 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/DatasetVolumeChecker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/DatasetVolumeChecker.java
@@ -18,14 +18,14 @@
package org.apache.hadoop.hdfs.server.datanode.checker;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Sets;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.FutureCallback;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/StorageLocationChecker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/StorageLocationChecker.java
index 0332bc8..3d49dd5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/StorageLocationChecker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/StorageLocationChecker.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.hdfs.server.datanode.checker;
import static org.apache.hadoop.hdfs.DFSConfigKeys.*;
-import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/ThrottledAsyncChecker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/ThrottledAsyncChecker.java
index 032379a..1ded5cb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/ThrottledAsyncChecker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/ThrottledAsyncChecker.java
@@ -18,11 +18,11 @@
package org.apache.hadoop.hdfs.server.datanode.checker;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.FutureCallback;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.MoreExecutors;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.Timer;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java
index ae7b34f..d014e49 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java
@@ -20,8 +20,8 @@
*/
package org.apache.hadoop.hdfs.server.datanode.checker;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ListenableFuture;
import org.apache.hadoop.hdfs.server.datanode.checker.AbstractFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
index 9634196..03cddb2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode.erasurecode;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReader.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReader.java
index 9c6fe9f..b1992ea 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReader.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode.erasurecode;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
index 48a0747..851f695 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode.erasurecode;
-import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java
index 762506c..f955ad2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode.erasurecode;
-import com.google.common.base.Preconditions;
+import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.StorageType;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
index fc84c4d..20df0e9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
@@ -76,7 +76,7 @@ import org.apache.hadoop.util.DiskChecker.DiskErrorException;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.Timer;
-import com.google.common.annotations.VisibleForTesting;
... 17253 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org