You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2021/05/12 15:54:09 UTC

[httpcomponents-website] branch master updated (8e6ff1f -> 9548185)

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git.


 discard 8e6ff1f  Updated project website for HttpClient 5.1 release
     new 9548185  Updated project website for HttpClient 5.1 release

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (8e6ff1f)
            \
             N -- N -- N   refs/heads/master (9548185)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/site/markdown/news.md   | 18 ++++++++++++++++++
 src/site/markdown/status.md | 36 +++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 19 deletions(-)

[httpcomponents-website] 01/01: Updated project website for HttpClient 5.1 release

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-website.git

commit 9548185a59b8e9220cbadd8db0dbf760787feade
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Wed May 12 09:46:32 2021 +0200

    Updated project website for HttpClient 5.1 release
---
 .../httpcomponents-client-5.0.x/examples-async.md  |  73 ---------------
 .../httpcomponents-client-5.0.x/examples.md        | 103 ---------------------
 .../android.md                                     |   0
 .../httpcomponents-client-5.1.x/examples-async.md  |  22 ++---
 .../examples-reactive.md                           |   2 +-
 .../httpcomponents-client-5.1.x/examples.md        |  34 +++----
 .../markdown/httpcomponents-client-5.1.x/index.md  |  15 +--
 .../logging.md                                     |   0
 .../migration-guide/index.md                       |   0
 .../migration-guide/migration-to-async-http2.md    |   0
 .../migration-guide/migration-to-async-simple.md   |   0
 .../migration-to-async-streaming.md                |   0
 .../migration-guide/migration-to-classic.md        |   0
 .../migration-guide/preparation.md                 |   0
 .../httpcomponents-client-5.1.x/quickstart.md      |  10 +-
 .../related-projects.md                            |   7 --
 .../download.md                                    |   2 +-
 .../examples-async.md                              |   0
 .../examples-reactive.md                           |   4 +-
 .../examples.md                                    |   0
 .../index.md                                       |  17 ++--
 .../quickstart.md                                  |  10 +-
 src/site/markdown/news.md                          |  18 ++++
 src/site/markdown/status.md                        |  36 ++++---
 src/site/resources/.htaccess                       |   8 +-
 .../documentation.links                            |   4 +-
 .../httpcomponents-core-5.1.x/documentation.links  |   1 -
 src/site/site.xml                                  |  25 +----
 src/site/xdoc/downloads.xml                        |  60 +++---------
 29 files changed, 120 insertions(+), 331 deletions(-)

