diff --git a/README b/README
index 56ff582..3053e13 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite Avatica release 1.11.0
+Apache Calcite Avatica release 1.12.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/src/main/dockerhub-hypersql/Dockerfile b/docker/src/main/dockerhub-hypersql/Dockerfile
index 9ced71b..0ea57b3 100644
--- a/docker/src/main/dockerhub-hypersql/Dockerfile
+++ b/docker/src/main/dockerhub-hypersql/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG AVATICA_VERSION=1.11.0
+ARG AVATICA_VERSION=1.12.0
 FROM apache/calcite-avatica:$AVATICA_VERSION
 MAINTAINER Apache Avatica <dev@calcite.apache.org>
 
diff --git a/docker/src/main/dockerhub/Dockerfile b/docker/src/main/dockerhub/Dockerfile
index bc98448..5308afa 100644
--- a/docker/src/main/dockerhub/Dockerfile
+++ b/docker/src/main/dockerhub/Dockerfile
@@ -21,7 +21,7 @@
 RUN mkdir -p /home/avatica/classpath
 
 # This line must be preserved. The Maven build will verify this version matches its version
-ARG AVATICA_VERSION="1.11.0"
+ARG AVATICA_VERSION="1.12.0"
 
 # Dependencies
 ADD https://repository.apache.org/content/groups/public/org/apache/calcite/avatica/avatica-standalone-server/${AVATICA_VERSION}/avatica-standalone-server-${AVATICA_VERSION}-shaded.jar /home/avatica/classpath
diff --git a/pom.xml b/pom.xml
index 2144310..e9917c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <top.dir>${project.basedir}</top.dir>
     <avatica.release.version>${project.version}</avatica.release.version>
     <version.major>1</version.major>
-    <version.minor>11</version.minor>
+    <version.minor>12</version.minor>
     <!-- This list is in alphabetical order. -->
     <bouncycastle.version>1.59</bouncycastle.version>
     <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
diff --git a/site/_docs/history.md b/site/_docs/history.md
index dcd8d84..ebfb253 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -28,6 +28,82 @@
 Downloads are available on the
 [downloads page]({{ site.baseurl }}/downloads/avatica.html).
 
