From 04e73a5cdae7ffcd78a5c6b4325b5318551f8fc3 Mon Sep 17 00:00:00 2001
From: Suzanne Millstein <smillst@cs.washington.edu>
Date: Thu, 1 Dec 2016 10:12:39 -0800
Subject: [PATCH] new release 2.1.6

---
 build-common.properties                        |  2 +-
 .../GradleJava7Example/build.gradle            |  2 +-
 checker/examples/MavenExample/pom.xml          |  2 +-
 .../manual/checker-framework-quick-start.html  |  2 +-
 checker/manual/checker-framework-webpage.html  |  8 ++++----
 checker/manual/external-tools.tex              | 18 +++++++++---------
 checker/manual/introduction.tex                |  2 +-
 checker/manual/manual.tex                      |  4 ++--
 maven-plugin/pom.xml                           |  2 +-
 maven-plugin/poms/checkerCompatQualPom.xml     |  2 +-
 maven-plugin/poms/checkerPom.xml               |  2 +-
 maven-plugin/poms/checkerQualPom.xml           |  2 +-
 maven-plugin/poms/compilerPom.xml              |  2 +-
 maven-plugin/poms/dataflowPom.xml              |  4 ++--
 maven-plugin/poms/javacutilPom.xml             |  2 +-
 maven-plugin/poms/jdk7Pom.xml                  |  2 +-
 maven-plugin/poms/jdk8Pom.xml                  |  2 +-
 .../release/checkerCompatQualReleasePom.xml    |  2 +-
 maven-plugin/release/checkerQualReleasePom.xml |  2 +-
 maven-plugin/release/checkerReleasePom.xml     |  2 +-
 maven-plugin/release/compilerReleasePom.xml    |  2 +-
 maven-plugin/release/dataflowReleasePom.xml    |  4 ++--
 maven-plugin/release/javacutilReleasePom.xml   |  2 +-
 maven-plugin/release/jdk7ReleasePom.xml        |  2 +-
 maven-plugin/release/jdk8ReleasePom.xml        |  2 +-
 maven-plugin/release/mavenPluginReleasePom.xml |  2 +-
 .../tests/testdemo/check-tainting.0.expected   |  2 +-
 tutorial/webpages/security-error-cmd.html      |  6 +++---
 28 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/build-common.properties b/build-common.properties
index 813abb0bd5f..d23658bedc8 100644
--- a/build-common.properties
+++ b/build-common.properties
@@ -8,7 +8,7 @@
 checkerframework=${basedir}/..
 
 # The Checker Framework version number
-build.version = 2.1.5
+build.version = 2.1.6
 
 # The location of the OpenJDK distribution to use;
 # must be a version that supports type annotations (JSR 308)
diff --git a/checker/examples/GradleExamples/GradleJava7Example/build.gradle b/checker/examples/GradleExamples/GradleJava7Example/build.gradle
index ad45e7cc6b9..614dd17f36e 100644
--- a/checker/examples/GradleExamples/GradleJava7Example/build.gradle
+++ b/checker/examples/GradleExamples/GradleJava7Example/build.gradle
@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    ext.checkerFrameworkVersion = '2.1.5'
+    ext.checkerFrameworkVersion = '2.1.6'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
 
diff --git a/checker/examples/MavenExample/pom.xml b/checker/examples/MavenExample/pom.xml
index 5aefc3b99c5..13bdeb7a314 100644
--- a/checker/examples/MavenExample/pom.xml
+++ b/checker/examples/MavenExample/pom.xml
@@ -15,7 +15,7 @@
     <!-- These properties will be set by the Maven Dependency plugin -->
     <!-- Change to jdk7 if using Java 7 -->
     <annotatedJdk>${org.checkerframework:jdk8:jar}</annotatedJdk>
-    <checkerFrameworkVersion><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></checkerFrameworkVersion>
+    <checkerFrameworkVersion><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></checkerFrameworkVersion>
      <!-- The type annotations compiler is required if using Java 7. -->
      <!-- Uncomment the following line if using Java 7. -->
      <!--<typeAnnotationsJavac>${org.checkerframework:compiler:jar}</typeAnnotationsJavac>-->