diff --git a/src/site/markdown/httpcomponents-client-5.0.x/examples-async.md b/src/site/markdown/httpcomponents-client-5.0.x/examples-async.md
deleted file mode 100644
index 9a357c1..0000000
--- a/src/site/markdown/httpcomponents-client-5.0.x/examples-async.md
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-      http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-HttpClient Examples (Async)
-===========================
-
-- [Asynchronous HTTP exchange](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
-
-  This example demonstrates a basic asynchronous HTTP request / response exchange. Response content is buffered in
-  memory for simplicity.
-
-- [Asynchronous HTTP exchange with content streaming](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java)
-
-  This example demonstrates an asynchronous HTTP request / response exchange with a full content streaming.
-
-- [HTTP/2 ALPN support](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java)
-
-  This example demonstrates how to avoid the illegal reflective access operation warning when running with Oracle JRE 9
-  or newer.
-
-- [Pipelined HTTP/1.1 exchanges](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp1Pipelining.java)
-
-  This example demonstrates a pipelined execution of multiple HTTP/1.1 request / response exchanges. Response content is
-  buffered in memory for simplicity.
-
-- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java)
-
-  This example demonstrates a multiplexed execution of multiple HTTP/2 request / response exchanges. Response content is
-  buffered in memory for simplicity.
-
-- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java)
-
-  This example demonstrates how to insert custom request interceptor and an execution interceptor to the request
-  execution chain.
-
-- [Message trailers](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java)
-
-  This example demonstrates how to use a custom execution interceptor to add trailers to all outgoing request enclosing
-  an entity..
-
-- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java)
-
-This example demonstrates handling of HTTP/2 message exchanges pushed by the server.
-
-- [Client authentication](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java)
-
-  This example demonstrates execution of an HTTP request against a target site that requires user authentication.
-
-- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientCustomSSL.java)
-
-  This example demonstrates how to create secure connections with a custom SSL context.
-
-- [Connection eviction](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionEviction.java)
-
-  This example demonstrates how to evict expired and idle connections from the connection pool.
-
-
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/examples.md b/src/site/markdown/httpcomponents-client-5.0.x/examples.md
deleted file mode 100644
index ad59a3c..0000000
--- a/src/site/markdown/httpcomponents-client-5.0.x/examples.md
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-      http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-HttpClient Examples (Classic)
-=============================
-
-- [Response handling](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java)
-
-  This example demonstrates how to process HTTP responses using a response handler. This is the recommended way of
-  executing HTTP requests and processing HTTP responses. This approach enables the caller to concentrate on the process
-  of digesting HTTP responses and to delegate the task of system resource deallocation to HttpClient. The use of an HTTP
-  response handler guarantees that the underlying HTTP connection will be released back to the connection manager
-  automatically in all cases.
-
-- [Manual connection release](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionRelease.java)
-
-  This example demonstrates how to ensure the release of the underlying HTTP connection back to the connection manager
-  in case of a manual processing of HTTP responses.
-
-- [HttpClient configuration](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java)
-
-  This example demonstrates how to customize and configure the most common aspects of HTTP request execution and
-  connection management.
-
-- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java)
-
-  This example demonstrates how to insert custom request interceptor and an execution interceptor to the request
-  execution chain.
-
-- [Abort method](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAbortMethod.java)
-
-  This example demonstrates how to abort an HTTP request before its normal completion.
-
-- [Client authentication](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAuthentication.java)
-
-  This example uses HttpClient to execute an HTTP request against a target site that requires user authentication.
-
-- [Request via a proxy](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java)
-
-  This example demonstrates how to send an HTTP request via a proxy.
-
-- [Proxy authentication](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java)
-
-  A simple example showing execution of an HTTP request over a secure connection tunneled through an authenticating
-  proxy.
-
-- [Chunk encoded POST](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java)
-
-  This example shows how to stream out a request entity using chunk encoding.
-
-- [Custom execution context](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomContext.java)
-
-  This example demonstrates the use of a local HTTP context populated custom attributes.
-
-- [Form based logon](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientFormLogin.java)
-
-  This example demonstrates how HttpClient can be used to perform form-based logon.
-
-- [Threaded request execution](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java)
-
-  An example that executes HTTP requests from multiple worker threads.
-
-- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomSSL.java)
-
-  This example demonstrates how to create secure connections with a custom SSL context.
-
-- [Preemptive BASIC authentication](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java)
-
-  This example shows how HttpClient can be customized to authenticate preemptively using BASIC scheme. Generally,
-  preemptive authentication can be considered less secure than a response to an authentication challenge and therefore
-  discouraged.
-
-- [Preemptive DIGEST authentication](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java)
-
-  This example shows how HttpClient can be customized to authenticate preemptively using DIGEST scheme. Generally,
-  preemptive authentication can be considered less secure than a response to an authentication challenge and therefore
-  discouraged.
-
-- [Proxy tunnel](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java)
-
-  This example shows how to use ProxyClient in order to establish a tunnel through an HTTP proxy for an arbitrary
-  protocol.
-
-- [Multipart encoded request entity](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java)
-
-  This example shows how to execute requests enclosing a multipart encoded entity. 
-
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/android.md b/src/site/markdown/httpcomponents-client-5.1.x/android.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/android.md
rename to src/site/markdown/httpcomponents-client-5.1.x/android.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/examples-async.md b/src/site/markdown/httpcomponents-client-5.1.x/examples-async.md
index 601bfc2..a0e49b9 100644
--- a/src/site/markdown/httpcomponents-client-5.1.x/examples-async.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/examples-async.md
@@ -20,53 +20,53 @@
 HttpClient Examples (Async)
 ===========================
 
-- [Asynchronous HTTP exchange](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
+- [Asynchronous HTTP exchange](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
 
   This example demonstrates a basic asynchronous HTTP request / response exchange. Response content is buffered in
   memory for simplicity.
 
-- [Asynchronous HTTP exchange with content streaming](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java)
+- [Asynchronous HTTP exchange with content streaming](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java)
 
   This example demonstrates an asynchronous HTTP request / response exchange with a full content streaming.
 
-- [HTTP/2 ALPN support](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java)
+- [HTTP/2 ALPN support](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientTlsAlpn.java)
 
   This example demonstrates how to avoid the illegal reflective access operation warning when running with Oracle JRE 9
   or newer.
 
-- [Pipelined HTTP/1.1 exchanges](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp1Pipelining.java)
+- [Pipelined HTTP/1.1 exchanges](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp1Pipelining.java)
 
   This example demonstrates a pipelined execution of multiple HTTP/1.1 request / response exchanges. Response content is
   buffered in memory for simplicity.
 
-- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java)
+- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java)
 
   This example demonstrates a multiplexed execution of multiple HTTP/2 request / response exchanges. Response content is
   buffered in memory for simplicity.
 
-- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java)
+- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java)
 
   This example demonstrates how to insert custom request interceptor and an execution interceptor to the request
   execution chain.
 
-- [Message trailers](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java)
+- [Message trailers](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientMessageTrailers.java)
 
   This example demonstrates how to use a custom execution interceptor to add trailers to all outgoing request enclosing
   an entity..
 
-- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java)
+- [Multiplexed HTTP/2 exchanges](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java)
 
 This example demonstrates handling of HTTP/2 message exchanges pushed by the server.
 
-- [Client authentication](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java)
+- [Client authentication](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientAuthentication.java)
 
   This example demonstrates execution of an HTTP request against a target site that requires user authentication.
 
-- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientCustomSSL.java)
+- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientCustomSSL.java)
 
   This example demonstrates how to create secure connections with a custom SSL context.
 
