diff --git a/NOTICE b/NOTICE
index 6f192f3..b6529d7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Calcite -- Avatica
-Copyright 2012-2019 The Apache Software Foundation
+Copyright 2012-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README b/README
index 87cca50..8e65aab 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite Avatica release 1.16.0
+Apache Calcite Avatica release 1.17.0
 
 This is a source or binary distribution of Avatica, a framework for
 building database drivers. Avatica is a sub-project of Apache Calcite.
diff --git a/docker-compose.yml b/docker-compose.yml
index be80dbd..23bf49b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@
 version: '3'
 services:
   dry-run:
-    image: gradle:6.0-jdk
+    image: gradle:6.3-jdk
     working_dir: /src
     command: sh -c "./docker.sh dry-run"
     network_mode: "host"
@@ -26,7 +26,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   publish-release-for-voting:
-    image: gradle:6.0-jdk
+    image: gradle:6.3-jdk
     working_dir: /src
     command: sh -c "./docker.sh publish-release-for-voting"
     volumes:
@@ -34,7 +34,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   clean:
-    image: gradle:6.0-jdk
+    image: gradle:6.3-jdk
     working_dir: /src
     command: sh -c "./docker.sh clean"
     volumes:
@@ -42,7 +42,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   promote-release:
-    image: gradle:6.0-jdk
+    image: gradle:6.3-jdk
     working_dir: /src
     command: sh -c "./docker.sh promote-release"
     volumes:
@@ -50,7 +50,7 @@
       - gradle-cache:/home/gradle/.gradle
 
   test:
-    image: gradle:6.0-jdk
+    image: gradle:6.3-jdk
     working_dir: /src
     command: sh -c "./docker.sh test"
     volumes:
diff --git a/site/_docs/docker_images.md b/site/_docs/docker_images.md
index a20c168..f99863d 100644
--- a/site/_docs/docker_images.md
+++ b/site/_docs/docker_images.md
@@ -70,22 +70,22 @@
 exposing an Avatica server configured against a "real" PostgreSQL database.
 
 All of the `Dockerfile` and `docker-compose.yml` files are conveniently provided in an archive for
-each release. Here is the layout for release 1.16.0:
+each release. Here is the layout for release 1.17.0:
 
 ```
-avatica-docker-1.16.0/
-avatica-docker-1.16.0/hypersql/
-avatica-docker-1.16.0/mysql/
-avatica-docker-1.16.0/postgresql/
-avatica-docker-1.16.0/Dockerfile
-avatica-docker-1.16.0/hypersql/build.sh
-avatica-docker-1.16.0/hypersql/Dockerfile
-avatica-docker-1.16.0/mysql/build.sh
-avatica-docker-1.16.0/mysql/docker-compose.yml
-avatica-docker-1.16.0/mysql/Dockerfile
-avatica-docker-1.16.0/postgresql/build.sh
-avatica-docker-1.16.0/postgresql/docker-compose.yml
-avatica-docker-1.16.0/postgresql/Dockerfile
+avatica-docker-1.17.0/
+avatica-docker-1.17.0/hypersql/
+avatica-docker-1.17.0/mysql/
+avatica-docker-1.17.0/postgresql/
+avatica-docker-1.17.0/Dockerfile
+avatica-docker-1.17.0/hypersql/build.sh
+avatica-docker-1.17.0/hypersql/Dockerfile
+avatica-docker-1.17.0/mysql/build.sh
+avatica-docker-1.17.0/mysql/docker-compose.yml
+avatica-docker-1.17.0/mysql/Dockerfile
+avatica-docker-1.17.0/postgresql/build.sh
+avatica-docker-1.17.0/postgresql/docker-compose.yml
+avatica-docker-1.17.0/postgresql/Dockerfile
 ```
 
 #### Running
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 179438a..e9887ec 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -28,6 +28,41 @@
 Downloads are available on the
 [downloads page]({{ site.baseurl }}/downloads/avatica.html).
 
+
+## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.17.0">1.17.0</a> / 2020-06-XX
+{: #v1-17-0}
+
+Apache Calcite Avatica 1.17.0 is a small release incorporating a few dependency upgrades and minor fixes.
+
+Compatibility: This release is tested
+on Linux, macOS, Microsoft Windows;
+using Oracle JDK 8, 9, 10, 11, 12, 13;
+using IBM Java 8;
+Guava versions 14.0 to 23.0;
+other software versions as specified in `gradle.properties`.
+
+Features and bug fixes
+* Upgrade RAT to 0.5.3 and print violations in the console.
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-3610">CALCITE-3610</a>]
+  Fix dockerhub dockerfiles to point to the right JARs on nexus
+* Move PGP signing to com.github.vlsi.stage-vote-release Gradle plugin.
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-3623">CALCITE-3623</a>]
+  Replace Spotless with AutoStyle.
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2704">CALCITE-2704</a>]
+  Fix multilingual decoding issue where the server parses Chinese characters as gibberish.
+* Upgrade Gradle to 6.3 and color test results in output.
+* Upgrade protobuf to 0.8.12.
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-3822">CALCITE-3822</a>]
+  Source distribution must not contain fonts under SIL OFL 1.1 license (category B)
+* Upgrade Gradle to 6.3 in docker-compose files.
+
+Tests
+* Upgrade Github Actions' Checkout action to v2.
+* Add gradle wrapper validation job to Github Actions.
+
+Website and Documentation
+* Fix broken link to Javascript binding in the documentation.
+
 ## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.16.0">1.16.0</a> / 2019-12-19
 {: #v1-16-0}
 
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 9703140..84ac1c0 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -37,8 +37,8 @@
 then build using maven:
 
 {% highlight bash %}
-$ tar xvfz apache-calcite-avatica-1.16.0-src.tar.gz
-$ cd apache-calcite-avatica-1.16.0-src
+$ tar xvfz apache-calcite-avatica-1.17.0-src.tar.gz
+$ cd apache-calcite-avatica-1.17.0-src
 $ ./gradlew build
 {% endhighlight %}
 
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index dbf2ecf..835c377 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -29,7 +29,7 @@
     volumes:
       - .:/srv/jekyll
   generate-javadoc:
-    image: gradle:6.0
+    image: gradle:6.3
     working_dir: /usr/src/calcite-avatica
     command: sh -c "gradle javadocAggregate; rm -rf site/target/avatica/javadocAggregate; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
     volumes: