From 3c58addf11fb377c27e48e9bebc27e28e5c3a6c2 Mon Sep 17 00:00:00 2001 From: "Gary D. Gregory" Date: Tue, 26 Jan 2016 00:22:23 +0000 Subject: [PATCH] SVN move folders from httpclient* to httpclient5* in order to match the Maven artifact ID, which matters for multi-module builds. git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1726719 13f79535-47bb-0310-9956-ffa450edef68 --- {httpclient-cache => httpclient5-cache}/pom.xml | 0 .../hc/client5/http/cache/CacheResponseStatus.java | 0 .../hc/client5/http/cache/HeaderConstants.java | 0 .../hc/client5/http/cache/HttpCacheContext.java | 0 .../hc/client5/http/cache/HttpCacheEntry.java | 0 .../cache/HttpCacheEntrySerializationException.java | 0 .../http/cache/HttpCacheEntrySerializer.java | 0 .../hc/client5/http/cache/HttpCacheInvalidator.java | 0 .../hc/client5/http/cache/HttpCacheStorage.java | 0 .../client5/http/cache/HttpCacheUpdateCallback.java | 0 .../http/cache/HttpCacheUpdateException.java | 0 .../apache/hc/client5/http/cache/InputLimit.java | 0 .../org/apache/hc/client5/http/cache/Resource.java | 0 .../hc/client5/http/cache/ResourceFactory.java | 0 .../org/apache/hc/client5/http/cache/package.html | 0 .../impl/cache/AsynchronousValidationRequest.java | 0 .../http/impl/cache/AsynchronousValidator.java | 0 .../hc/client5/http/impl/cache/BasicHttpCache.java | 0 .../http/impl/cache/BasicHttpCacheStorage.java | 0 .../client5/http/impl/cache/BasicIdGenerator.java | 0 .../hc/client5/http/impl/cache/CacheConfig.java | 0 .../hc/client5/http/impl/cache/CacheEntity.java | 0 .../client5/http/impl/cache/CacheEntryUpdater.java | 0 .../client5/http/impl/cache/CacheInvalidator.java | 0 .../client5/http/impl/cache/CacheKeyGenerator.java | 0 .../apache/hc/client5/http/impl/cache/CacheMap.java | 0 .../http/impl/cache/CacheValidityPolicy.java | 0 .../http/impl/cache/CacheableRequestPolicy.java | 0 .../impl/cache/CachedHttpResponseGenerator.java | 0 .../cache/CachedResponseSuitabilityChecker.java | 0 .../hc/client5/http/impl/cache/CachingExec.java | 0 .../http/impl/cache/CachingHttpClientBuilder.java | 0 .../client5/http/impl/cache/CachingHttpClients.java | 0 .../hc/client5/http/impl/cache/CombinedEntity.java | 0 .../http/impl/cache/ConditionalRequestBuilder.java | 0 .../http/impl/cache/DefaultFailureCache.java | 0 .../impl/cache/DefaultHttpCacheEntrySerializer.java | 0 .../cache/ExponentialBackOffSchedulingStrategy.java | 0 .../hc/client5/http/impl/cache/FailureCache.java | 0 .../client5/http/impl/cache/FailureCacheValue.java | 0 .../hc/client5/http/impl/cache/FileResource.java | 0 .../http/impl/cache/FileResourceFactory.java | 0 .../hc/client5/http/impl/cache/HeapResource.java | 0 .../http/impl/cache/HeapResourceFactory.java | 0 .../hc/client5/http/impl/cache/HttpCache.java | 0 .../apache/hc/client5/http/impl/cache/IOUtils.java | 0 .../impl/cache/ImmediateSchedulingStrategy.java | 0 .../http/impl/cache/ManagedHttpCacheStorage.java | 0 .../http/impl/cache/OptionsHttp11Response.java | 0 .../apache/hc/client5/http/impl/cache/Proxies.java | 0 .../http/impl/cache/RequestProtocolCompliance.java | 0 .../http/impl/cache/RequestProtocolError.java | 0 .../client5/http/impl/cache/ResourceReference.java | 0 .../http/impl/cache/ResponseCachingPolicy.java | 0 .../http/impl/cache/ResponseProtocolCompliance.java | 0 .../http/impl/cache/ResponseProxyHandler.java | 0 .../client5/http/impl/cache/SchedulingStrategy.java | 0 .../http/impl/cache/SizeLimitedResponseReader.java | 0 .../apache/hc/client5/http/impl/cache/Variant.java | 0 .../hc/client5/http/impl/cache/WarningValue.java | 0 .../impl/cache/ehcache/EhcacheHttpCacheStorage.java | 0 .../hc/client5/http/impl/cache/ehcache/package.html | 0 .../http/impl/cache/memcached/KeyHashingScheme.java | 0 .../impl/cache/memcached/MemcachedCacheEntry.java | 0 .../cache/memcached/MemcachedCacheEntryFactory.java | 0 .../memcached/MemcachedCacheEntryFactoryImpl.java | 0 .../cache/memcached/MemcachedCacheEntryImpl.java | 0 .../cache/memcached/MemcachedHttpCacheStorage.java | 0 .../memcached/MemcachedKeyHashingException.java | 0 .../MemcachedOperationTimeoutException.java | 0 .../memcached/MemcachedSerializationException.java | 0 .../cache/memcached/PrefixKeyHashingScheme.java | 0 .../cache/memcached/SHA256KeyHashingScheme.java | 0 .../client5/http/impl/cache/memcached/package.html | 0 .../apache/hc/client5/http/impl/cache/package.html | 0 .../hc/client5/http/cache/TestHttpCacheEntry.java | 0 .../http/impl/cache/AbstractProtocolTest.java | 0 .../http/impl/cache/ConsumableInputStream.java | 0 .../apache/hc/client5/http/impl/cache/Counter.java | 0 .../hc/client5/http/impl/cache/DummyBackend.java | 0 .../hc/client5/http/impl/cache/HttpTestUtils.java | 0 .../apache/hc/client5/http/impl/cache/OKStatus.java | 0 .../client5/http/impl/cache/RequestEquivalent.java | 0 .../client5/http/impl/cache/ResponseEquivalent.java | 0 .../hc/client5/http/impl/cache/Serializer.java | 0 .../http/impl/cache/SimpleHttpCacheStorage.java | 0 .../cache/TestAsynchronousValidationRequest.java | 0 .../http/impl/cache/TestAsynchronousValidator.java | 0 .../client5/http/impl/cache/TestBasicHttpCache.java | 0 .../http/impl/cache/TestCacheEntryUpdater.java | 0 .../http/impl/cache/TestCacheInvalidator.java | 0 .../http/impl/cache/TestCacheKeyGenerator.java | 0 .../http/impl/cache/TestCacheValidityPolicy.java | 0 .../http/impl/cache/TestCacheableRequestPolicy.java | 0 .../impl/cache/TestCachedHttpResponseGenerator.java | 0 .../cache/TestCachedResponseSuitabilityChecker.java | 0 .../hc/client5/http/impl/cache/TestCachingExec.java | 0 .../http/impl/cache/TestCachingExecChain.java | 0 .../impl/cache/TestCachingHttpClientBuilder.java | 0 .../client5/http/impl/cache/TestCombinedEntity.java | 0 .../impl/cache/TestConditionalRequestBuilder.java | 0 .../http/impl/cache/TestDefaultFailureCache.java | 0 ...TestExponentialBackingOffSchedulingStrategy.java | 0 .../impl/cache/TestHttpCacheEntrySerializers.java | 0 .../impl/cache/TestHttpCacheJiraNumber1147.java | 0 .../impl/cache/TestImmediateSchedulingStrategy.java | 0 .../impl/cache/TestProtocolAllowedBehavior.java | 0 .../http/impl/cache/TestProtocolDeviations.java | 0 .../impl/cache/TestProtocolRecommendations.java | 0 .../http/impl/cache/TestProtocolRequirements.java | 0 .../http/impl/cache/TestRFC5861Compliance.java | 0 .../impl/cache/TestRequestProtocolCompliance.java | 0 .../http/impl/cache/TestResponseCachingPolicy.java | 0 .../impl/cache/TestResponseProtocolCompliance.java | 0 .../impl/cache/TestSizeLimitedResponseReader.java | 0 ...estStaleWhileRevalidationReleasesConnection.java | 0 .../client5/http/impl/cache/TestWarningValue.java | 0 .../cache/ehcache/TestEhcacheHttpCacheStorage.java | 0 .../ehcache/TestEhcacheProtocolRequirements.java | 0 .../TestMemcachedCacheEntryFactoryImpl.java | 0 .../memcached/TestMemcachedCacheEntryImpl.java | 0 .../memcached/TestMemcachedHttpCacheStorage.java | 0 .../cache/memcached/TestPrefixKeyHashingScheme.java | 0 .../cache/memcached/TestSHA256HashingScheme.java | 0 .../src/test/resources/commons-logging.properties | 0 {httpclient-fluent => httpclient5-fluent}/pom.xml | 0 .../client5/http/examples/fluent/FluentAsync.java | 0 .../http/examples/fluent/FluentExecutor.java | 0 .../http/examples/fluent/FluentQuickStart.java | 0 .../http/examples/fluent/FluentRequests.java | 0 .../examples/fluent/FluentResponseHandling.java | 0 .../org/apache/hc/client5/http/fluent/Async.java | 0 .../org/apache/hc/client5/http/fluent/Content.java | 0 .../client5/http/fluent/ContentResponseHandler.java | 0 .../org/apache/hc/client5/http/fluent/Executor.java | 0 .../org/apache/hc/client5/http/fluent/Form.java | 0 .../apache/hc/client5/http/fluent/HttpHeader.java | 0 .../http/fluent/InternalByteArrayEntity.java | 0 .../hc/client5/http/fluent/InternalFileEntity.java | 0 .../hc/client5/http/fluent/InternalHttpRequest.java | 0 .../http/fluent/InternalInputStreamEntity.java | 0 .../org/apache/hc/client5/http/fluent/Request.java | 0 .../org/apache/hc/client5/http/fluent/Response.java | 0 .../apache/hc/client5/http/fluent/package-info.java | 0 .../apache/hc/client5/http/fluent/TestFluent.java | 0 {httpclient-osgi => httpclient5-osgi}/pom.xml | 0 .../osgi/impl/HttpProxyConfigurationActivator.java | 0 .../http/osgi/impl/OSGiClientBuilderFactory.java | 0 .../http/osgi/impl/OSGiCredentialsProvider.java | 0 .../http/osgi/impl/OSGiHttpClientBuilder.java | 0 .../http/osgi/impl/OSGiHttpRoutePlanner.java | 0 .../http/osgi/impl/OSGiProxyConfiguration.java | 0 .../hc/client5/http/osgi/impl/PropertiesUtils.java | 0 .../hc/client5/http/osgi/impl/package-info.java | 0 .../apache/hc/client5/http/osgi/package-info.java | 0 .../osgi/services/HttpClientBuilderFactory.java | 0 .../http/osgi/services/ProxyConfiguration.java | 0 .../hc/client5/http/osgi/services/package-info.java | 0 .../resources/OSGI-INF/metatype/metatype.properties | 0 .../main/resources/OSGI-INF/metatype/metatype.xml | 0 .../hc/client5/http/osgi/impl/MimeExportedIT.java | 0 .../http/osgi/impl/OSGiProxyConfigurationTest.java | 0 .../http/osgi/impl/TestOSGiHttpRoutePlanner.java | 0 .../client5/http/osgi/impl/TestPropertiesUtils.java | 0 .../src/test/resources/log4j.properties | 0 {httpclient-win => httpclient5-win}/pom.xml | 0 .../http/examples/client/win/ClientWinAuth.java | 0 .../hc/client5/http/impl/win/WinHttpClients.java | 0 .../http/impl/win/WindowsNTLMSchemeFactory.java | 0 .../http/impl/win/WindowsNegotiateScheme.java | 0 .../impl/win/WindowsNegotiateSchemeFactory.java | 0 .../hc/client5/http/impl/win/package-info.java | 0 .../http/impl/win/TestWindowsNegotiateScheme.java | 0 {httpclient => httpclient5}/pom.xml | 0 .../hc/client5/http/examples/ClientAbortMethod.java | 0 .../client5/http/examples/ClientAuthentication.java | 0 .../http/examples/ClientChunkEncodedPost.java | 0 .../client5/http/examples/ClientConfiguration.java | 0 .../http/examples/ClientConnectionRelease.java | 0 .../client5/http/examples/ClientCustomContext.java | 0 .../http/examples/ClientCustomPublicSuffixList.java | 0 .../hc/client5/http/examples/ClientCustomSSL.java | 0 .../examples/ClientEvictExpiredConnections.java | 0 .../client5/http/examples/ClientExecuteProxy.java | 0 .../client5/http/examples/ClientExecuteSOCKS.java | 0 .../hc/client5/http/examples/ClientFormLogin.java | 0 .../http/examples/ClientMultiThreadedExecution.java | 0 .../http/examples/ClientMultipartFormPost.java | 0 .../ClientPreemptiveBasicAuthentication.java | 0 .../ClientPreemptiveDigestAuthentication.java | 0 .../http/examples/ClientProxyAuthentication.java | 0 .../http/examples/ClientWithRequestFuture.java | 0 .../http/examples/ClientWithResponseHandler.java | 0 .../hc/client5/http/examples/ProxyTunnelDemo.java | 0 .../apache/hc/client5/http/examples/QuickStart.java | 0 .../hc/client5/http/ConnectTimeoutException.java | 0 .../client5/http/ConnectionKeepAliveStrategy.java | 0 .../http/ConnectionPoolTimeoutException.java | 0 .../org/apache/hc/client5/http/DnsResolver.java | 0 .../hc/client5/http/HttpConnectionFactory.java | 0 .../hc/client5/http/HttpHostConnectException.java | 0 .../java/org/apache/hc/client5/http/HttpRoute.java | 0 .../java/org/apache/hc/client5/http/RouteInfo.java | 0 .../org/apache/hc/client5/http/RouteTracker.java | 0 .../apache/hc/client5/http/SchemePortResolver.java | 0 .../hc/client5/http/SystemDefaultDnsResolver.java | 0 .../hc/client5/http/UnsupportedSchemeException.java | 0 .../org/apache/hc/client5/http/auth/AuthCache.java | 0 .../apache/hc/client5/http/auth/AuthChallenge.java | 0 .../apache/hc/client5/http/auth/AuthExchange.java | 0 .../org/apache/hc/client5/http/auth/AuthScheme.java | 0 .../hc/client5/http/auth/AuthSchemeProvider.java | 0 .../org/apache/hc/client5/http/auth/AuthScope.java | 0 .../client5/http/auth/AuthenticationException.java | 0 .../hc/client5/http/auth/BasicUserPrincipal.java | 0 .../apache/hc/client5/http/auth/ChallengeType.java | 0 .../apache/hc/client5/http/auth/Credentials.java | 0 .../hc/client5/http/auth/CredentialsProvider.java | 0 .../hc/client5/http/auth/CredentialsStore.java | 0 .../http/auth/InvalidCredentialsException.java | 0 .../hc/client5/http/auth/KerberosCredentials.java | 0 .../http/auth/MalformedChallengeException.java | 0 .../apache/hc/client5/http/auth/NTCredentials.java | 0 .../hc/client5/http/auth/NTUserPrincipal.java | 0 .../http/auth/UsernamePasswordCredentials.java | 0 .../apache/hc/client5/http/auth/package-info.java | 0 .../hc/client5/http/auth/util/ByteArrayBuilder.java | 0 .../apache/hc/client5/http/config/AuthSchemes.java | 0 .../apache/hc/client5/http/config/CookieSpecs.java | 0 .../hc/client5/http/config/RequestConfig.java | 0 .../apache/hc/client5/http/config/package-info.java | 0 .../hc/client5/http/cookie/BasicCookieStore.java | 0 .../http/cookie/CommonCookieAttributeHandler.java | 0 .../org/apache/hc/client5/http/cookie/Cookie.java | 0 .../client5/http/cookie/CookieAttributeHandler.java | 0 .../http/cookie/CookieIdentityComparator.java | 0 .../apache/hc/client5/http/cookie/CookieOrigin.java | 0 .../client5/http/cookie/CookiePathComparator.java | 0 .../http/cookie/CookiePriorityComparator.java | 0 .../cookie/CookieRestrictionViolationException.java | 0 .../apache/hc/client5/http/cookie/CookieSpec.java | 0 .../hc/client5/http/cookie/CookieSpecProvider.java | 0 .../apache/hc/client5/http/cookie/CookieStore.java | 0 .../http/cookie/MalformedCookieException.java | 0 .../apache/hc/client5/http/cookie/SetCookie.java | 0 .../apache/hc/client5/http/cookie/package-info.java | 0 .../hc/client5/http/entity/DecompressingEntity.java | 0 .../http/entity/DeflateDecompressingEntity.java | 0 .../hc/client5/http/entity/DeflateInputStream.java | 0 .../hc/client5/http/entity/EntityBuilder.java | 0 .../client5/http/entity/GzipCompressingEntity.java | 0 .../http/entity/GzipDecompressingEntity.java | 0 .../hc/client5/http/entity/InputStreamFactory.java | 0 .../http/entity/LazyDecompressingInputStream.java | 0 .../client5/http/entity/UrlEncodedFormEntity.java | 0 .../http/entity/mime/AbstractContentBody.java | 0 .../http/entity/mime/AbstractMultipartForm.java | 0 .../hc/client5/http/entity/mime/ByteArrayBody.java | 0 .../hc/client5/http/entity/mime/ContentBody.java | 0 .../client5/http/entity/mime/ContentDescriptor.java | 0 .../hc/client5/http/entity/mime/FileBody.java | 0 .../hc/client5/http/entity/mime/FormBodyPart.java | 0 .../http/entity/mime/FormBodyPartBuilder.java | 0 .../apache/hc/client5/http/entity/mime/Header.java | 0 .../entity/mime/HttpBrowserCompatibleMultipart.java | 0 .../client5/http/entity/mime/HttpMultipartMode.java | 0 .../http/entity/mime/HttpRFC6532Multipart.java | 0 .../http/entity/mime/HttpStrictMultipart.java | 0 .../client5/http/entity/mime/InputStreamBody.java | 0 .../apache/hc/client5/http/entity/mime/MIME.java | 0 .../hc/client5/http/entity/mime/MinimalField.java | 0 .../http/entity/mime/MultipartEntityBuilder.java | 0 .../http/entity/mime/MultipartFormEntity.java | 0 .../hc/client5/http/entity/mime/StringBody.java | 0 .../hc/client5/http/entity/mime/package-info.java | 0 .../apache/hc/client5/http/entity/package-info.java | 0 .../hc/client5/http/impl/BasicResponseHandler.java | 0 .../impl/DefaultConnectionKeepAliveStrategy.java | 0 .../http/impl/DefaultSchemePortResolver.java | 0 .../hc/client5/http/impl/InMemoryDnsResolver.java | 0 .../client5/http/impl/auth/AuthChallengeParser.java | 0 .../hc/client5/http/impl/auth/BasicAuthCache.java | 0 .../hc/client5/http/impl/auth/BasicScheme.java | 0 .../client5/http/impl/auth/BasicSchemeFactory.java | 0 .../hc/client5/http/impl/auth/DigestScheme.java | 0 .../client5/http/impl/auth/DigestSchemeFactory.java | 0 .../hc/client5/http/impl/auth/GGSSchemeBase.java | 0 .../client5/http/impl/auth/HttpAuthenticator.java | 0 .../client5/http/impl/auth/HttpEntityDigester.java | 0 .../hc/client5/http/impl/auth/KerberosScheme.java | 0 .../http/impl/auth/KerberosSchemeFactory.java | 0 .../hc/client5/http/impl/auth/NTLMEngine.java | 0 .../client5/http/impl/auth/NTLMEngineException.java | 0 .../hc/client5/http/impl/auth/NTLMEngineImpl.java | 0 .../hc/client5/http/impl/auth/NTLMScheme.java | 0 .../client5/http/impl/auth/NTLMSchemeFactory.java | 0 .../hc/client5/http/impl/auth/SPNegoScheme.java | 0 .../client5/http/impl/auth/SPNegoSchemeFactory.java | 0 .../impl/auth/SystemDefaultCredentialsProvider.java | 0 .../auth/UnsupportedDigestAlgorithmException.java | 0 .../hc/client5/http/impl/auth/package-info.java | 0 .../impl/cookie/AbstractCookieAttributeHandler.java | 0 .../http/impl/cookie/AbstractCookieSpec.java | 0 .../client5/http/impl/cookie/BasicClientCookie.java | 0 .../http/impl/cookie/BasicDomainHandler.java | 0 .../http/impl/cookie/BasicExpiresHandler.java | 0 .../http/impl/cookie/BasicMaxAgeHandler.java | 0 .../client5/http/impl/cookie/BasicPathHandler.java | 0 .../http/impl/cookie/BasicSecureHandler.java | 0 .../hc/client5/http/impl/cookie/CookieSpecBase.java | 0 .../hc/client5/http/impl/cookie/IgnoreSpec.java | 0 .../http/impl/cookie/IgnoreSpecProvider.java | 0 .../client5/http/impl/cookie/LaxExpiresHandler.java | 0 .../client5/http/impl/cookie/LaxMaxAgeHandler.java | 0 .../http/impl/cookie/PublicSuffixDomainFilter.java | 0 .../client5/http/impl/cookie/RFC6265CookieSpec.java | 0 .../http/impl/cookie/RFC6265CookieSpecBase.java | 0 .../http/impl/cookie/RFC6265CookieSpecProvider.java | 0 .../hc/client5/http/impl/cookie/RFC6265LaxSpec.java | 0 .../client5/http/impl/cookie/RFC6265StrictSpec.java | 0 .../hc/client5/http/impl/cookie/package-info.java | 0 .../impl/io/BasicHttpClientConnectionManager.java | 0 .../org/apache/hc/client5/http/impl/io/CPool.java | 0 .../apache/hc/client5/http/impl/io/CPoolEntry.java | 0 .../apache/hc/client5/http/impl/io/CPoolProxy.java | 0 .../http/impl/io/ConnectionShutdownException.java | 0 .../io/DefaultHttpClientConnectionOperator.java | 0 .../impl/io/DefaultHttpResponseParserFactory.java | 0 .../impl/io/DefaultManagedHttpClientConnection.java | 0 .../http/impl/io/LenientHttpResponseParser.java | 0 .../hc/client5/http/impl/io/LoggingInputStream.java | 0 .../impl/io/LoggingManagedHttpClientConnection.java | 0 .../client5/http/impl/io/LoggingOutputStream.java | 0 .../impl/io/ManagedHttpClientConnectionFactory.java | 0 .../impl/io/PoolingHttpClientConnectionManager.java | 0 .../org/apache/hc/client5/http/impl/io/Wire.java | 0 .../hc/client5/http/impl/io/package-info.java | 0 .../protocol/DefaultAuthenticationStrategy.java | 0 .../http/impl/protocol/DefaultRedirectStrategy.java | 0 .../http/impl/protocol/DefaultUserTokenHandler.java | 0 .../http/impl/routing/BasicRouteDirector.java | 0 .../http/impl/routing/DefaultProxyRoutePlanner.java | 0 .../http/impl/routing/DefaultRoutePlanner.java | 0 .../impl/routing/SystemDefaultRoutePlanner.java | 0 .../client5/http/impl/sync/AIMDBackoffManager.java | 0 .../http/impl/sync/AbstractResponseHandler.java | 0 .../client5/http/impl/sync/BackoffStrategyExec.java | 0 .../http/impl/sync/BasicCredentialsProvider.java | 0 .../hc/client5/http/impl/sync/ClientExecChain.java | 0 .../org/apache/hc/client5/http/impl/sync/Clock.java | 0 .../client5/http/impl/sync/CloseableHttpClient.java | 0 .../hc/client5/http/impl/sync/ConnectionHolder.java | 0 .../http/impl/sync/CookieSpecRegistries.java | 0 .../http/impl/sync/DefaultBackoffStrategy.java | 0 .../impl/sync/DefaultHttpRequestRetryHandler.java | 0 .../DefaultServiceUnavailableRetryStrategy.java | 0 .../impl/sync/FutureRequestExecutionMetrics.java | 0 .../impl/sync/FutureRequestExecutionService.java | 0 .../client5/http/impl/sync/HttpClientBuilder.java | 0 .../hc/client5/http/impl/sync/HttpClients.java | 0 .../http/impl/sync/HttpRequestFutureTask.java | 0 .../http/impl/sync/HttpRequestTaskCallable.java | 0 .../client5/http/impl/sync/HttpResponseProxy.java | 0 .../http/impl/sync/IdleConnectionEvictor.java | 0 .../client5/http/impl/sync/InternalHttpClient.java | 0 .../hc/client5/http/impl/sync/MainClientExec.java | 0 .../client5/http/impl/sync/MinimalClientExec.java | 0 .../client5/http/impl/sync/MinimalHttpClient.java | 0 .../http/impl/sync/NoopUserTokenHandler.java | 0 .../client5/http/impl/sync/NullBackoffStrategy.java | 0 .../hc/client5/http/impl/sync/ProtocolExec.java | 0 .../hc/client5/http/impl/sync/ProxyClient.java | 0 .../hc/client5/http/impl/sync/RedirectExec.java | 0 .../http/impl/sync/RequestAbortedException.java | 0 .../client5/http/impl/sync/RequestEntityProxy.java | 0 .../client5/http/impl/sync/ResponseEntityProxy.java | 0 .../apache/hc/client5/http/impl/sync/RetryExec.java | 0 .../http/impl/sync/ServiceUnavailableRetryExec.java | 0 .../hc/client5/http/impl/sync/SystemClock.java | 0 .../http/impl/sync/TunnelRefusedException.java | 0 .../hc/client5/http/impl/sync/package-info.java | 0 .../client5/http/io/ConnectionReleaseTrigger.java | 0 .../hc/client5/http/io/ConnectionRequest.java | 0 .../hc/client5/http/io/EofSensorInputStream.java | 0 .../apache/hc/client5/http/io/EofSensorWatcher.java | 0 .../http/io/HttpClientConnectionManager.java | 0 .../http/io/HttpClientConnectionOperator.java | 0 .../http/io/ManagedHttpClientConnection.java | 0 .../http/methods/AbstractExecutionAwareRequest.java | 0 .../client5/http/methods/CloseableHttpResponse.java | 0 .../hc/client5/http/methods/Configurable.java | 0 .../apache/hc/client5/http/methods/HttpDelete.java | 0 .../hc/client5/http/methods/HttpExecutionAware.java | 0 .../org/apache/hc/client5/http/methods/HttpGet.java | 0 .../apache/hc/client5/http/methods/HttpHead.java | 0 .../apache/hc/client5/http/methods/HttpOptions.java | 0 .../apache/hc/client5/http/methods/HttpPatch.java | 0 .../apache/hc/client5/http/methods/HttpPost.java | 0 .../org/apache/hc/client5/http/methods/HttpPut.java | 0 .../hc/client5/http/methods/HttpRequestBase.java | 0 .../hc/client5/http/methods/HttpRequestWrapper.java | 0 .../apache/hc/client5/http/methods/HttpTrace.java | 0 .../hc/client5/http/methods/HttpUriRequest.java | 0 .../hc/client5/http/methods/RequestBuilder.java | 0 .../hc/client5/http/methods/package-info.java | 0 .../http/protocol/AuthenticationStrategy.java | 0 .../http/protocol/CircularRedirectException.java | 0 .../http/protocol/ClientProtocolException.java | 0 .../hc/client5/http/protocol/HttpClientContext.java | 0 .../http/protocol/HttpResponseException.java | 0 .../protocol/NonRepeatableRequestException.java | 0 .../hc/client5/http/protocol/RedirectException.java | 0 .../hc/client5/http/protocol/RedirectLocations.java | 0 .../hc/client5/http/protocol/RedirectStrategy.java | 0 .../http/protocol/RequestAcceptEncoding.java | 0 .../hc/client5/http/protocol/RequestAddCookies.java | 0 .../hc/client5/http/protocol/RequestAuthCache.java | 0 .../http/protocol/RequestClientConnControl.java | 0 .../http/protocol/RequestDefaultHeaders.java | 0 .../http/protocol/RequestExpectContinue.java | 0 .../http/protocol/ResponseContentEncoding.java | 0 .../http/protocol/ResponseProcessCookies.java | 0 .../hc/client5/http/protocol/UserTokenHandler.java | 0 .../hc/client5/http/protocol/package-info.java | 0 .../org/apache/hc/client5/http/psl/DomainType.java | 0 .../hc/client5/http/psl/PublicSuffixList.java | 0 .../hc/client5/http/psl/PublicSuffixListParser.java | 0 .../hc/client5/http/psl/PublicSuffixMatcher.java | 0 .../client5/http/psl/PublicSuffixMatcherLoader.java | 0 .../hc/client5/http/routing/HttpRouteDirector.java | 0 .../hc/client5/http/routing/HttpRoutePlanner.java | 0 .../hc/client5/http/routing/package-info.java | 0 .../http/socket/ConnectionSocketFactory.java | 0 .../http/socket/LayeredConnectionSocketFactory.java | 0 .../http/socket/PlainConnectionSocketFactory.java | 0 .../apache/hc/client5/http/socket/package-info.java | 0 .../client5/http/ssl/DefaultHostnameVerifier.java | 0 .../hc/client5/http/ssl/NoopHostnameVerifier.java | 0 .../http/ssl/SSLConnectionSocketFactory.java | 0 .../http/ssl/SSLInitializationException.java | 0 .../client5/http/ssl/TrustSelfSignedStrategy.java | 0 .../apache/hc/client5/http/ssl/package-info.java | 0 .../apache/hc/client5/http/sync/BackoffManager.java | 0 .../http/sync/ConnectionBackoffStrategy.java | 0 .../org/apache/hc/client5/http/sync/HttpClient.java | 0 .../client5/http/sync/HttpRequestRetryHandler.java | 0 .../hc/client5/http/sync/ResponseHandler.java | 0 .../http/sync/ServiceUnavailableRetryStrategy.java | 0 .../apache/hc/client5/http/sync/package-info.java | 0 .../org/apache/hc/client5/http/utils/DateUtils.java | 0 .../hc/client5/http/utils/InetAddressUtils.java | 0 .../apache/hc/client5/http/utils/URIBuilder.java | 0 .../org/apache/hc/client5/http/utils/URIUtils.java | 0 .../hc/client5/http/utils/URLEncodedUtils.java | 0 .../apache/hc/client5/http/utils/package-info.java | 0 .../org/apache/hc/client5/version.properties | 0 .../org/apache/hc/client5/http/TestExceptions.java | 0 .../hc/client5/http/auth/TestAuthChallenge.java | 0 .../apache/hc/client5/http/auth/TestAuthScope.java | 0 .../hc/client5/http/auth/TestCredentials.java | 0 .../http/auth/util/TestByteArrayBuilder.java | 0 .../hc/client5/http/config/TestRequestConfig.java | 0 .../hc/client5/http/cookie/TestCookieOrigin.java | 0 .../http/cookie/TestCookiePathComparator.java | 0 .../http/cookie/TestCookiePriorityComparator.java | 0 .../http/entity/TestDecompressingEntity.java | 0 .../apache/hc/client5/http/entity/TestDeflate.java | 0 .../hc/client5/http/entity/TestEntityBuilder.java | 0 .../org/apache/hc/client5/http/entity/TestGZip.java | 0 .../client5/http/entity/mime/FormBodyPartTest.java | 0 .../http/entity/mime/TestFormBodyPartBuilder.java | 0 .../http/entity/mime/TestMultipartContentBody.java | 0 .../entity/mime/TestMultipartEntityBuilder.java | 0 .../client5/http/entity/mime/TestMultipartForm.java | 0 .../entity/mime/TestMultipartFormHttpEntity.java | 0 .../http/impl/TestAbstractResponseHandler.java | 0 .../client5/http/impl/TestBasicResponseHandler.java | 0 .../http/impl/TestDefaultConnKeepAliveStrategy.java | 0 .../http/impl/auth/TestAuthChallengeParser.java | 0 .../client5/http/impl/auth/TestBasicAuthCache.java | 0 .../impl/auth/TestBasicCredentialsProvider.java | 0 .../hc/client5/http/impl/auth/TestBasicScheme.java | 0 .../hc/client5/http/impl/auth/TestDigestScheme.java | 0 .../http/impl/auth/TestHttpAuthenticator.java | 0 .../client5/http/impl/auth/TestNTLMEngineImpl.java | 0 .../http/impl/auth/TestRequestAuthCache.java | 0 .../http/impl/cookie/TestBasicClientCookie.java | 0 .../impl/cookie/TestBasicCookieAttribHandlers.java | 0 .../http/impl/cookie/TestBasicCookieStore.java | 0 .../impl/cookie/TestLaxCookieAttribHandlers.java | 0 .../impl/cookie/TestPublicSuffixListParser.java | 0 .../http/impl/cookie/TestRFC6265CookieSpec.java | 0 .../http/impl/integration/TestAbortHandling.java | 0 .../integration/TestBasicConnectionManager.java | 0 .../impl/integration/TestClientAuthentication.java | 0 .../TestClientAuthenticationFakeNTLM.java | 0 .../TestClientAuthenticationFallBack.java | 0 .../integration/TestClientReauthentication.java | 0 .../integration/TestClientRequestExecution.java | 0 .../impl/integration/TestConnectionAutoRelease.java | 0 .../impl/integration/TestConnectionManagement.java | 0 .../http/impl/integration/TestConnectionReuse.java | 0 .../http/impl/integration/TestContentCodings.java | 0 .../impl/integration/TestCookieVirtualHost.java | 0 .../integration/TestIdleConnectionEviction.java | 0 .../integration/TestMalformedServerResponse.java | 0 .../TestMinimalClientRequestExecution.java | 0 .../http/impl/integration/TestRedirects.java | 0 .../http/impl/integration/TestSPNegoScheme.java | 0 .../integration/TestStatefulConnManagement.java | 0 .../http/impl/io/SessionInputBufferMock.java | 0 .../io/TestBasicHttpClientConnectionManager.java | 0 .../http/impl/io/TestDefaultHttpResponseParser.java | 0 .../impl/io/TestHttpClientConnectionOperator.java | 0 .../io/TestPoolingHttpClientConnectionManager.java | 0 .../impl/protocol/TestAuthenticationStrategy.java | 0 .../impl/protocol/TestDefaultRedirectStrategy.java | 0 .../impl/routing/TestDefaultProxyRoutePlanner.java | 0 .../http/impl/routing/TestDefaultRoutePlanner.java | 0 .../http/impl/routing/TestRouteDirector.java | 0 .../client5/http/impl/routing/TestRouteTracker.java | 0 .../impl/routing/TestSystemDefaultRoutePlanner.java | 0 .../apache/hc/client5/http/impl/sync/MockClock.java | 0 .../client5/http/impl/sync/MockConnPoolControl.java | 0 .../http/impl/sync/TestAIMDBackoffManager.java | 0 .../http/impl/sync/TestCloseableHttpClient.java | 0 .../http/impl/sync/TestConnectionHolder.java | 0 .../impl/sync/TestCookieIdentityComparator.java | 0 .../http/impl/sync/TestDefaultBackoffStrategy.java | 0 .../sync/TestDefaultHttpRequestRetryHandler.java | 0 .../TestDefaultServiceUnavailableRetryStrategy.java | 0 .../sync/TestFutureRequestExecutionService.java | 0 .../http/impl/sync/TestIdleConnectionEvictor.java | 0 .../http/impl/sync/TestInternalHttpClient.java | 0 .../client5/http/impl/sync/TestMainClientExec.java | 0 .../http/impl/sync/TestMinimalClientExec.java | 0 .../http/impl/sync/TestNullBackoffStrategy.java | 0 .../hc/client5/http/impl/sync/TestProtocolExec.java | 0 .../hc/client5/http/impl/sync/TestRedirectExec.java | 0 .../http/impl/sync/TestResponseEntityWrapper.java | 0 .../hc/client5/http/impl/sync/TestRetryExec.java | 0 .../impl/sync/TestServiceUnavailableRetryExec.java | 0 .../client5/http/io/TestEofSensorInputStream.java | 0 .../http/localserver/BasicAuthTokenExtractor.java | 0 .../hc/client5/http/localserver/EchoHandler.java | 0 .../http/localserver/LocalServerTestBase.java | 0 .../hc/client5/http/localserver/RandomHandler.java | 0 .../client5/http/localserver/RequestBasicAuth.java | 0 .../http/localserver/ResponseBasicUnauthorized.java | 0 .../client5/http/localserver/SSLTestContexts.java | 0 .../hc/client5/http/methods/TestHttpOptions.java | 0 .../client5/http/methods/TestHttpRequestBase.java | 0 .../hc/client5/http/methods/TestRequestBuilder.java | 0 .../client5/http/protocol/TestRedirectLocation.java | 0 .../http/protocol/TestRequestAcceptEncoding.java | 0 .../http/protocol/TestRequestAddCookies.java | 0 .../http/protocol/TestRequestClientConnControl.java | 0 .../http/protocol/TestRequestDefaultHeaders.java | 0 .../http/protocol/TestRequestExpectContinue.java | 0 .../http/protocol/TestResponseContentEncoding.java | 0 .../http/protocol/TestResponseProcessCookies.java | 0 .../http/psl/TestPublicSuffixListParser.java | 0 .../client5/http/psl/TestPublicSuffixMatcher.java | 0 .../hc/client5/http/routing/TestHttpRoute.java | 0 .../hc/client5/http/ssl/CertificatesToPlayWith.java | 0 .../http/ssl/TestDefaultHostnameVerifier.java | 0 .../hc/client5/http/ssl/TestSSLSocketFactory.java | 0 .../apache/hc/client5/http/utils/TestDateUtils.java | 0 .../hc/client5/http/utils/TestInetAddressUtils.java | 0 .../hc/client5/http/utils/TestRequestBuilder.java | 0 .../hc/client5/http/utils/TestURIBuilder.java | 0 .../apache/hc/client5/http/utils/TestURIUtils.java | 0 .../hc/client5/http/utils/TestURLEncodedUtils.java | 0 .../src/test/resources/commons-logging.properties | 0 .../src/test/resources/suffixlist.txt | 0 .../src/test/resources/suffixlist2.txt | 0 .../src/test/resources/test.keystore | Bin pom.xml | 10 +++++----- 578 files changed, 5 insertions(+), 5 deletions(-) rename {httpclient-cache => httpclient5-cache}/pom.xml (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializationException.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializer.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateCallback.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/Resource.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/ResourceFactory.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/cache/package.html (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolError.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/SchedulingStrategy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/Variant.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/WarningValue.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/EhcacheHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/package.html (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/KeyHashingScheme.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntry.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactory.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactoryImpl.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryImpl.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedKeyHashingException.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedOperationTimeoutException.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedSerializationException.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/PrefixKeyHashingScheme.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/package.html (100%) rename {httpclient-cache => httpclient5-cache}/src/main/java/org/apache/hc/client5/http/impl/cache/package.html (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/Counter.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/RequestEquivalent.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/ResponseEquivalent.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/Serializer.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/SimpleHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestPrefixKeyHashingScheme.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestSHA256HashingScheme.java (100%) rename {httpclient-cache => httpclient5-cache}/src/test/resources/commons-logging.properties (100%) rename {httpclient-fluent => httpclient5-fluent}/pom.xml (100%) rename {httpclient-fluent => httpclient5-fluent}/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Async.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Content.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Executor.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Form.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/HttpHeader.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Request.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/Response.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/main/java/org/apache/hc/client5/http/fluent/package-info.java (100%) rename {httpclient-fluent => httpclient5-fluent}/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java (100%) rename {httpclient-osgi => httpclient5-osgi}/pom.xml (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/package-info.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/resources/OSGI-INF/metatype/metatype.properties (100%) rename {httpclient-osgi => httpclient5-osgi}/src/main/resources/OSGI-INF/metatype/metatype.xml (100%) rename {httpclient-osgi => httpclient5-osgi}/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java (100%) rename {httpclient-osgi => httpclient5-osgi}/src/test/resources/log4j.properties (100%) rename {httpclient-win => httpclient5-win}/pom.xml (100%) rename {httpclient-win => httpclient5-win}/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java (100%) rename {httpclient-win => httpclient5-win}/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java (100%) rename {httpclient-win => httpclient5-win}/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java (100%) rename {httpclient-win => httpclient5-win}/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java (100%) rename {httpclient-win => httpclient5-win}/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java (100%) rename {httpclient-win => httpclient5-win}/src/main/java/org/apache/hc/client5/http/impl/win/package-info.java (100%) rename {httpclient-win => httpclient5-win}/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java (100%) rename {httpclient => httpclient5}/pom.xml (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java (100%) rename {httpclient => httpclient5}/src/examples/org/apache/hc/client5/http/examples/QuickStart.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ConnectionKeepAliveStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/DnsResolver.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/HttpConnectionFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/HttpRoute.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/RouteInfo.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/RouteTracker.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/SchemePortResolver.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthSchemeProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/ChallengeType.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/Credentials.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/CredentialsProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/config/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CommonCookieAttributeHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/Cookie.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieAttributeHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieSpecProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/SetCookie.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/cookie/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/entity/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/HttpEntityDigester.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngine.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/auth/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/io/ManagedHttpClientConnection.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/Configurable.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/methods/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/protocol/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/psl/DomainType.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/routing/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/socket/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/ssl/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/sync/package-info.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java (100%) rename {httpclient => httpclient5}/src/main/java/org/apache/hc/client5/http/utils/package-info.java (100%) rename {httpclient => httpclient5}/src/main/resources/org/apache/hc/client5/version.properties (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/TestExceptions.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/cookie/TestCookieOrigin.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePathComparator.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePriorityComparator.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestNTLMEngineImpl.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRedirectLocation.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixListParser.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/routing/TestHttpRoute.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/ssl/CertificatesToPlayWith.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/ssl/TestDefaultHostnameVerifier.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java (100%) rename {httpclient => httpclient5}/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java (100%) rename {httpclient => httpclient5}/src/test/resources/commons-logging.properties (100%) rename {httpclient => httpclient5}/src/test/resources/suffixlist.txt (100%) rename {httpclient => httpclient5}/src/test/resources/suffixlist2.txt (100%) rename {httpclient => httpclient5}/src/test/resources/test.keystore (100%) diff --git a/httpclient-cache/pom.xml b/httpclient5-cache/pom.xml similarity index 100% rename from httpclient-cache/pom.xml rename to httpclient5-cache/pom.xml diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/CacheResponseStatus.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HeaderConstants.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheContext.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializationException.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializationException.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializationException.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializationException.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializer.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializer.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializer.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntrySerializer.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheStorage.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateCallback.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateCallback.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateCallback.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateCallback.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheUpdateException.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/InputLimit.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/Resource.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/Resource.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/Resource.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/Resource.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/ResourceFactory.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/ResourceFactory.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/ResourceFactory.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/ResourceFactory.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/package.html b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/package.html similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/cache/package.html rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/package.html diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidationRequest.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsynchronousValidator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCacheStorage.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicIdGenerator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheConfig.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntity.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheEntryUpdater.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheInvalidator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheKeyGenerator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheMap.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheValidityPolicy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClients.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CombinedEntity.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultFailureCache.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultHttpCacheEntrySerializer.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ExponentialBackOffSchedulingStrategy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCache.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCache.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCache.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FailureCacheValue.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResource.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/FileResourceFactory.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResource.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HeapResourceFactory.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/IOUtils.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ImmediateSchedulingStrategy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ManagedHttpCacheStorage.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/OptionsHttp11Response.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Proxies.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolCompliance.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolError.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolError.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolError.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/RequestProtocolError.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResourceReference.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProtocolCompliance.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseProxyHandler.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SchedulingStrategy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SchedulingStrategy.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SchedulingStrategy.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SchedulingStrategy.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/SizeLimitedResponseReader.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Variant.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Variant.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Variant.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/Variant.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/WarningValue.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/WarningValue.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/WarningValue.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/WarningValue.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/EhcacheHttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/EhcacheHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/EhcacheHttpCacheStorage.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/EhcacheHttpCacheStorage.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/package.html b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/package.html similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/package.html rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ehcache/package.html diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/KeyHashingScheme.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/KeyHashingScheme.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/KeyHashingScheme.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/KeyHashingScheme.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntry.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntry.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntry.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntry.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactory.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactory.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactory.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactory.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactoryImpl.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactoryImpl.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactoryImpl.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryFactoryImpl.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryImpl.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryImpl.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryImpl.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedCacheEntryImpl.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedHttpCacheStorage.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedKeyHashingException.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedKeyHashingException.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedKeyHashingException.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedKeyHashingException.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedOperationTimeoutException.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedOperationTimeoutException.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedOperationTimeoutException.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedOperationTimeoutException.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedSerializationException.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedSerializationException.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedSerializationException.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/MemcachedSerializationException.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/PrefixKeyHashingScheme.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/PrefixKeyHashingScheme.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/PrefixKeyHashingScheme.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/PrefixKeyHashingScheme.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/package.html b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/package.html similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/package.html rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/package.html diff --git a/httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/package.html b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/package.html similarity index 100% rename from httpclient-cache/src/main/java/org/apache/hc/client5/http/impl/cache/package.html rename to httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/package.html diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Counter.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Counter.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Counter.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Counter.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/OKStatus.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/RequestEquivalent.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/RequestEquivalent.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/RequestEquivalent.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/RequestEquivalent.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ResponseEquivalent.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ResponseEquivalent.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ResponseEquivalent.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ResponseEquivalent.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Serializer.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Serializer.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Serializer.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/Serializer.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/SimpleHttpCacheStorage.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/SimpleHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/SimpleHttpCacheStorage.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/SimpleHttpCacheStorage.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidationRequest.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAsynchronousValidator.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheEntryUpdater.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheInvalidator.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheKeyGenerator.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheValidityPolicy.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheableRequestPolicy.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedHttpResponseGenerator.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingHttpClientBuilder.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCombinedEntity.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultFailureCache.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestExponentialBackingOffSchedulingStrategy.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheEntrySerializers.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpCacheJiraNumber1147.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestImmediateSchedulingStrategy.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolAllowedBehavior.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolDeviations.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRFC5861Compliance.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestRequestProtocolCompliance.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseProtocolCompliance.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestSizeLimitedResponseReader.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestStaleWhileRevalidationReleasesConnection.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestWarningValue.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheHttpCacheStorage.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ehcache/TestEhcacheProtocolRequirements.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedCacheEntryImpl.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestMemcachedHttpCacheStorage.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestPrefixKeyHashingScheme.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestPrefixKeyHashingScheme.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestPrefixKeyHashingScheme.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestPrefixKeyHashingScheme.java diff --git a/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestSHA256HashingScheme.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestSHA256HashingScheme.java similarity index 100% rename from httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestSHA256HashingScheme.java rename to httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/memcached/TestSHA256HashingScheme.java diff --git a/httpclient-cache/src/test/resources/commons-logging.properties b/httpclient5-cache/src/test/resources/commons-logging.properties similarity index 100% rename from httpclient-cache/src/test/resources/commons-logging.properties rename to httpclient5-cache/src/test/resources/commons-logging.properties diff --git a/httpclient-fluent/pom.xml b/httpclient5-fluent/pom.xml similarity index 100% rename from httpclient-fluent/pom.xml rename to httpclient5-fluent/pom.xml diff --git a/httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java similarity index 100% rename from httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java rename to httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentAsync.java diff --git a/httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java similarity index 100% rename from httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java rename to httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentExecutor.java diff --git a/httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java similarity index 100% rename from httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java rename to httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java diff --git a/httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java similarity index 100% rename from httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java rename to httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentRequests.java diff --git a/httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java b/httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java similarity index 100% rename from httpclient-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java rename to httpclient5-fluent/src/examples/org/apache/hc/client5/http/examples/fluent/FluentResponseHandling.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Async.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Async.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Async.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Async.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Content.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Content.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Content.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Content.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/ContentResponseHandler.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Form.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Form.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Form.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Form.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/HttpHeader.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/HttpHeader.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/HttpHeader.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/HttpHeader.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalByteArrayEntity.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalFileEntity.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalHttpRequest.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/InternalInputStreamEntity.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Response.java diff --git a/httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/package-info.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/package-info.java similarity index 100% rename from httpclient-fluent/src/main/java/org/apache/hc/client5/http/fluent/package-info.java rename to httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/package-info.java diff --git a/httpclient-fluent/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java b/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java similarity index 100% rename from httpclient-fluent/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java rename to httpclient5-fluent/src/test/java/org/apache/hc/client5/http/fluent/TestFluent.java diff --git a/httpclient-osgi/pom.xml b/httpclient5-osgi/pom.xml similarity index 100% rename from httpclient-osgi/pom.xml rename to httpclient5-osgi/pom.xml diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java diff --git a/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java similarity index 100% rename from httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java rename to httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java diff --git a/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.properties b/httpclient5-osgi/src/main/resources/OSGI-INF/metatype/metatype.properties similarity index 100% rename from httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.properties rename to httpclient5-osgi/src/main/resources/OSGI-INF/metatype/metatype.properties diff --git a/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml b/httpclient5-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml similarity index 100% rename from httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml rename to httpclient5-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml diff --git a/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java similarity index 100% rename from httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java rename to httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java diff --git a/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java similarity index 100% rename from httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java rename to httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java diff --git a/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java similarity index 100% rename from httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java rename to httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java diff --git a/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java b/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java similarity index 100% rename from httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java rename to httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java diff --git a/httpclient-osgi/src/test/resources/log4j.properties b/httpclient5-osgi/src/test/resources/log4j.properties similarity index 100% rename from httpclient-osgi/src/test/resources/log4j.properties rename to httpclient5-osgi/src/test/resources/log4j.properties diff --git a/httpclient-win/pom.xml b/httpclient5-win/pom.xml similarity index 100% rename from httpclient-win/pom.xml rename to httpclient5-win/pom.xml diff --git a/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java b/httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java similarity index 100% rename from httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java rename to httpclient5-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java diff --git a/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java similarity index 100% rename from httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java rename to httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java diff --git a/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java similarity index 100% rename from httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java rename to httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java diff --git a/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java similarity index 100% rename from httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java rename to httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java diff --git a/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java similarity index 100% rename from httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java rename to httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java diff --git a/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/package-info.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/package-info.java similarity index 100% rename from httpclient-win/src/main/java/org/apache/hc/client5/http/impl/win/package-info.java rename to httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/package-info.java diff --git a/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java b/httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java similarity index 100% rename from httpclient-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java rename to httpclient5-win/src/test/java/org/apache/hc/client5/http/impl/win/TestWindowsNegotiateScheme.java diff --git a/httpclient/pom.xml b/httpclient5/pom.xml similarity index 100% rename from httpclient/pom.xml rename to httpclient5/pom.xml diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAbortMethod.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientAuthentication.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConfiguration.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientConnectionRelease.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomContext.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomPublicSuffixList.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientCustomSSL.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientEvictExpiredConnections.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteProxy.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientExecuteSOCKS.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientFormLogin.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java diff --git a/httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java similarity index 100% rename from httpclient/src/examples/org/apache/hc/client5/http/examples/QuickStart.java rename to httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ConnectTimeoutException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ConnectionKeepAliveStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectionKeepAliveStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ConnectionKeepAliveStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ConnectionKeepAliveStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ConnectionPoolTimeoutException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/DnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/DnsResolver.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/DnsResolver.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/DnsResolver.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/HttpConnectionFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpConnectionFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/HttpConnectionFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/HttpConnectionFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/HttpHostConnectException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/HttpRoute.java b/httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/HttpRoute.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/HttpRoute.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/RouteInfo.java b/httpclient5/src/main/java/org/apache/hc/client5/http/RouteInfo.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/RouteInfo.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/RouteInfo.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/RouteTracker.java b/httpclient5/src/main/java/org/apache/hc/client5/http/RouteTracker.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/RouteTracker.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/RouteTracker.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/SchemePortResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/SchemePortResolver.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/SchemePortResolver.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/SchemePortResolver.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/SystemDefaultDnsResolver.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/UnsupportedSchemeException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthCache.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthExchange.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthSchemeProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthSchemeProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthSchemeProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthSchemeProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthenticationException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/BasicUserPrincipal.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/ChallengeType.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/ChallengeType.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/ChallengeType.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/ChallengeType.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/Credentials.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/Credentials.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/Credentials.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/Credentials.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/InvalidCredentialsException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/KerberosCredentials.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/MalformedChallengeException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTCredentials.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/NTUserPrincipal.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/UsernamePasswordCredentials.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/util/ByteArrayBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/config/AuthSchemes.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/config/CookieSpecs.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/config/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/config/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/config/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/BasicCookieStore.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CommonCookieAttributeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CommonCookieAttributeHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CommonCookieAttributeHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CommonCookieAttributeHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/Cookie.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/Cookie.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/Cookie.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/Cookie.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieAttributeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieAttributeHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieAttributeHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieAttributeHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieIdentityComparator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieOrigin.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePathComparator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookiePriorityComparator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieRestrictionViolationException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieSpecProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieSpecProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieSpecProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieSpecProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/CookieStore.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/MalformedCookieException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/SetCookie.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/SetCookie.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/SetCookie.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/SetCookie.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/cookie/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/cookie/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/cookie/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/cookie/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/DecompressingEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateDecompressingEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/EntityBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipCompressingEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/GzipDecompressingEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/InputStreamFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/UrlEncodedFormEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractContentBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/AbstractMultipartForm.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ByteArrayBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ContentBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/ContentDescriptor.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FileBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPart.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/FormBodyPartBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/Header.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpBrowserCompatibleMultipart.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpMultipartMode.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpRFC6532Multipart.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/HttpStrictMultipart.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/InputStreamBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MIME.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MinimalField.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartFormEntity.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/StringBody.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/entity/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/entity/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/BasicResponseHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultSchemePortResolver.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicSchemeFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestSchemeFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpEntityDigester.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpEntityDigester.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/HttpEntityDigester.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpEntityDigester.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngine.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngine.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngine.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngine.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMSchemeFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoSchemeFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/UnsupportedDigestAlgorithmException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/auth/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieAttributeHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/AbstractCookieSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicClientCookie.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicDomainHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicExpiresHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicMaxAgeHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicPathHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/BasicSecureHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/CookieSpecBase.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/IgnoreSpecProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxExpiresHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/LaxMaxAgeHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecBase.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265CookieSpecProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265LaxSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/RFC6265StrictSpec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolProxy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ConnectionShutdownException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingInputStream.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingOutputStream.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultUserTokenHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/BasicRouteDirector.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultProxyRoutePlanner.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/SystemDefaultRoutePlanner.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AIMDBackoffManager.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/AbstractResponseHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BackoffStrategyExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/BasicCredentialsProvider.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ClientExecChain.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/Clock.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CookieSpecRegistries.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultBackoffStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultHttpRequestRetryHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/DefaultServiceUnavailableRetryStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionMetrics.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/FutureRequestExecutionService.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClients.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestFutureTask.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpRequestTaskCallable.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpResponseProxy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/IdleConnectionEvictor.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalHttpClient.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NoopUserTokenHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/NullBackoffStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProxyClient.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestAbortedException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RequestEntityProxy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ResponseEntityProxy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/SystemClock.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/TunnelRefusedException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionReleaseTrigger.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionRequest.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorInputStream.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/EofSensorWatcher.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionManager.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/HttpClientConnectionOperator.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/io/ManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/ManagedHttpClientConnection.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/io/ManagedHttpClientConnection.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/io/ManagedHttpClientConnection.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/AbstractExecutionAwareRequest.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/CloseableHttpResponse.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/Configurable.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/Configurable.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/Configurable.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpDelete.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpExecutionAware.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpGet.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpHead.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpOptions.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPatch.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPost.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpPut.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestBase.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpRequestWrapper.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpTrace.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/HttpUriRequest.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/RequestBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/methods/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/methods/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/methods/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/AuthenticationStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/CircularRedirectException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ClientProtocolException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpResponseException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/NonRepeatableRequestException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectLocations.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RedirectStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAcceptEncoding.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestDefaultHeaders.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestExpectContinue.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseContentEncoding.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/UserTokenHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/protocol/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/protocol/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/DomainType.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/psl/DomainType.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/psl/DomainType.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixList.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixListParser.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcher.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/routing/HttpRouteDirector.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/routing/HttpRoutePlanner.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/routing/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/routing/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/routing/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/socket/ConnectionSocketFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/socket/LayeredConnectionSocketFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/socket/PlainConnectionSocketFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/socket/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/socket/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/socket/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/NoopHostnameVerifier.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLInitializationException.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/TrustSelfSignedStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/ssl/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/ssl/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/BackoffManager.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/ConnectionBackoffStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpClient.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/HttpRequestRetryHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/ResponseHandler.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/ServiceUnavailableRetryStrategy.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/sync/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/sync/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/sync/package-info.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/DateUtils.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIUtils.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java diff --git a/httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java b/httpclient5/src/main/java/org/apache/hc/client5/http/utils/package-info.java similarity index 100% rename from httpclient/src/main/java/org/apache/hc/client5/http/utils/package-info.java rename to httpclient5/src/main/java/org/apache/hc/client5/http/utils/package-info.java diff --git a/httpclient/src/main/resources/org/apache/hc/client5/version.properties b/httpclient5/src/main/resources/org/apache/hc/client5/version.properties similarity index 100% rename from httpclient/src/main/resources/org/apache/hc/client5/version.properties rename to httpclient5/src/main/resources/org/apache/hc/client5/version.properties diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java b/httpclient5/src/test/java/org/apache/hc/client5/http/TestExceptions.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/TestExceptions.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/TestExceptions.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestCredentials.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/auth/util/TestByteArrayBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java b/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookieOrigin.java b/httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookieOrigin.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookieOrigin.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookieOrigin.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePathComparator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePathComparator.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePathComparator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePathComparator.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePriorityComparator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePriorityComparator.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePriorityComparator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/cookie/TestCookiePriorityComparator.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDecompressingEntity.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestDeflate.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestEntityBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/TestGZip.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/FormBodyPartTest.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestFormBodyPartBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartContentBody.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartEntityBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartForm.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java b/httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/entity/mime/TestMultipartFormHttpEntity.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAbstractResponseHandler.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestBasicResponseHandler.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestDefaultConnKeepAliveStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicAuthCache.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestNTLMEngineImpl.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestNTLMEngineImpl.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestNTLMEngineImpl.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestNTLMEngineImpl.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestRequestAuthCache.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicClientCookie.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieAttribHandlers.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestBasicCookieStore.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestLaxCookieAttribHandlers.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestPublicSuffixListParser.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/cookie/TestRFC6265CookieSpec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestAbortHandling.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestBasicConnectionManager.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthentication.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFakeNTLM.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientAuthenticationFallBack.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientReauthentication.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestClientRequestExecution.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionAutoRelease.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionManagement.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestConnectionReuse.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestContentCodings.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestCookieVirtualHost.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestIdleConnectionEviction.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMalformedServerResponse.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestMinimalClientRequestExecution.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestRedirects.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestSPNegoScheme.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/integration/TestStatefulConnManagement.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/SessionInputBufferMock.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestBasicHttpClientConnectionManager.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestDefaultHttpResponseParser.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestAuthenticationStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/protocol/TestDefaultRedirectStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteDirector.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRouteTracker.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestSystemDefaultRoutePlanner.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockClock.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/MockConnPoolControl.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestAIMDBackoffManager.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCloseableHttpClient.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestCookieIdentityComparator.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultBackoffStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultHttpRequestRetryHandler.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestDefaultServiceUnavailableRetryStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestFutureRequestExecutionService.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestIdleConnectionEvictor.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestInternalHttpClient.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMainClientExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestMinimalClientExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestNullBackoffStrategy.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestProtocolExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRedirectExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestResponseEntityWrapper.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestRetryExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestServiceUnavailableRetryExec.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java b/httpclient5/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/io/TestEofSensorInputStream.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/BasicAuthTokenExtractor.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/EchoHandler.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/LocalServerTestBase.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RandomHandler.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/RequestBasicAuth.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/ResponseBasicUnauthorized.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java b/httpclient5/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/localserver/SSLTestContexts.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java b/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpOptions.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java b/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestHttpRequestBase.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/methods/TestRequestBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRedirectLocation.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRedirectLocation.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRedirectLocation.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRedirectLocation.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAcceptEncoding.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixListParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixListParser.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixListParser.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixListParser.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/routing/TestHttpRoute.java b/httpclient5/src/test/java/org/apache/hc/client5/http/routing/TestHttpRoute.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/routing/TestHttpRoute.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/routing/TestHttpRoute.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/ssl/CertificatesToPlayWith.java b/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/CertificatesToPlayWith.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/ssl/CertificatesToPlayWith.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/ssl/CertificatesToPlayWith.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/ssl/TestDefaultHostnameVerifier.java b/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDefaultHostnameVerifier.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/ssl/TestDefaultHostnameVerifier.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDefaultHostnameVerifier.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java b/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java diff --git a/httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java similarity index 100% rename from httpclient/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java rename to httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java diff --git a/httpclient/src/test/resources/commons-logging.properties b/httpclient5/src/test/resources/commons-logging.properties similarity index 100% rename from httpclient/src/test/resources/commons-logging.properties rename to httpclient5/src/test/resources/commons-logging.properties diff --git a/httpclient/src/test/resources/suffixlist.txt b/httpclient5/src/test/resources/suffixlist.txt similarity index 100% rename from httpclient/src/test/resources/suffixlist.txt rename to httpclient5/src/test/resources/suffixlist.txt diff --git a/httpclient/src/test/resources/suffixlist2.txt b/httpclient5/src/test/resources/suffixlist2.txt similarity index 100% rename from httpclient/src/test/resources/suffixlist2.txt rename to httpclient5/src/test/resources/suffixlist2.txt diff --git a/httpclient/src/test/resources/test.keystore b/httpclient5/src/test/resources/test.keystore similarity index 100% rename from httpclient/src/test/resources/test.keystore rename to httpclient5/src/test/resources/test.keystore diff --git a/pom.xml b/pom.xml index 95bfdb345..9f31a645f 100644 --- a/pom.xml +++ b/pom.xml @@ -151,11 +151,11 @@ - httpclient - httpclient-fluent - httpclient-cache - httpclient-win - httpclient-osgi + httpclient5 + httpclient5-fluent + httpclient5-cache + httpclient5-win + httpclient5-osgi