diff --git a/checker/manual/checker-framework-quick-start.html b/checker/manual/checker-framework-quick-start.html
index fab481f725a..967e83e13bf 100644
--- a/checker/manual/checker-framework-quick-start.html
+++ b/checker/manual/checker-framework-quick-start.html
@@ -22,7 +22,7 @@ <h1>Checker Framework quick start guide</h1>
 <p>
 To <a href="http://types.cs.washington.edu/checker-framework/current/checker-framework-manual.html#installation">install the Checker Framework</a>, download and unzip
 the Checker Framework distribution:
-<a href="current/checker-framework-2.1.5.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.5.zip<!-- /checker-framework-zip-version --></a>.<br/>
+<a href="current/checker-framework-2.1.6.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.6.zip<!-- /checker-framework-zip-version --></a>.<br/>
 Or, the
 <a href="http://eisop.uwaterloo.ca/live/">Checker Framework Live Demo</a>
 webpage lets you try the Checker Framework without installing it.
diff --git a/checker/manual/checker-framework-webpage.html b/checker/manual/checker-framework-webpage.html
index af2df8d0e8c..a5eb23c56c7 100644
--- a/checker/manual/checker-framework-webpage.html
+++ b/checker/manual/checker-framework-webpage.html
@@ -33,8 +33,8 @@ <h1>The Checker Framework</h1>
 
 <ul>
   <li>
-    Download: <a href="current/checker-framework-2.1.5.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.5.zip<!-- /checker-framework-zip-version --></a>
-    (<!-- checker-framework-date -->2 Nov 2016<!-- /checker-framework-date -->);
+    Download: <a href="current/checker-framework-2.1.6.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.6.zip<!-- /checker-framework-zip-version --></a>
+    (<!-- checker-framework-date -->1 Dec 2016<!-- /checker-framework-date -->);
     includes source, platform-independent binary, tests, and documentation.<br/>
     Then, see the <a
     href="current/checker-framework-manual.html#installation"><b>installation
@@ -100,7 +100,7 @@ <h1>The Checker Framework</h1>
           the <code>.class</code> file.  The tools support both Java 5
           declaration annotations and Java 8 type annotations.
         <ul>
-          <li><a href="../annotation-file-utilities/current/annotation-tools-3.6.35.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.35.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->02 Nov 2016<!-- /afu-date -->)
+          <li><a href="../annotation-file-utilities/current/annotation-tools-3.6.36.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.36.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->01 Dec 2016<!-- /afu-date -->)
           </li>
           <li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
           </li>
@@ -222,7 +222,7 @@ <h3 id="bugs">Bug reports</h3>
 <hr />
 
 <p>
-Last updated: <!-- checker-framework-date -->2 Nov 2016<!-- /checker-framework-date -->
+Last updated: <!-- checker-framework-date -->1 Dec 2016<!-- /checker-framework-date -->
 </p>
 
 </body>
diff --git a/checker/manual/external-tools.tex b/checker/manual/external-tools.tex
index eca998d0adb..0d44f76dfe5 100644
--- a/checker/manual/external-tools.tex
+++ b/checker/manual/external-tools.tex
@@ -47,14 +47,14 @@ \section{Javac compiler\label{javac-installation}}
   \item
     Option 1:
     Add directory
-    \code{.../checker-framework-2.1.5/checker/bin} to your path, \emph{before} any other
+    \code{.../checker-framework-2.1.6/checker/bin} to your path, \emph{before} any other
     directory that contains a \<javac> executable.
 
     If you are
     using the bash shell, a way to do this is to add the following to your
     \verb|~/.profile| (or alternately \verb|~/.bash_profle| or \verb|~/.bashrc|) file:
 \begin{Verbatim}
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.5
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.6
   export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
 \end{Verbatim}
     then log out and back in to ensure that the environment variable
@@ -79,7 +79,7 @@ \section{Javac compiler\label{javac-installation}}
     \verb|~/.bashrc| file:
 % No Windows example because this doesn't work under Windows.
 \begin{Verbatim}
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.5
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.6
   alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac'
 \end{Verbatim}
 
@@ -87,7 +87,7 @@ \section{Javac compiler\label{javac-installation}}
     indicate:
 
 \begin{Verbatim}
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.5
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.6
   alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac -source 7 -target 7'
 \end{Verbatim}
 
@@ -113,11 +113,11 @@ \section{Javac compiler\label{javac-installation}}
 
 \begin{Verbatim}
   # Unix
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.5
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.6
   alias javacheck='java -jar $CHECKERFRAMEWORK/checker/dist/checker.jar'
 
   # Windows
-  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.1.5\
+  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.1.6\
   doskey javacheck=java -jar %CHECKERFRAMEWORK%\checker\dist\checker.jar $*
 \end{Verbatim}
 
@@ -139,7 +139,7 @@ \section{Javac compiler\label{javac-installation}}
 The output should be:
 
 \begin{Verbatim}
-  javac 1.8.0-jsr308-2.1.5
+  javac 1.8.0-jsr308-2.1.6
 \end{Verbatim}
 
 
@@ -512,7 +512,7 @@ \section{Gradle\label{gradle}}
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '2.1.5'
+    ext.checkerFrameworkVersion = '2.1.6'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
 
@@ -594,7 +594,7 @@ \section{Android plugin for Gradle\label{android-gradle}}
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '2.1.5'
+    ext.checkerFrameworkVersion = '2.1.6'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
     checkerFrameworkJavac "org.checkerframework:compiler:${checkerFrameworkVersion}"
diff --git a/checker/manual/introduction.tex b/checker/manual/introduction.tex
index 765b7dd6315..63982f0d696 100644
--- a/checker/manual/introduction.tex
+++ b/checker/manual/introduction.tex
@@ -205,7 +205,7 @@ \section{Installation\label{installation}}
   %BEGIN LATEX
   \\
   %END LATEX
-  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-2.1.5.zip}
+  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-2.1.6.zip}
 
 \item
   Unzip it to create a \code{checker-framework} directory.
