Updated Android compatibility info
diff --git a/src/site/apt/httpcomponents-client-4.5.x/android-port.apt b/src/site/apt/httpcomponents-client-4.5.x/android.apt
similarity index 70%
rename from src/site/apt/httpcomponents-client-4.5.x/android-port.apt
rename to src/site/apt/httpcomponents-client-4.5.x/android.apt
index 5d00f6a..47c1d27 100644
--- a/src/site/apt/httpcomponents-client-4.5.x/android-port.apt
+++ b/src/site/apt/httpcomponents-client-4.5.x/android.apt
@@ -35,34 +35,20 @@
of interfaces and internal structures were still not fully worked out. As Apache HttpClient 4.0
was maturing the project was expecting Google to incorporate the latest code improvements into
their code tree. Unfortunately it did not happen. Version of Apache HttpClient shipped with
- Android has effectively become a fork. Eventually Google decided to discontinue further
- development of their fork while refusing to upgrade to the stock version of Apache HttpClient
- citing compatibility concerns as a reason for such decision. As a result those Android
- developers who would like to continue using Apache HttpClient APIs on Android cannot take
- advantage of newer features, performance improvements and bug fixes.
+ Android has effectively become a fork.
- Apache HttpClient 4.3 port for Android was intended to remedy the situation by providing
- official releases compatible with Google Android.
-
- Given that as of Android API 23 Google's fork of HttpClient has been removed this project
- has been discontinued.
+ Eventually Google decided to discontinue further development of their fork while refusing to upgrade
+ to the stock version of Apache HttpClient citing compatibility concerns as a reason for such decision.
+ Google completely removed their fork of Apache HttpClient from Android in version 8.0 (API 26) only.
Those users who want to continue using Apache HttpClient on Android are advised to
consider
- * Apache HttpCLient 5.x stock version, which works well with Android API 19 and newer, currently in beta
+ * Apache HttpCLient 5.x stock version, which works well with Android API 19 and newer
----
dependencies {
- compile group: 'org.apache.httpcomponents.client5' , name: 'httpclient5' , version: '5.0-beta3'
-}
-----
-
- * Apache HttpClient 4.3 port for Android when targeting Android API 22 and older
-
-----
-dependencies {
- compile group: 'org.apache.httpcomponents' , name: 'httpclient-android' , version: '4.3.5.1'
+ compile group: 'org.apache.httpcomponents.client5' , name: 'httpclient5' , version: '5.0-beta4'
}
----
@@ -75,3 +61,15 @@
}
----
+ * {{{https://ok2c.github.io/httpclient-android-ext/}Android extensions}} for Apache HttpClient 4.5
+ when targeting Android API 26 or newer.
+
+ Android extensions for Apache HttpClient provide a replacement for the default <<<HostnameVerifier>>>
+ implementation incompatible with Android and provide a builder for <<<PoolingHttpClientConnectionManager>>>
+ instances optimized for Android called <<<AndroidHttpClientConnectionManagerBuilder>>>.
+
+----
+dependencies {
+ api 'com.github.ok2c.hc4.android:httpclient-android:0.1.0'
+}
+----
diff --git a/src/site/apt/httpcomponents-client-5.0.x/android.apt b/src/site/apt/httpcomponents-client-5.0.x/android.apt
new file mode 100644
index 0000000..0887a42
--- /dev/null
+++ b/src/site/apt/httpcomponents-client-5.0.x/android.apt
@@ -0,0 +1,39 @@
+~~ ====================================================================
+~~ 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.
+~~ ====================================================================
+~~
+~~ This software consists of voluntary contributions made by many
+~~ individuals on behalf of the Apache Software Foundation. For more
+~~ information on the Apache Software Foundation, please see
+~~ <http://www.apache.org/>.
+
+ ----------
+ HttpClient for Android
+ ----------
+ ----------
+ ----------
+
+HttpClient for Android
+
+ Apache HttpCLient 5.x is expected to work well with Android API 19 and newer
+
+----
+dependencies {
+ compile group: 'org.apache.httpcomponents.client5' , name: 'httpclient5' , version: '5.0-beta4'
+}
+----
diff --git a/src/site/apt/httpcomponents-client-5.0.x/related-projects.apt b/src/site/apt/httpcomponents-client-5.0.x/related-projects.apt
index 591f6b0..9f8efa5 100644
--- a/src/site/apt/httpcomponents-client-5.0.x/related-projects.apt
+++ b/src/site/apt/httpcomponents-client-5.0.x/related-projects.apt
@@ -38,7 +38,7 @@
* Asynchronous JSON message processors
- {{{https://github.com/ok2c/httpcomponents-jackson}Asynchronous JSON message processors}}
+ {{{https://ok2c.github.io/httpcomponents-jackson/}Asynchronous JSON message processors}}
library is a companion project for HttpClient 5.0 developed outside the Apache Software
Foundation.
@@ -47,4 +47,8 @@
{{{https://github.com/FasterXML/jackson}Jackson JSON processor}}.
-
+* Android extensions
+
+ {{{https://ok2c.github.io/httpclient-android-ext/}Android extensions for
+ Apache HttpClient 5.0}} is a third party library that provides extra functionality
+ simplifying application of Apache HttpClient on Google Android platform.
diff --git a/src/site/apt/httpcomponents-core-5.0.x/related-projects.apt b/src/site/apt/httpcomponents-core-5.0.x/related-projects.apt
index fd0b760..2a69703 100644
--- a/src/site/apt/httpcomponents-core-5.0.x/related-projects.apt
+++ b/src/site/apt/httpcomponents-core-5.0.x/related-projects.apt
@@ -32,7 +32,7 @@
* Asynchronous JSON message processors
- {{{https://github.com/ok2c/httpcomponents-jackson}Asynchronous JSON message processors}}
+ {{{https://ok2c.github.io/httpcomponents-jackson/}Asynchronous JSON message processors}}
library is a companion project for HttpCore 5.0 developed outside the Apache Software Foundation.
The library provides a number of asynchronous message consumers and producers
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 9b31a0d..67ede9d 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -80,8 +80,6 @@
* HttpClient {{{./httpcomponents-client-ga/examples.html}Samples}}
- * HttpClient {{{./httpcomponents-client-4.3.x/android-port.html}port for Android}}
-
* {HttpComponents AsyncClient}
{{{./httpcomponents-asyncclient-dev/index.html}Asynch HttpClient}} is a HTTP/1.1 compliant HTTP agent
diff --git a/src/site/site.xml b/src/site/site.xml
index 26fc426..e52e8fc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -82,6 +82,7 @@
<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 name="Project Info" href="httpcomponents-client-5.0.x/project-info.html"/>
@@ -90,7 +91,7 @@
<item name="Quick Start" href="httpcomponents-client-4.5.x/quickstart.html"/>
<item name="Tutorial" href="httpcomponents-client-4.5.x/tutorial/html/index.html"/>
<item name="Examples" href="httpcomponents-client-4.5.x/examples.html"/>
- <item name="Android Port" href="httpcomponents-client-4.5.x/android-port.html"/>
+ <item name="Android" href="httpcomponents-client-4.5.x/android.html"/>
<item name="Programming Primer" href="httpcomponents-client-4.5.x/primer.html"/>
<item name="NTLM Guide" href="httpcomponents-client-4.5.x/ntlm.html"/>
<item name="Logging Guide" href="httpcomponents-client-4.5.x/logging.html"/>