-- [Connection eviction](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionEviction.java)
+- [Connection eviction](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionEviction.java)
 
   This example demonstrates how to evict expired and idle connections from the connection pool.
 
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/examples-reactive.md b/src/site/markdown/httpcomponents-client-5.1.x/examples-reactive.md
index dba16f0..93f4234 100644
--- a/src/site/markdown/httpcomponents-client-5.1.x/examples-reactive.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/examples-reactive.md
@@ -20,6 +20,6 @@
 HttpClient Examples (Async)
 ===========================
 
-- [HTTP exchange with Reactive Streams](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
+- [HTTP exchange with Reactive Streams](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
 
     This example demonstrates a reactive, full-duplex HTTP/1.1 message exchange using RxJava.
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/examples.md b/src/site/markdown/httpcomponents-client-5.1.x/examples.md
index 39b48f3..9a57b2e 100644
--- a/src/site/markdown/httpcomponents-client-5.1.x/examples.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/examples.md
@@ -20,7 +20,7 @@
 HttpClient Examples (Classic)
 =============================
 
-- [Response handling](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java)
+- [Response handling](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java)
 
   This example demonstrates how to process HTTP responses using a response handler. This is the recommended way of
   executing HTTP requests and processing HTTP responses. This approach enables the caller to concentrate on the process
@@ -28,76 +28,76 @@ HttpClient Examples (Classic)
   response handler guarantees that the underlying HTTP connection will be released back to the connection manager
   automatically in all cases.
 
-- [Manual connection release](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionRelease.java)
+- [Manual connection release](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionRelease.java)
 
   This example demonstrates how to ensure the release of the underlying HTTP connection back to the connection manager
   in case of a manual processing of HTTP responses.
 
-- [HttpClient configuration](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java)
+- [HttpClient configuration](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java)
 
   This example demonstrates how to customize and configure the most common aspects of HTTP request execution and
   connection management.
 
-- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java)
+- [Request execution interceptors](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java)
 
   This example demonstrates how to insert custom request interceptor and an execution interceptor to the request
   execution chain.
 
-- [Abort method](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAbortMethod.java)
+- [Abort method](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAbortMethod.java)
 
   This example demonstrates how to abort an HTTP request before its normal completion.
 
-- [Client authentication](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAuthentication.java)
+- [Client authentication](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientAuthentication.java)
 
   This example uses HttpClient to execute an HTTP request against a target site that requires user authentication.
 
-- [Request via a proxy](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java)
+- [Request via a proxy](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java)
 
   This example demonstrates how to send an HTTP request via a proxy.
 
-- [Proxy authentication](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java)
+- [Proxy authentication](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java)
 
   A simple example showing execution of an HTTP request over a secure connection tunneled through an authenticating
   proxy.
 
-- [Chunk encoded POST](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java)
+- [Chunk encoded POST](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientChunkEncodedPost.java)
 
   This example shows how to stream out a request entity using chunk encoding.
 
-- [Custom execution context](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomContext.java)
+- [Custom execution context](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomContext.java)
 
   This example demonstrates the use of a local HTTP context populated custom attributes.
 
-- [Form based logon](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientFormLogin.java)
+- [Form based logon](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientFormLogin.java)
 
   This example demonstrates how HttpClient can be used to perform form-based logon.
 
-- [Threaded request execution](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java)
+- [Threaded request execution](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultiThreadedExecution.java)
 
   An example that executes HTTP requests from multiple worker threads.
 
-- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomSSL.java)
+- [Custom SSL context](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientCustomSSL.java)
 
   This example demonstrates how to create secure connections with a custom SSL context.
 
-- [Preemptive BASIC authentication](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java)
+- [Preemptive BASIC authentication](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveBasicAuthentication.java)
 
   This example shows how HttpClient can be customized to authenticate preemptively using BASIC scheme. Generally,
   preemptive authentication can be considered less secure than a response to an authentication challenge and therefore
   discouraged.
 
-- [Preemptive DIGEST authentication](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java)
+- [Preemptive DIGEST authentication](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientPreemptiveDigestAuthentication.java)
 
   This example shows how HttpClient can be customized to authenticate preemptively using DIGEST scheme. Generally,
   preemptive authentication can be considered less secure than a response to an authentication challenge and therefore
   discouraged.
 
-- [Proxy tunnel](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java)
+- [Proxy tunnel](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java)
 
   This example shows how to use ProxyClient in order to establish a tunnel through an HTTP proxy for an arbitrary
   protocol.
 
-- [Multipart encoded request entity](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java)
+- [Multipart encoded request entity](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java)
 
   This example shows how to execute requests enclosing a multipart encoded entity. 
 
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/index.md b/src/site/markdown/httpcomponents-client-5.1.x/index.md
index cb05e01..a6617df 100644
--- a/src/site/markdown/httpcomponents-client-5.1.x/index.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/index.md
@@ -77,12 +77,13 @@ Standards Compliance
 HttpClient strives to conform to the following specifications endorsed by the Internet Engineering Task Force (IETF) and
 the internet at large:
 