+## <a href="https://github.com/apache/calcite-avatica/releases/tag/calcite-avatica-1.12.0">1.12.0</a> / 2018-06-15
+{: #v1-12-0}
+
+Apache Calcite Avatica 1.12.0 includes more than 20 bugs fixes and new features. ZIP archives will no longer be
+produced from this release onwards.
+
+Compatibility: This release is tested
+on Linux, macOS, Microsoft Windows;
+using Oracle JDK 8, 9, 10, 11;
+using IBM Java 8;
+Guava versions 14.0 to 23.0;
+other software versions as specified in `pom.xml`.
+
+Features and bug fixes
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1520">CALCITE-1520</a>]
+  Implement isValid for AvaticaConnection
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2212">CALCITE-2212</a>]
+  Enforce minimum JDK 8 via maven-enforcer-plugin
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2268">CALCITE-2268</a>]
+  Bump HSQLDB to 2.4.0 in Avatica Docker image
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2272">CALCITE-2272</a>]
+  Bump dependencies: Apache Parent POM 19, JDK 10 Surefire and JDK 10 Javadoc
+  Fix Javadoc generation
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2218">CALCITE-2218</a>]
+  Fix AvaticaResultSet#getRow()
+* Add Docker Hub image for HSQLDB
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2289">CALCITE-2289</a>]
+  Enable html5 for Javadoc on JDK 9+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2284">CALCITE-2284</a>]
+  Allow Jetty Server to be customized before startup
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2333">CALCITE-2333</a>]
+  Stop generating ZIP archives for release
+* Bump HSQLDB dependency to 2.4.1
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2294">CALCITE-2294</a>]
+  Allow customization for AvaticaServerConfiguration for plugging new authentication mechanisms (Karan Mehta)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1884">CALCITE-1884</a>]
+  DateTimeUtils produces incorrect results for days before the Gregorian cutover (Haohui Mai and Sergey Nuyanzin)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2303">CALCITE-2303</a>]
+  Support MICROSECONDS, MILLISECONDS, EPOCH, ISODOW, ISOYEAR and DECADE time units in EXTRACT function (Sergey Nuyanzin)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2350">CALCITE-2350</a>]
+  Fix cannot shade Avatica with Guava 21.0 or higher
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2341">CALCITE-2341</a>]
+  Fix Javadoc plugin incompatibility
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2352">CALCITE-2352</a>]
+  Update checkstyle to 6.18 and update supressions.xml
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2219">CALCITE-2219</a>]
+  Update Connection, Statement, PreparedStatement and ResultSet to throw an exception if resource is closed.
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2361">CALCITE-2361</a>]
+  Upgrade Bouncycastle to 1.59
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2299">CALCITE-2299</a>]
+  Add support for NANOSECOND in TimeUnit and TimeUnitRange 
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2285">CALCITE-2285</a>]
+  Support client cert keystore for Avatica client
+  
+Tests
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2210">CALCITE-2210</a>]
+  Remove oraclejdk7, add oraclejdk9, add oraclejdk10, and add ibmjava to .travis.yml
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2255">CALCITE-2255</a>]
+  Add JDK 11 .travis.yml
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-2022">CALCITE-2022</a>]
+  Add dynamic drive calculation to correctly determine trust store location when testing on Windows (Sergey Nuyanzin)
+
+Website and Documentation
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1160">CALCITE-1160</a>]
+  Redirect from Avatica community to Calcite community
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1937">CALCITE-1937</a>]
+  Update Avatica website to support the inclusion of Avatica-Go's content and add option for using docker to develop
+  and build the website
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1914">CALCITE-1914</a>]
+  Add DOAP (Description of a Project) file for Avatica
+* Fix broken link in HOWTO
+* Add missing license header to avatica-go docs generation script
+
 ## <a href="https://github.com/apache/calcite-avatica/releases/tag/calcite-avatica-1.11.0">1.11.0</a> / 2018-03-09
 {: #v1-11-0}
 
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 41de18f..5977825 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -38,8 +38,8 @@
 then build using maven:
 
 {% highlight bash %}
-$ tar xvfz apache-calcite-avatica-1.11.0-src.tar.gz
-$ cd apache-calcite-avatica-1.11.0-src
+$ tar xvfz apache-calcite-avatica-1.12.0-src.tar.gz
+$ cd apache-calcite-avatica-1.12.0-src
 $ mvn install
 {% endhighlight %}
 
@@ -239,12 +239,12 @@
 +++ b/docker/src/main/dockerhub/Dockerfile
 @@ -23,3 +23,3 @@ RUN mkdir -p /home/avatica/classpath
 # This line must be preserved. The Maven build will verify this version matches its version
--ARG AVATICA_VERSION="1.11.0"
-+ARG AVATICA_VERSION="1.11.0-SNAPSHOT"
+-ARG AVATICA_VERSION="1.12.0"
++ARG AVATICA_VERSION="1.12.0-SNAPSHOT"
 EOF
 
 # Do a dry run of the release:prepare step, which sets version numbers.
-# Typically we increment minor version: If X.Y.Z is 1.10.0, X2.Y2.Z2 is 1.11.0.
+# Typically we increment minor version: If X.Y.Z is 1.11.0, X2.Y2.Z2 is 1.12.0.
 mvn -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare
 {% endhighlight %}
 
@@ -281,7 +281,7 @@
 
 {% highlight bash %}
 # Prepare sets the version numbers, creates a tag, and pushes it to git.
-# Typically we increment minor version: If X.Y.Z is 1.10.0, X2.Y2.Z2 is 1.11.0.
+# Typically we increment minor version: If X.Y.Z is 1.11.0, X2.Y2.Z2 is 1.12.0.
 mvn -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare
 
 # Perform checks out the tagged version, builds, and deploys to the staging repository
diff --git a/site/_posts/2018-06-20-release-1.12.0.md b/site/_posts/2018-06-20-release-1.12.0.md
new file mode 100644
index 0000000..ae4fc6e
--- /dev/null
+++ b/site/_posts/2018-06-20-release-1.12.0.md
@@ -0,0 +1,32 @@
+---
+layout: news_item
+date: "2018-06-20 08:30:00 +0000"
+author: francischuang
+version: 1.12.0
+categories: [release]
+tag: v1-12-0
+sha: xxxx
+component: avatica
+---
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
+Apache Calcite Avatica 1.12.0 includes more than 20
+[bug fixes and new features]({{ site.baseurl }}/docs/history.html#v1-12-0).
+ZIP archives will no longer be produced from this release onwards.