diff --git a/checker/manual/manual.tex b/checker/manual/manual.tex
index c233177c1bd..f2846973ca3 100644
--- a/checker/manual/manual.tex
+++ b/checker/manual/manual.tex
@@ -4,8 +4,8 @@
 
 \title{The Checker Framework Manual: \\ Custom pluggable types for Java}
 \author{\url{http://checkerframework.org/}}
-\newcommand{\ReleaseVersion}{2.1.5}
-\newcommand{\ReleaseInfo}{2.1.5 (2 Nov 2016)}
+\newcommand{\ReleaseVersion}{2.1.6}
+\newcommand{\ReleaseInfo}{2.1.6 (1 Dec 2016)}
 \date{Version \ReleaseInfo{}}
 
 \begin{document}
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index aa58adb8d1b..82202a9f99f 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/binary/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <build>
         <plugins>
diff --git a/maven-plugin/poms/checkerCompatQualPom.xml b/maven-plugin/poms/checkerCompatQualPom.xml
index 4130c9b7904..276fdca5e75 100644
--- a/maven-plugin/poms/checkerCompatQualPom.xml
+++ b/maven-plugin/poms/checkerCompatQualPom.xml
@@ -9,7 +9,7 @@
 
     <!-- Note: It's important that this is the first <version/> element to appear in this document (by line)
          Because there is a simple logic in the release script to replace the version number of pom files -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/checkerPom.xml b/maven-plugin/poms/checkerPom.xml
index 518d9124da4..ce144d6302b 100644
--- a/maven-plugin/poms/checkerPom.xml
+++ b/maven-plugin/poms/checkerPom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/checkerQualPom.xml b/maven-plugin/poms/checkerQualPom.xml
index 6b07c988b34..5fb37e87fb2 100644
--- a/maven-plugin/poms/checkerQualPom.xml
+++ b/maven-plugin/poms/checkerQualPom.xml
@@ -9,7 +9,7 @@
 
     <!-- Note: It's important that this is the first <version/> element to appear in this document (by line)
          Because there is a simple logic in the release script to replace the version number of pom files -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/compilerPom.xml b/maven-plugin/poms/compilerPom.xml
index 728f61b538a..1ca44e6ef06 100644
--- a/maven-plugin/poms/compilerPom.xml
+++ b/maven-plugin/poms/compilerPom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/dataflowPom.xml b/maven-plugin/poms/dataflowPom.xml
index 3d348d93ab7..324995188ef 100644
--- a/maven-plugin/poms/dataflowPom.xml
+++ b/maven-plugin/poms/dataflowPom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
             <type>jar</type>
         </dependency>
     </dependencies>
diff --git a/maven-plugin/poms/javacutilPom.xml b/maven-plugin/poms/javacutilPom.xml
index 45e00102e6a..c9eadbc80e6 100644
--- a/maven-plugin/poms/javacutilPom.xml
+++ b/maven-plugin/poms/javacutilPom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/jdk7Pom.xml b/maven-plugin/poms/jdk7Pom.xml
index 9ac962b66ec..b75812feaa4 100644
--- a/maven-plugin/poms/jdk7Pom.xml
+++ b/maven-plugin/poms/jdk7Pom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/poms/jdk8Pom.xml b/maven-plugin/poms/jdk8Pom.xml
index d1497f61294..7bf5af7f91b 100644
--- a/maven-plugin/poms/jdk8Pom.xml
+++ b/maven-plugin/poms/jdk8Pom.xml
@@ -9,7 +9,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-plugin/release/checkerCompatQualReleasePom.xml b/maven-plugin/release/checkerCompatQualReleasePom.xml
index a57322a3418..d9e6fe88747 100644
--- a/maven-plugin/release/checkerCompatQualReleasePom.xml
+++ b/maven-plugin/release/checkerCompatQualReleasePom.xml
@@ -32,7 +32,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/checkerQualReleasePom.xml b/maven-plugin/release/checkerQualReleasePom.xml
index caf44995727..6c74d7d7c20 100644
--- a/maven-plugin/release/checkerQualReleasePom.xml
+++ b/maven-plugin/release/checkerQualReleasePom.xml
@@ -32,7 +32,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/checkerReleasePom.xml b/maven-plugin/release/checkerReleasePom.xml
index 0d1148f8e8c..8c5e4f286b7 100644
--- a/maven-plugin/release/checkerReleasePom.xml
+++ b/maven-plugin/release/checkerReleasePom.xml
@@ -28,7 +28,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/compilerReleasePom.xml b/maven-plugin/release/compilerReleasePom.xml
index a72b02bab48..f49d3d30e3d 100644
--- a/maven-plugin/release/compilerReleasePom.xml
+++ b/maven-plugin/release/compilerReleasePom.xml
@@ -24,7 +24,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://bitbucket.org/typetools/jsr308-langtools/</url>
diff --git a/maven-plugin/release/dataflowReleasePom.xml b/maven-plugin/release/dataflowReleasePom.xml
index e90350340c5..09a78177d41 100644
--- a/maven-plugin/release/dataflowReleasePom.xml
+++ b/maven-plugin/release/dataflowReleasePom.xml
@@ -31,14 +31,14 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
             <type>jar</type>
         </dependency>
     </dependencies>
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/javacutilReleasePom.xml b/maven-plugin/release/javacutilReleasePom.xml
index 88c0cca6804..b53a3aedab5 100644
--- a/maven-plugin/release/javacutilReleasePom.xml
+++ b/maven-plugin/release/javacutilReleasePom.xml
@@ -29,7 +29,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/jdk7ReleasePom.xml b/maven-plugin/release/jdk7ReleasePom.xml
index 978d6f052d9..606b5451ef3 100644
--- a/maven-plugin/release/jdk7ReleasePom.xml
+++ b/maven-plugin/release/jdk7ReleasePom.xml
@@ -26,7 +26,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/jdk8ReleasePom.xml b/maven-plugin/release/jdk8ReleasePom.xml
index e5b61872f6d..51a1098b0fe 100644
--- a/maven-plugin/release/jdk8ReleasePom.xml
+++ b/maven-plugin/release/jdk8ReleasePom.xml
@@ -26,7 +26,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-plugin/release/mavenPluginReleasePom.xml b/maven-plugin/release/mavenPluginReleasePom.xml
index 5abd0f77b33..3343b9be837 100644
--- a/maven-plugin/release/mavenPluginReleasePom.xml
+++ b/maven-plugin/release/mavenPluginReleasePom.xml
@@ -32,7 +32,7 @@
 
     <!-- The comments in the version number are used to do a text substitution. Don't remove them.
          See checker-framework/bin/poms/updateVersion.sh -->
-    <version><!-- checker-framework-version -->2.1.5<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.6<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/tutorial/tests/testdemo/check-tainting.0.expected b/tutorial/tests/testdemo/check-tainting.0.expected
index d04bc8618ba..66fcfcb08bb 100644
--- a/tutorial/tests/testdemo/check-tainting.0.expected
+++ b/tutorial/tests/testdemo/check-tainting.0.expected
@@ -5,7 +5,7 @@ Deleting directory /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-
 check-tainting:
 Created dir: /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-projects/personalblog-demo/bin
 Compiling 2 source files to /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-projects/personalblog-demo/bin
-javac 1.8.0-jsr308-2.1.5
+javac 1.8.0-jsr308-2.1.6
 /home/mernst/research/types/checker-framework/tutorial/eclipse-projects/personalblog-demo/src/net/eyde/personalblog/service/PersonalBlogService.java:174: error: [argument.type.incompatible] incompatible types in argument.
                                 + "%' order by post.created desc");
                                   ^
diff --git a/tutorial/webpages/security-error-cmd.html b/tutorial/webpages/security-error-cmd.html
index aeaae350658..02686579113 100644
--- a/tutorial/webpages/security-error-cmd.html
+++ b/tutorial/webpages/security-error-cmd.html
@@ -108,7 +108,7 @@ <h4>1. Run the Tainting Checker &mdash; 1 error found</h4>
 check-tainting:
     [mkdir] Created dir: .../personalblog-demo/bin
 [jsr308.javac] Compiling 2 source files to .../personalblog-demo/bin
-[jsr308.javac] javac 1.8.0-jsr308-2.1.5
+[jsr308.javac] javac 1.8.0-jsr308-2.1.6
 [jsr308.javac] .../personalblog-demo/src/net/eyde/personalblog/service/PersonalBlogService.java:175: error: incompatible types in argument.
 [jsr308.javac]                     "where post.category like '%", category,
 [jsr308.javac]                                                    ^
@@ -157,7 +157,7 @@ <h4>3. Re-run the Tainting Checker &mdash; a new error is found</h4>
 check-tainting:
     [mkdir] Created dir: .../personalblog-demo/bin
 [jsr308.javac] Compiling 2 source files to .../personalblog-demo/bin
-[jsr308.javac] javac 1.8.0-jsr308-2.1.5
+[jsr308.javac] javac 1.8.0-jsr308-2.1.6
 [jsr308.javac] .../personalblog-demo/src/net/eyde/personalblog/struts/action/ReadAction.java:58: error: incompatible types in argument.
 [jsr308.javac]                          pblog.getPostsByCategory(reqCategory));
 [jsr308.javac]                                                   ^
@@ -200,7 +200,7 @@ <h4>5. Re-run the Tainting Checker &mdash; no errors</h4>
 check-tainting:
     [mkdir] Created dir: .../personalblog-demo/bin
 [jsr308.javac] Compiling 2 source files to .../personalblog-demo/bin
-[jsr308.javac] javac 1.8.0-jsr308-2.1.5
+[jsr308.javac] javac 1.8.0-jsr308-2.1.6
 
 BUILD SUCCESSFUL
 Total time: 2 seconds