diff --git a/avatica/docs/docker.html b/avatica/docs/docker.html
index ee32590..29cf51d 100644
--- a/avatica/docs/docker.html
+++ b/avatica/docs/docker.html
@@ -751,19 +751,19 @@
 <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.20.0:</p>
 
-<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>avatica-docker-1.20.0/
-avatica-docker-1.20.0/hypersql/
-avatica-docker-1.20.0/mysql/
-avatica-docker-1.20.0/postgresql/
-avatica-docker-1.20.0/Dockerfile
-avatica-docker-1.20.0/hypersql/build.sh
-avatica-docker-1.20.0/hypersql/Dockerfile
-avatica-docker-1.20.0/mysql/build.sh
-avatica-docker-1.20.0/mysql/docker-compose.yml
-avatica-docker-1.20.0/mysql/Dockerfile
-avatica-docker-1.20.0/postgresql/build.sh
-avatica-docker-1.20.0/postgresql/docker-compose.yml
-avatica-docker-1.20.0/postgresql/Dockerfile
+<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
 </code></pre></div></div>
 
 <h4 id="running">Running</h4>
diff --git a/avatica/docs/history.html b/avatica/docs/history.html
index bd49598..358cc61 100644
--- a/avatica/docs/history.html
+++ b/avatica/docs/history.html
@@ -706,6 +706,86 @@
 Downloads are available on the
 <a href="/avatica/downloads/avatica.html">downloads page</a>.</p>
 
+<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-XX</h2>
+
+<p>Apache Calcite Avatica 1.21.0 is a maintenance release with dependency upgrades and added support for Oracle JDK 16
+to 18. Of particular note is Log4j2 being upgrade to 2.16.0 and subsequently 2.17.0 and 2.17.1 to address
+<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-44228">CVE-2021-44228</a>,
+<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-45105">CVE-2021-45105</a> and
+<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-44832">CVE-2021-44832</a>.</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:
+Benchao Li,
+Francis Chuang (Release Manager),
+Istvan Toth,
+Julian Hyde,
+Marco Jorge,
+Michael Mior,
+Stamatis Zampetakis,
+Xiong Duan.</p>
+
+<p>Features and bug fixes</p>
+
+<ul>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5095">CALCITE-5095</a>]
+Support Java 18 and Guava 31.1-jre</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5116">CALCITE-5116</a>]
+Upgrade vlsi-release-plugins to 1.78</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4147">CALCITE-4147</a>]
+Rename “master” branch to “main”</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5098">CALCITE-5098</a>]
+Migrate Avatica to Gradle 7.4.2, and support Java 16 and 17</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4971">CALCITE-4971</a>]
+Update httpclient and httpcore to latest 5.1 release</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5009">CALCITE-5009</a>]
+Transparent JDBC connection re-creation may lead to data loss</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4974">CALCITE-4974</a>]
+Upgrade log4j2 version to 2.17.1</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4962">CALCITE-4962</a>]
+Protobuf debug does not show request/response type</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4951">CALCITE-4951</a>]
+Upgrade log4j2 version to 2.17.0</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-4940">CALCITE-4940</a>]
+Upgrade log4j2 version to 2.16.0</li>
+</ul>
+
+<p>Build and tests</p>
+
+<ul>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5103">CALCITE-5103</a>]
+Update docker-compose.yml files to use OpenJDK 17 and Gradle 7.4.2 images</li>
+  <li>Add Apache license header to website publication Github workflows</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5075">CALCITE-5075</a>]
+Build fails due to rat check on Gemfile.lock</li>
+  <li>Silence standard out messages in tests</li>
+</ul>
+
+<p>Web site and documentation</p>
+
+<ul>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5108">CALCITE-5108</a>]
+Make website GDPR-compliant</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5106">CALCITE-5106</a>]
+Upgrade to Jekyll 4 and remove unnecessary dependencies from gemfile for site</li>
+  <li>Fix formatting in howto</li>
+  <li>Add instructions for release managers to uncomment commented out release history</li>
+  <li>Comment out release notes for next release, so that they don’t appear on the web site</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5102">CALCITE-5102</a>]
+Update github-pages gem for site build</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-3129">CALCITE-3129</a>]
+Automate website builds</li>
+  <li>[<a href="https://issues.apache.org/jira/browse/CALCITE-5070">CALCITE-5070</a>]
+Upgrade Jekyll and ruby gems for site generation</li>
+  <li>Change the javadoc title to Apache Calcite Avatica API</li>
+</ul>
+
 <h2 id="v1-20-0"><a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.20.0">1.20.0</a> / 2021-12-13</h2>
 
 <p>Apache Calcite Avatica 1.20.0
@@ -727,7 +807,7 @@
 Jincheng Sun,
 Josh Elser,
 Julian Hyde (release manager),
-NobiGo,
+Xiong Duan,
 Sergey Nuyanzin,
 Stamatis Zampetakis.</p>
 
diff --git a/avatica/docs/howto.html b/avatica/docs/howto.html
index 82316e1..e619e64 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.20.0-src.tar.gz
-<span class="nv">$ </span><span class="nb">cd </span>apache-calcite-avatica-1.20.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.21.0-src.tar.gz
+<span class="nv">$ </span><span class="nb">cd </span>apache-calcite-avatica-1.21.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