-* [RFC 7230](http://tools.ietf.org/html/rfc7230) - Hypertext Transfer Protocol (HTTP/1.1): Message Syntax and Routing
-* [RFC 7231](http://tools.ietf.org/html/rfc7231) - Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content
-* [RFC 7235](http://tools.ietf.org/html/rfc7235) - Hypertext Transfer Protocol (HTTP/1.1): Authentication
-* [RFC 1945](http://tools.ietf.org/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
-* [RFC 2817](http://tools.ietf.org/html/rfc2817) - Upgrading to TLS Within HTTP/1.1
-* [RFC 2818](http://tools.ietf.org/html/rfc2818) - HTTP Over TLS
-* [RFC 6265](http://tools.ietf.org/html/rfc6265) - HTTP State Management Mechanism (Cookies)
+- [RFC 7540](http://tools.ietf.org/html/rfc7540) - Hypertext Transfer Protocol Version 2 (HTTP/2)
+- [RFC 7541](http://tools.ietf.org/html/rfc7541) - HPACK: Header Compression for HTTP/2
+- [RFC 7230](http://tools.ietf.org/html/rfc7230) - Hypertext Transfer Protocol (HTTP/1.1): Message Syntax and Routing
+- [RFC 7231](http://tools.ietf.org/html/rfc7231) - Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content
+- [RFC 1945](http://tools.ietf.org/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
 - [RFC 3986](http://tools.ietf.org/html/rfc3986) - Uniform Resource Identifier (URI): Generic Syntax
+- [RFC 2817](http://tools.ietf.org/html/rfc2817) - Upgrading to TLS Within HTTP/1.1
+- [RFC 2818](http://tools.ietf.org/html/rfc2818) - HTTP Over TLS
+- [RFC 6265](http://tools.ietf.org/html/rfc6265) - HTTP State Management Mechanism (Cookies)
 
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/logging.md b/src/site/markdown/httpcomponents-client-5.1.x/logging.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/logging.md
rename to src/site/markdown/httpcomponents-client-5.1.x/logging.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/index.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/index.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/index.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/index.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-http2.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-http2.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-http2.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-http2.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-simple.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-simple.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-simple.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-simple.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-streaming.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-streaming.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-async-streaming.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-streaming.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-classic.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-classic.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/migration-to-classic.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-classic.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/migration-guide/preparation.md b/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/preparation.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.0.x/migration-guide/preparation.md
rename to src/site/markdown/httpcomponents-client-5.1.x/migration-guide/preparation.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/quickstart.md b/src/site/markdown/httpcomponents-client-5.1.x/quickstart.md
index 9b1d8f4..bd5823a 100644
--- a/src/site/markdown/httpcomponents-client-5.1.x/quickstart.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/quickstart.md
@@ -20,10 +20,10 @@
 HttpClient Quick Start
 ======================
 
-- Download 'Binary' package of the latest HttpClient 4.5 release or configure dependency on `HttpClient` and `Fluent HC`
+- Download 'Binary' package of the latest HttpClient 5.1 release or configure dependency on `HttpClient` and `Fluent HC`
   modules using a dependency manager of your choice as described [here](download.md).
 
-- HttpClient 5.0 requires Java 1.7 or newer.
+- HttpClient 5.1 requires Java 1.7 or newer.
 
 - The below code fragment illustrates the execution of HTTP GET and POST requests using the HttpClient native API.
 
@@ -62,7 +62,7 @@ HttpClient Quick Start
     ```
 
   Source can be found here
-  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/QuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/QuickStart.java)
 
 - The same requests can be executed using a simpler, albeit less flexible, fluent API.
 
@@ -78,7 +78,7 @@ HttpClient Quick Start
     ```
 
   Source can be downloaded
-  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java)
 
 - The below code fragment illustrates the execution of HTTP requests using HttpClient async API.
 
@@ -180,6 +180,6 @@ HttpClient Quick Start
     ```    
 
   Source can be downloaded
-  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncQuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/5.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncQuickStart.java)
 
 
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/related-projects.md b/src/site/markdown/httpcomponents-client-5.1.x/related-projects.md
similarity index 84%
rename from src/site/markdown/httpcomponents-client-5.0.x/related-projects.md
rename to src/site/markdown/httpcomponents-client-5.1.x/related-projects.md
index c6b12ca..73af927 100644
--- a/src/site/markdown/httpcomponents-client-5.0.x/related-projects.md
+++ b/src/site/markdown/httpcomponents-client-5.1.x/related-projects.md
@@ -20,13 +20,6 @@
 Related projects
 ================
 
-HttpClient 5.0 migration guide
-------------------------------
-
-[HttpClient 5.0 migration guide](https://ok2c.github.io/httpclient-migration-guide/) is a third party resource with
-recommendations about the upgrade process and possible upgrade paths from Apache HttpClient 4.x to Apache HttpClient
-5.x.
-
 Asynchronous JSON message processors
 ------------------------------
 
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/download.md b/src/site/markdown/httpcomponents-client-5.2.x/download.md
similarity index 98%
rename from src/site/markdown/httpcomponents-client-5.0.x/download.md
rename to src/site/markdown/httpcomponents-client-5.2.x/download.md
index 7d172a5..91a6d6a 100644
--- a/src/site/markdown/httpcomponents-client-5.0.x/download.md
+++ b/src/site/markdown/httpcomponents-client-5.2.x/download.md
@@ -23,7 +23,7 @@ HttpClient Downloads
 The latest release available for download:
 
 [Release packages](http://hc.apache.org/downloads.cgi) -
-[Release Notes](http://www.apache.org/dist/httpcomponents/httpclient/RELEASE_NOTES-5.0.x.txt) -
+[Release Notes](http://www.apache.org/dist/httpcomponents/httpclient/RELEASE_NOTES-5.2.x.txt) -
 [License](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 Dependency management
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/examples-async.md b/src/site/markdown/httpcomponents-client-5.2.x/examples-async.md
similarity index 100%
copy from src/site/markdown/httpcomponents-client-5.1.x/examples-async.md
copy to src/site/markdown/httpcomponents-client-5.2.x/examples-async.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/examples-reactive.md b/src/site/markdown/httpcomponents-client-5.2.x/examples-reactive.md
similarity index 81%
rename from src/site/markdown/httpcomponents-client-5.0.x/examples-reactive.md
rename to src/site/markdown/httpcomponents-client-5.2.x/examples-reactive.md
index e88b1f8..d251a8a 100644
--- a/src/site/markdown/httpcomponents-client-5.0.x/examples-reactive.md
+++ b/src/site/markdown/httpcomponents-client-5.2.x/examples-reactive.md
@@ -20,6 +20,6 @@
 HttpClient Examples (Async)
 ===========================
 
-- [HTTP exchange with Reactive Streams](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
+- [HTTP exchange with Reactive Streams](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchange.java)
 
-    This example demonstrates a reactive, full-duplex HTTP/1.1 message exchange using RxJava.
+  This example demonstrates a reactive, full-duplex HTTP/1.1 message exchange using RxJava.
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/examples.md b/src/site/markdown/httpcomponents-client-5.2.x/examples.md
similarity index 100%
copy from src/site/markdown/httpcomponents-client-5.1.x/examples.md
copy to src/site/markdown/httpcomponents-client-5.2.x/examples.md
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/index.md b/src/site/markdown/httpcomponents-client-5.2.x/index.md
similarity index 85%
rename from src/site/markdown/httpcomponents-client-5.0.x/index.md
rename to src/site/markdown/httpcomponents-client-5.2.x/index.md
index ff55a54..a6617df 100644
--- a/src/site/markdown/httpcomponents-client-5.0.x/index.md
+++ b/src/site/markdown/httpcomponents-client-5.2.x/index.md
@@ -77,12 +77,13 @@ Standards Compliance
 HttpClient strives to conform to the following specifications endorsed by the Internet Engineering Task Force (IETF) and
 the internet at large:
 
-* [RFC 7230](http://tools.ietf.org/html/rfc7230) - Hypertext Transfer Protocol (HTTP/1.1): Message Syntax and Routing
-* [RFC 7231](http://tools.ietf.org/html/rfc7231) - Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content
-* [RFC 7235](http://tools.ietf.org/html/rfc7235) - Hypertext Transfer Protocol (HTTP/1.1): Authentication
-* [RFC 1945](http://tools.ietf.org/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
-* [RFC 2817](http://tools.ietf.org/html/rfc2817) - Upgrading to TLS Within HTTP/1.1
-* [RFC 2818](http://tools.ietf.org/html/rfc2818) - HTTP Over TLS
-* [RFC 6265](http://tools.ietf.org/html/rfc6265) - HTTP State Management Mechanism (Cookies)
-* [RFC 2396](http://tools.ietf.org/html/rfc2396) - Uniform Resource Identifiers (URI): Generic Syntax
+- [RFC 7540](http://tools.ietf.org/html/rfc7540) - Hypertext Transfer Protocol Version 2 (HTTP/2)
+- [RFC 7541](http://tools.ietf.org/html/rfc7541) - HPACK: Header Compression for HTTP/2
+- [RFC 7230](http://tools.ietf.org/html/rfc7230) - Hypertext Transfer Protocol (HTTP/1.1): Message Syntax and Routing
+- [RFC 7231](http://tools.ietf.org/html/rfc7231) - Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content
+- [RFC 1945](http://tools.ietf.org/html/rfc1945) - Hypertext Transfer Protocol -- HTTP/1.0
+- [RFC 3986](http://tools.ietf.org/html/rfc3986) - Uniform Resource Identifier (URI): Generic Syntax
+- [RFC 2817](http://tools.ietf.org/html/rfc2817) - Upgrading to TLS Within HTTP/1.1
+- [RFC 2818](http://tools.ietf.org/html/rfc2818) - HTTP Over TLS
+- [RFC 6265](http://tools.ietf.org/html/rfc6265) - HTTP State Management Mechanism (Cookies)
 
diff --git a/src/site/markdown/httpcomponents-client-5.0.x/quickstart.md b/src/site/markdown/httpcomponents-client-5.2.x/quickstart.md
similarity index 92%
rename from src/site/markdown/httpcomponents-client-5.0.x/quickstart.md
rename to src/site/markdown/httpcomponents-client-5.2.x/quickstart.md
index a7f8952..912af1f 100644
--- a/src/site/markdown/httpcomponents-client-5.0.x/quickstart.md
+++ b/src/site/markdown/httpcomponents-client-5.2.x/quickstart.md
@@ -20,10 +20,10 @@
 HttpClient Quick Start
 ======================
 
-- Download 'Binary' package of the latest HttpClient 4.5 release or configure dependency on `HttpClient` and `Fluent HC`
+- Download 'Binary' package of the latest HttpClient 5.2 release or configure dependency on `HttpClient` and `Fluent HC`
   modules using a dependency manager of your choice as described [here](download.md).
 
-- HttpClient 5.0 requires Java 1.7 or newer.
+- HttpClient 5.2 requires Java 1.8 or newer.
 
 - The below code fragment illustrates the execution of HTTP GET and POST requests using the HttpClient native API.
 
@@ -62,7 +62,7 @@ HttpClient Quick Start
     ```
 
   Source can be found here
-  [here](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/QuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/QuickStart.java)
 
 - The same requests can be executed using a simpler, albeit less flexible, fluent API.
 
@@ -78,7 +78,7 @@ HttpClient Quick Start
     ```
 
   Source can be downloaded
-  [here](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5-fluent/src/test/java/org/apache/hc/client5/http/examples/fluent/FluentQuickStart.java)
 
 - The below code fragment illustrates the execution of HTTP requests using HttpClient async API.
 
@@ -180,6 +180,6 @@ HttpClient Quick Start
     ```    
 
   Source can be downloaded
-  [here](https://github.com/apache/httpcomponents-client/tree/5.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncQuickStart.java)
+  [here](https://github.com/apache/httpcomponents-client/tree/master/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncQuickStart.java)
 
 
diff --git a/src/site/markdown/news.md b/src/site/markdown/news.md
index 43755d8..1be5d1f 100644
--- a/src/site/markdown/news.md
+++ b/src/site/markdown/news.md
@@ -20,6 +20,24 @@
 HttpComponents Project News
 ===========================
 
+###### 12 May 2021 - HttpComponents Client 5.1 (GA) released
+
+This is the first GA release in the 5.1 release series.
+
+Notable changes and features included in the 5.1 series:
+
+- Conditional conformance with RFC 3986 (Uniform Resource Identifier (URI): Generic Syntax).
+- Improved support for out of sequence response message handing by the classic (blocking) HTTP transport.
+- Improved message builders.
+
+Please note that 5.1 is going to be the last release series compatible with Java 1.7. HttpClient will require Java 1.8
+as of 5.2.
+
+###### 12 May 2021 - HttpComponents Client 5.0.4 (GA) released
+
+This is a maintenance release that corrects a number of defects discovered since release 5.0.3 and upgrades HttpCore to
+version 5.0.4 and Common Codec to version 1.15.
+
 ###### 6 May 2021 - HttpComponents Core 5.1.1 (GA) released
 
 This is a maintenance release that corrects a number of defects discovered since release 5.1
diff --git a/src/site/markdown/status.md b/src/site/markdown/status.md
index 63a3d92..4af9883 100644
--- a/src/site/markdown/status.md
+++ b/src/site/markdown/status.md
@@ -20,37 +20,35 @@
 HttpComponents Project Status
 =============================
 
-HttpComponents HttpCore 5.1.x
+HttpComponents HttpCore 5.2.x
 -----------------------------
 
-HttpCore 5.1.x branch is the current feature development branch. The 5.x release series is expected to provide
-conditional conformance to RFC 3986 as well as a number of incremental functional enhancements and performance
-improvements.
+HttpCore 5.2.x branch is the current feature development branch. The 5.2.x release series is expected to support 
+Java 1.8 features and functionality. 
 
-This is likely to be the last release series with Java 1.7 support.
+HttpComponents HttpCore 5.2.x
+-----------------------------
+
+HttpCore 5.2.x branch is the current feature development branch. The 5.2.x release series is expected to support
+Java 1.8 features and functionality.
 
 HttpComponents HttpCore 5.1.x
 -----------------------------
 
-HttpCore 5.1.x branch is the current feature development branch. The 5.x release series is expected to provide
-conditional conformance to RFC 3986 as well as a number of incremental functional enhancements and performance
-improvements.
+HttpCore 5.1.x branch is considered stable and production ready. It is being actively maintained and supported. The
+5.1.x release series provides comprehensive support for HTTP/1.1 and HTTP/2 protocol, full conformance with mandatory
+requirements of RFC 7230, RFC 7231, RFC 7540 and RFC 7541 and conditional conformance to RFC 3986.
 
 This is likely to be the last release series with Java 1.7 support.
 
-HttpComponents HttpCore 5.0.x
------------------------------
-
-HttpCore 5.0.x branch is considered stable and production ready. It is being actively maintained and supported. The 5.x
-release series provides comprehensive support for HTTP/1.1 and HTTP/2 protocol and full conformance with mandatory
-requirements of RFC 7230, RFC 7231, RFC 7540 and RFC 7541
-
-HttpComponents HttpClient 5.0.x
+HttpComponents HttpClient 5.1.x
 -------------------------------
 
-HttpClient 5.0.x branch is considered stable and production ready. It is being actively maintained and supported. The
-5.x release series provides comprehensive support for HTTP/1.1 and HTTP/2 protocol and full conformance with mandatory
-requirements of RFC 7230, RFC 7231, RFC 7540 and RFC 7541
+HttpClient 5.1.x branch is considered stable and production ready. It is being actively maintained and supported. The
+5.1.x release series provides comprehensive support for HTTP/1.1 and HTTP/2 protocol, full conformance with mandatory
+requirements of RFC 7230, RFC 7231, RFC 7540 and RFC 7541 and conditional conformance to RFC 3986
+
+This is likely to be the last release series with Java 1.7 support.
 
 HttpComponents HttpCore 4.4.x
 -----------------------------
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 6e1693b..3fa458a 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -1,9 +1,13 @@
 Redirect permanent  "/httpclient-3.x"                  "/httpclient-legacy"
 Redirect permanent  "/httpcomponents-asyncclient"      "/httpcomponents-asyncclient-4.1.x"
 Redirect permanent  "/httpcomponents-asyncclient-ga"   "/httpcomponents-asyncclient-4.1.x"
+
+Redirect temp       "/httpcomponents-core-5.0.x"       "/httpcomponents-core-5.1.x"
 Redirect temp       "/httpcomponents-core"             "/httpcomponents-core-5.1.x"
 Redirect temp       "/httpcomponents-core-ga"          "/httpcomponents-core-5.1.x"
-Redirect temp       "/httpcomponents-client"           "/httpcomponents-client-5.0.x"
-Redirect temp       "/httpcomponents-client-ga"        "/httpcomponents-client-5.0.x"
+Redirect temp       "/httpcomponents-client-5.0.x"     "/httpcomponents-client-5.1.x"
+Redirect temp       "/httpcomponents-client"           "/httpcomponents-client-5.1.x"
+Redirect temp       "/httpcomponents-client-ga"        "/httpcomponents-client-5.1.x"
+
 Redirect temp       "/httpcomponents-core-dev"         "/httpcomponents-core-5.1.x"
 Redirect temp       "/httpcomponents-client-dev"       "/httpcomponents-client-5.1.x"
diff --git a/src/site/resources/httpcomponents-client-5.1.x/documentation.links b/src/site/resources/httpcomponents-client-5.1.x/documentation.links
index b562b21..184abb2 100644
--- a/src/site/resources/httpcomponents-client-5.1.x/documentation.links
+++ b/src/site/resources/httpcomponents-client-5.1.x/documentation.links
@@ -1,5 +1,5 @@
 # links property file for Ant's symlink task in pom.xml:
 # links to components in http://hc.apache.org/components/
 
-5.1-beta1   ../components/httpcomponents-client-5.1.x/5.1-beta1
-current     ../components/httpcomponents-client-5.1.x/5.1-beta1
+5.1         ../components/httpcomponents-client-5.1.x/5.1
+current     ../components/httpcomponents-client-5.1.x/5.1
diff --git a/src/site/resources/httpcomponents-core-5.1.x/documentation.links b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
index 2504a00..413e558 100644
--- a/src/site/resources/httpcomponents-core-5.1.x/documentation.links
+++ b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
@@ -1,7 +1,6 @@
 # links property file for Ant's symlink task in pom.xml:
 # links to components in http://hc.apache.org/components/
 
-5.1-beta3   ../components/httpcomponents-core-5.1.x/5.1-beta3
 5.1         ../components/httpcomponents-core-5.1.x/5.1
 5.1.1       ../components/httpcomponents-core-5.1.x/5.1.1
 current     ../components/httpcomponents-core-5.1.x/5.1.1
diff --git a/src/site/site.xml b/src/site/site.xml
index 8e2fa32..ea2272a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -70,33 +70,16 @@ under the License.
       <item name="Get Involved" href="get-involved.html"/>
     </menu>
     <menu name="Components">
-      <item name="HttpClient 5.1 BETA" collapse="true" href="httpcomponents-client-5.1.x/index.html">
+      <item name="HttpClient 5.1" collapse="true" href="httpcomponents-client-5.1.x/index.html">
         <item name="Quick Start" href="httpcomponents-client-5.1.x/quickstart.html"/>
         <item name="Examples (Classic)" href="httpcomponents-client-5.1.x/examples.html"/>
         <item name="Examples (Async)" href="httpcomponents-client-5.1.x/examples-async.html"/>
         <item name="Examples (Reactive)" href="httpcomponents-client-5.1.x/examples-reactive.html"/>
-        <item name="Logging Guide" href="httpcomponents-client-5.0.x/logging.html"/>
-        <item name="Android" href="httpcomponents-client-5.0.x/android.html"/>
-        <item name="Related" href="httpcomponents-client-5.0.x/related-projects.html"/>
+        <item name="Logging Guide" href="httpcomponents-client-5.1.x/logging.html"/>
+        <item name="Android" href="httpcomponents-client-5.1.x/android.html"/>
+        <item name="Related" href="httpcomponents-client-5.1.x/related-projects.html"/>
         <item name="Download" href="httpcomponents-client-5.1.x/download.html"/>
       </item>
-      <item name="HttpClient 5.0" collapse="true" href="httpcomponents-client-5.0.x/index.html">
-        <item name="Quick Start" href="httpcomponents-client-5.0.x/quickstart.html"/>
-        <item name="Migration Guide" collapse="true" href="httpcomponents-client-5.0.x/migration-guide/index.html">
-          <item name="Preparation" href="httpcomponents-client-5.0.x/migration-guide/preparation.html"/>
-          <item name="Classic" href="httpcomponents-client-5.0.x/migration-guide/migration-to-classic.html"/>
-          <item name="Async Simple" href="httpcomponents-client-5.0.x/migration-guide/migration-to-async-simple.html"/>
-          <item name="Async Streaming" href="httpcomponents-client-5.0.x/migration-guide/migration-to-async-streaming.html"/>
-          <item name="Async HTTP/2 only" href="httpcomponents-client-5.0.x/migration-guide/migration-to-async-http2.html"/>
-        </item>
-        <item name="Examples (Classic)" href="httpcomponents-client-5.0.x/examples.html"/>
-        <item name="Examples (Async)" href="httpcomponents-client-5.0.x/examples-async.html"/>
-        <item name="Examples (Reactive)" href="httpcomponents-client-5.0.x/examples-reactive.html"/>
-        <item name="Logging Guide" href="httpcomponents-client-5.0.x/logging.html"/>
-        <item name="Android" href="httpcomponents-client-5.0.x/android.html"/>
-        <item name="Related" href="httpcomponents-client-5.0.x/related-projects.html"/>
-        <item name="Download" href="httpcomponents-client-5.0.x/download.html"/>
-      </item>
       <item name="HttpCore 5.1" collapse="true" href="httpcomponents-core-5.1.x/index.html">
         <item name="Examples" href="httpcomponents-core-5.1.x/examples.html"/>
         <item name="Related" href="httpcomponents-core-5.1.x/related-projects.html"/>
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index a075bcc..31bd624 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -64,34 +64,34 @@
    <code>sha512</code> link downloads the SHA 512 checksum from the main site.
   </p>
 
-    <subsection name="HttpClient 5.0.3 (GA)">
+    <subsection name="HttpClient 5.1 (GA)">
       <a href="https://downloads.apache.org/httpcomponents/httpclient/KEYS">KEYS</a>
-      <a href="https://downloads.apache.org/httpcomponents/httpclient/RELEASE_NOTES-5.0.x.txt">Release Notes</a>
+      <a href="https://downloads.apache.org/httpcomponents/httpclient/RELEASE_NOTES-5.1.x.txt">Release Notes</a>
       <br/>
       <p>Binary</p>
       <ul>
         <li>
-          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.tar.gz">5.0.3.tar.gz</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.tar.gz.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.tar.gz.asc">pgp</a>]
+          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.tar.gz">5.1.tar.gz</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.tar.gz.sha512">sha512</a>]
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.tar.gz.asc">pgp</a>]
         </li>
         <li>
-          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.zip">5.0.3.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.zip.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.0.3-bin.zip.asc">pgp</a>]
+          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.zip">5.1.zip</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.zip.sha512">sha512</a>]
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-bin.zip.asc">pgp</a>]
         </li>
       </ul>
       <p>Source</p>
       <ul>
         <li>
-          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.tar.gz">5.0.3.tar.gz</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.tar.gz.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.tar.gz.asc">pgp</a>]
+          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.tar.gz">5.1.tar.gz</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.tar.gz.sha512">sha512</a>]
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.tar.gz.asc">pgp</a>]
         </li>
         <li>
-          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.zip">5.0.3.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.zip.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.0.3-src.zip.asc">pgp</a>]
+          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.zip">5.1.zip</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.zip.sha512">sha512</a>]
+          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-src.zip.asc">pgp</a>]
         </li>
       </ul>
     </subsection>
@@ -236,38 +236,6 @@
     </ul>
   </subsection>
 
-    <subsection name="HttpClient 5.1 BETA1">
-      <a href="https://downloads.apache.org/httpcomponents/httpclient/KEYS">KEYS</a>
-      <a href="https://downloads.apache.org/httpcomponents/httpclient/RELEASE_NOTES-5.1.x.txt">Release Notes</a>
-      <br/>
-      <p>Binary</p>
-      <ul>
-        <li>
-          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.tar.gz">5.1-beta1.tar.gz</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.tar.gz.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.tar.gz.asc">pgp</a>]
-        </li>
-        <li>
-          <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.zip">5.1-beta1.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.zip.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1-beta1-bin.zip.asc">pgp</a>]
-        </li>
-      </ul>
-      <p>Source</p>
-      <ul>
-        <li>
-          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.tar.gz">5.1-beta1.tar.gz</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.tar.gz.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.tar.gz.asc">pgp</a>]
-        </li>
-        <li>
-          <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.zip">5.1-beta1.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.zip.sha512">sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1-beta1-src.zip.asc">pgp</a>]
-        </li>
-      </ul>
-    </subsection>
-
   <subsection name="Older releases">
     <p>
     Old releases are available from the