Updated project website for HttpClient 5.2 release
diff --git a/samples/pom.xml b/samples/pom.xml
index 6b81d8b..9c6bf85 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -41,7 +41,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<hc4.client.version>4.5.13</hc4.client.version>
- <hc5.client.version>5.0.3</hc5.client.version>
+ <hc5.client.version>5.2</hc5.client.version>
<jackson.version>2.12.6.1</jackson.version>
<asyncjson.version>0.2.0</asyncjson.version>
</properties>
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/android.md b/src/site/markdown/httpcomponents-client-5.2.x/android.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/android.md
rename to src/site/markdown/httpcomponents-client-5.2.x/android.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/logging.md b/src/site/markdown/httpcomponents-client-5.2.x/logging.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/logging.md
rename to src/site/markdown/httpcomponents-client-5.2.x/logging.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/index.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/index.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/index.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/index.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-http2.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-http2.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-http2.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-http2.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-simple.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-simple.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-simple.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-simple.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-streaming.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-streaming.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-async-streaming.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-async-streaming.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-classic.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-classic.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/migration-to-classic.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/migration-to-classic.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/migration-guide/preparation.md b/src/site/markdown/httpcomponents-client-5.2.x/migration-guide/preparation.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/migration-guide/preparation.md
rename to src/site/markdown/httpcomponents-client-5.2.x/migration-guide/preparation.md
diff --git a/src/site/markdown/httpcomponents-client-5.1.x/related-projects.md b/src/site/markdown/httpcomponents-client-5.2.x/related-projects.md
similarity index 100%
rename from src/site/markdown/httpcomponents-client-5.1.x/related-projects.md
rename to src/site/markdown/httpcomponents-client-5.2.x/related-projects.md
diff --git a/src/site/markdown/news.md b/src/site/markdown/news.md
index 43337cc..dfcae5d 100644
--- a/src/site/markdown/news.md
+++ b/src/site/markdown/news.md
@@ -20,6 +20,27 @@
HttpComponents Project News
===========================
+###### 10 November 2022 - HttpComponents Client 5.2 (GA) released
+
+This is the first GA release in the 5.2 release series. This release finalizes the 5.2 APIs and corrects several
+minor defects discovered since the previous release.
+
+Please note this is likely to be the last release series with support for SPNEGO and NTLM authentication.
+As of version 5.3 GSS-API-based authentication schemes (Kerberos, SPNEGO) and NTLM authentication schemes are going
+to be deprecated and disabled by default.
+
+Notable changes and features included in the 5.2 series:
+
+- Upgrade to Java 8.
+- Improved support for TLS upgrade and HTTP protocol upgrade (async).
+- Support for H2 tunneling via HTTP/1.1 proxy.
+- Conformance to RFC 7617 (The 'Basic' HTTP Authentication Scheme).
+- Migration to Java 8 Time primitives in State Management and Cache APIs.
+- Connection and TLS configuration on a per route basis.
+- Base64 codec based on Commons Codec replaced with JRE Base64 codec. Dependency on Commons Codec dropped.
+
+* Optional support for BR (Brotli) decompression.
+
###### 7 November 2022 - HttpComponents Core 5.2 (GA) released
This is the first GA release in the 5.2 release series. This release finalizes the 5.2 APIs and also corrects
@@ -44,16 +65,6 @@
This is the first BETA release in the 5.2 release series that upgrades minimal JRE level to version 8 (8u251 is
required) and includes several protocol level and API improvements. It also includes all bug fixes from the 5.1 branch.
-Notable changes and features included in the 5.2 series:
-
-- Upgrade to Java 8.
-- Improved support for TLS upgrade and HTTP protocol upgrade (async).
-- Support for H2 tunneling via HTTP/1.1 proxy.
-- Conformance to RFC 7617 (The 'Basic' HTTP Authentication Scheme).
-- Migration to Java 8 Time primitives in State Management and Cache APIs.
-- Base64 codec based on Commons Codec replaced with JRE Base64 codec. Dependency on Commons Codec dropped.
-- Optional support for BR (Brotli) decompression.
-
###### 2 June 2022 - HttpComponents Core 5.2-beta2 released
This BETA release corrects a major regression in the TLS handshake handling code introduced in the previous BETA
diff --git a/src/site/markdown/status.md b/src/site/markdown/status.md
index def4b25..8eb1ae8 100644
--- a/src/site/markdown/status.md
+++ b/src/site/markdown/status.md
@@ -20,15 +20,13 @@
HttpComponents Project Status
=============================
-HttpComponents HttpClient 5.1.x
+HttpComponents HttpClient 5.2.x
-------------------------------
-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
+HttpClient 5.2.x branch is considered stable and production ready. It is being actively maintained and supported. The
+5.2.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.2.x
-----------------------------
@@ -39,22 +37,24 @@
HttpComponents HttpCore 4.4.x
-----------------------------
-HttpCore 4.4.x branch is considered stable and production ready. While being actively maintained and supported, the 4.x
-release series will be receiving fixes for major defects and security issues only.
+HttpCore 4.4.x branch is considered stable and production ready. Please note the 4.x release series will be receiving
+fixes for major defects and security issues only.
Users of HttpCore 4.x are strongly encouraged to migrate to HttpCore 5.x
HttpComponents HttpClient 4.5.x
-------------------------------
-HttpClient 4.5.x branch is considered stable and production ready. While being actively maintained and supported, the
-4.x release series will be receiving fixes for major defects and security issues only.
+HttpClient 4.5.x branch is considered stable and production ready. Please note the 4.x release series will be receiving
+fixes for major defects and security issues only.
+
+Users of HttpClient 4.x are strongly encouraged to migrate to HttpClient 5.x
HttpComponents HttpAsyncClient 4.1.x
------------------------------------
-HttpAsyncClient 4.1.x branch is considered stable and production ready. While being actively maintained and supported,
-the 4.x release series will be receiving fixes for major defects and security issues only.
+HttpAsyncClient 4.1.x branch is considered stable and production ready. Please note the 4.x release series will be receiving
+fixes for major defects and security issues only.
Users of HttpAsyncClient 4.x are strongly encouraged to migrate to HttpClient 5.x
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index ec3f55b..517c5d7 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -6,9 +6,10 @@
Redirect permanent "/httpcomponents-core-5.1.x" "/httpcomponents-core-5.2.x"
Redirect permanent "/httpcomponents-core" "/httpcomponents-core-5.2.x"
Redirect permanent "/httpcomponents-core-ga" "/httpcomponents-core-5.2.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 permanent "/httpcomponents-client-5.0.x" "/httpcomponents-client-5.2.x"
+Redirect permanent "/httpcomponents-client-5.1.x" "/httpcomponents-client-5.2.x"
+Redirect permanent "/httpcomponents-client" "/httpcomponents-client-5.2.x"
+Redirect permanent "/httpcomponents-client-ga" "/httpcomponents-client-5.2.x"
Redirect temp "/httpcomponents-core-dev" "/httpcomponents-core-5.2.x"
Redirect temp "/httpcomponents-client-dev" "/httpcomponents-client-5.2.x"
diff --git a/src/site/resources/httpcomponents-client-5.2.x/documentation.links b/src/site/resources/httpcomponents-client-5.2.x/documentation.links
index fc399fe..0fe2ef0 100644
--- a/src/site/resources/httpcomponents-client-5.2.x/documentation.links
+++ b/src/site/resources/httpcomponents-client-5.2.x/documentation.links
@@ -3,4 +3,5 @@
5.2-alpha1 ../components/httpcomponents-client-5.2.x/5.2-alpha1
5.2-beta1 ../components/httpcomponents-client-5.2.x/5.2-beta1
-current ../components/httpcomponents-client-5.1.x/5.2-beta1
+5.2 ../components/httpcomponents-client-5.2.x/5.2
+current ../components/httpcomponents-client-5.1.x/5.2
diff --git a/src/site/site.xml b/src/site/site.xml
index e4b53b9..7a01987 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -70,33 +70,23 @@
<item name="Get Involved" href="get-involved.html"/>
</menu>
<menu name="Components">
- <item name="HttpClient 5.2 BETA" collapse="true" href="httpcomponents-client-5.2.x/index.html">
+ <item name="HttpClient 5.2" collapse="true" href="httpcomponents-client-5.2.x/index.html">
<item name="Quick Start" href="httpcomponents-client-5.2.x/quickstart.html"/>
+ <item name="Migration Guide" collapse="true" href="httpcomponents-client-5.2.x/migration-guide/index.html">
+ <item name="Preparation" href="httpcomponents-client-5.2.x/migration-guide/preparation.html"/>
+ <item name="Classic" href="httpcomponents-client-5.2.x/migration-guide/migration-to-classic.html"/>
+ <item name="Async Simple" href="httpcomponents-client-5.2.x/migration-guide/migration-to-async-simple.html"/>
+ <item name="Async Streaming" href="httpcomponents-client-5.2.x/migration-guide/migration-to-async-streaming.html"/>
+ <item name="Async HTTP/2 only" href="httpcomponents-client-5.2.x/migration-guide/migration-to-async-http2.html"/>
+ </item>
<item name="Examples (Classic)" href="httpcomponents-client-5.2.x/examples.html"/>
<item name="Examples (Async)" href="httpcomponents-client-5.2.x/examples-async.html"/>
<item name="Examples (Reactive)" href="httpcomponents-client-5.2.x/examples-reactive.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="Logging Guide" href="httpcomponents-client-5.2.x/logging.html"/>
+ <item name="Android" href="httpcomponents-client-5.2.x/android.html"/>
+ <item name="Related" href="httpcomponents-client-5.2.x/related-projects.html"/>
<item name="Download" href="httpcomponents-client-5.2.x/download.html"/>
</item>
- <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="Migration Guide" collapse="true" href="httpcomponents-client-5.1.x/migration-guide/index.html">
- <item name="Preparation" href="httpcomponents-client-5.1.x/migration-guide/preparation.html"/>
- <item name="Classic" href="httpcomponents-client-5.1.x/migration-guide/migration-to-classic.html"/>
- <item name="Async Simple" href="httpcomponents-client-5.1.x/migration-guide/migration-to-async-simple.html"/>
- <item name="Async Streaming" href="httpcomponents-client-5.1.x/migration-guide/migration-to-async-streaming.html"/>
- <item name="Async HTTP/2 only" href="httpcomponents-client-5.1.x/migration-guide/migration-to-async-http2.html"/>
- </item>
- <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.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="HttpCore 5.2" collapse="true" href="httpcomponents-core-5.2.x/index.html">
<item name="Examples" href="httpcomponents-core-5.2.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 5f56455..611e382 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.1.3 (GA)">
+ <subsection name="HttpClient 5.2 (GA)">
<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>
+ <a href="https://downloads.apache.org/httpcomponents/httpclient/RELEASE_NOTES-5.2.x.txt">Release Notes</a>
<br/>
<p>Binary</p>
<ul>
<li>
- <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.tar.gz">5.1.3.tar.gz</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.tar.gz.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.tar.gz.asc">pgp</a>]
+ <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.tar.gz">5.2.tar.gz</a>
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.tar.gz.sha512">sha512</a>]
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.tar.gz.asc">pgp</a>]
</li>
<li>
- <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.zip">5.1.3.zip</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.zip.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.1.3-bin.zip.asc">pgp</a>]
+ <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.zip">5.2.zip</a>
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.zip.sha512">sha512</a>]
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-bin.zip.asc">pgp</a>]
</li>
</ul>
<p>Source</p>
<ul>
<li>
- <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.tar.gz">5.1.3.tar.gz</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.tar.gz.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.tar.gz.asc">pgp</a>]
+ <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.tar.gz">5.2.tar.gz</a>
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.tar.gz.sha512">sha512</a>]
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.tar.gz.asc">pgp</a>]
</li>
<li>
- <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.zip">5.1.3.zip</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.zip.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.1.3-src.zip.asc">pgp</a>]
+ <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.zip">5.2.zip</a>
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.zip.sha512">sha512</a>]
+ [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-src.zip.asc">pgp</a>]
</li>
</ul>
</subsection>
@@ -204,38 +204,6 @@
<p>Recent releases of HttpCore can be found <a href="[preferred]/httpcomponents/httpcore">here</a></p>
</subsection>
- <subsection name="HttpClient 5.2 BETA1">
- <a href="https://downloads.apache.org/httpcomponents/httpclient/KEYS">KEYS</a>
- <a href="https://downloads.apache.org/httpcomponents/httpclient/RELEASE_NOTES-5.2.x.txt">Release Notes</a>
- <br/>
- <p>Binary</p>
- <ul>
- <li>
- <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.tar.gz">5.2-beta1.tar.gz</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.tar.gz.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.tar.gz.asc">pgp</a>]
- </li>
- <li>
- <a href="[preferred]/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.zip">5.2-beta1.zip</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.zip.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/binary/httpcomponents-client-5.2-beta1-bin.zip.asc">pgp</a>]
- </li>
- </ul>
- <p>Source</p>
- <ul>
- <li>
- <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.tar.gz">5.2-beta1.tar.gz</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.tar.gz.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.tar.gz.asc">pgp</a>]
- </li>
- <li>
- <a href="[preferred]/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.zip">5.2-beta1.zip</a>
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.zip.sha512">sha512</a>]
- [<a href="https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-5.2-beta1-src.zip.asc">pgp</a>]
- </li>
- </ul>
- </subsection>
-
<subsection name="HttpAsyncClient 4.1.5 (GA)">
<a href="https://downloads.apache.org/httpcomponents/httpasyncclient/KEYS">KEYS</a>
<a href="https://downloads.apache.org/httpcomponents/httpasyncclient/RELEASE_NOTES-4.1.x.txt">Release Notes</a>
