Website deployed from calcite-avatica@71fc0abf79cb2c25cc430cc456beabd441cfff85
diff --git a/avatica/docs/docker.html b/avatica/docs/docker.html
index c90cc14..7eb9f51 100644
--- a/avatica/docs/docker.html
+++ b/avatica/docs/docker.html
@@ -749,21 +749,21 @@
 exposing an Avatica server configured against a “real” PostgreSQL database.</p>
 
 <p>All of the <code class="language-plaintext highlighter-rouge">Dockerfile</code> and <code class="language-plaintext highlighter-rouge">docker-compose.yml</code> files are conveniently provided in an archive for
-each release. Here is the layout for release 1.21.0:</p>
+each release. Here is the layout for release 1.22.0:</p>
 
-<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>avatica-docker-1.21.0/
-avatica-docker-1.21.0/hypersql/
-avatica-docker-1.21.0/mysql/
-avatica-docker-1.21.0/postgresql/
-avatica-docker-1.21.0/Dockerfile
-avatica-docker-1.21.0/hypersql/build.sh
-avatica-docker-1.21.0/hypersql/Dockerfile
-avatica-docker-1.21.0/mysql/build.sh
-avatica-docker-1.21.0/mysql/docker-compose.yml
-avatica-docker-1.21.0/mysql/Dockerfile
-avatica-docker-1.21.0/postgresql/build.sh
-avatica-docker-1.21.0/postgresql/docker-compose.yml
-avatica-docker-1.21.0/postgresql/Dockerfile
+<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>avatica-docker-1.22.0/
+avatica-docker-1.22.0/hypersql/
+avatica-docker-1.22.0/mysql/
+avatica-docker-1.22.0/postgresql/
+avatica-docker-1.22.0/Dockerfile
+avatica-docker-1.22.0/hypersql/build.sh
+avatica-docker-1.22.0/hypersql/Dockerfile
+avatica-docker-1.22.0/mysql/build.sh
+avatica-docker-1.22.0/mysql/docker-compose.yml
+avatica-docker-1.22.0/mysql/Dockerfile
+avatica-docker-1.22.0/postgresql/build.sh
+avatica-docker-1.22.0/postgresql/docker-compose.yml
+avatica-docker-1.22.0/postgresql/Dockerfile
 </code></pre></div></div>
 
 <h4 id="running">Running</h4>
diff --git a/avatica/docs/history.html b/avatica/docs/history.html
index 84976fa..f254f8c 100644
--- a/avatica/docs/history.html
+++ b/avatica/docs/history.html
@@ -706,6 +706,36 @@
 Downloads are available on the
 <a href="/avatica/downloads/avatica.html">downloads page</a>.</p>
 
+<h2 id="v1-22-0"><a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.22.0">1.22.0</a> / 2022-07-XX</h2>
+
+<p>Apache Calcite Avatica 1.22.0 is a maintenance release to resolve <code class="language-plaintext highlighter-rouge">CVE-2022-36364</code>: Apache Calcite Avatica JDBC driver
+<code class="language-plaintext highlighter-rouge">httpclient_impl</code> connection property can be used as an RCE vector. Users of previous versions of Avatica MUST upgrade
+to mitigate this vulnerability.</p>
+
+<p>Compatibility: This release is tested
+on Linux, macOS, Microsoft Windows;
+using Oracle JDK 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18;
+using IBM Java 8;
+Guava versions 14.0.1 to 31.1-jre;
+other software versions as specified in <code class="language-plaintext highlighter-rouge">gradle.properties</code>.</p>
+
+<p>Contributors to this release:
+Francis Chuang (Release Manager),
+Ruben Quesada Lopez</p>
+
+<p>Features and bug fixes</p>
+
+<ul>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5218">CALCITE-5218</a>]
+Verify HTTP client class before instantiating it</li>
+</ul>
+
+<p>Build and tests</p>
+
+<ul>
+  <li>Checkout release svn repository when promoting a release using the docker script</li>
+</ul>
+
 <h2 id="v1-21-0"><a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.21.0">1.21.0</a> / 2022-05-08</h2>
 
 <p>Apache Calcite Avatica 1.21.0 is a maintenance release with dependency upgrades and added support for Oracle JDK 16
diff --git a/avatica/docs/howto.html b/avatica/docs/howto.html
index e619e64..0bc8a61 100644
--- a/avatica/docs/howto.html
+++ b/avatica/docs/howto.html
@@ -752,8 +752,8 @@
 <code class="language-plaintext highlighter-rouge">cd</code> to the root directory of the unpacked source,
 then build using Gradle:</p>
 
-<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">tar </span>xvfz apache-calcite-avatica-1.21.0-src.tar.gz
-<span class="nv">$ </span><span class="nb">cd </span>apache-calcite-avatica-1.21.0-src
+<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">tar </span>xvfz apache-calcite-avatica-1.22.0-src.tar.gz
+<span class="nv">$ </span><span class="nb">cd </span>apache-calcite-avatica-1.22.0-src
 <span class="nv">$ </span>gradle build</code></pre></figure>
 
 <p><a href="#running-tests">Running tests</a> describes how to run more or fewer