new release 2.1.13

smillst · smillst · commit 9e9de935f5ce · 2017-07-03T10:13:16.000-07:00
diff --git a/build-common.properties b/build-common.properties
@@ -8,7 +8,7 @@
 checkerframework=${basedir}/..
 
 # The Checker Framework version number
-build.version = 2.1.12
+build.version = 2.1.13
 
 # The location of the OpenJDK distribution to use;
 # must be a version that supports type annotations (JSR 308)
diff --git a/docs/checker-framework-webpage.html b/docs/checker-framework-webpage.html
@@ -33,8 +33,8 @@ <h1>The Checker Framework</h1>
 
 <ul>
   <li>
-    Download: <a href="checker-framework-2.1.12.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.12.zip<!-- /checker-framework-zip-version --></a>
-    (<!-- checker-framework-date -->1 Jun 2017<!-- /checker-framework-date -->);
+    Download: <a href="checker-framework-2.1.13.zip"><!-- checker-framework-zip-version -->checker-framework-2.1.13.zip<!-- /checker-framework-zip-version --></a>
+    (<!-- checker-framework-date -->3 Jul 2017<!-- /checker-framework-date -->);
     includes source, platform-independent binary, tests, and documentation.<br/>
     Then, see the <a
     href="manual/#installation"><b>installation
@@ -101,7 +101,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/annotation-tools-3.6.42.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.42.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->01 Jun 2017<!-- /afu-date -->)
+          <li><a href="annotation-file-utilities/annotation-tools-3.6.43.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.43.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->03 Jul 2017<!-- /afu-date -->)
           </li>
           <li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
           </li>
@@ -225,7 +225,7 @@ <h3 id="bugs">Bug reports</h3>
 <hr />
 
 <p>
-Last updated: <!-- checker-framework-date -->1 Jun 2017<!-- /checker-framework-date -->
+Last updated: <!-- checker-framework-date -->3 Jul 2017<!-- /checker-framework-date -->
 </p>
 
 </body>
diff --git a/docs/examples/GradleExamples/GradleJava7Example/build.gradle b/docs/examples/GradleExamples/GradleJava7Example/build.gradle
@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    ext.checkerFrameworkVersion = '2.1.12'
+    ext.checkerFrameworkVersion = '2.1.13'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
 
diff --git a/docs/examples/MavenExample/pom.xml b/docs/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.12<!-- /checker-framework-version --></checkerFrameworkVersion>
+    <checkerFrameworkVersion><!-- checker-framework-version -->2.1.13<!-- /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/docs/manual/external-tools.tex b/docs/manual/external-tools.tex
@@ -47,14 +47,14 @@ \section{Javac compiler\label{javac-installation}}
   \item
     Option 1:
     Add directory
-    \code{.../checker-framework-2.1.12/checker/bin} to your path, \emph{before} any other
+    \code{.../checker-framework-2.1.13/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.12
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.13
   export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
 \end{Verbatim}
     then log out and back in to ensure that the environment variable
@@ -79,15 +79,15 @@ \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.12
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.13
   alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac'
 \end{Verbatim}
 
     If you are using a Java 7 JVM, then add command-line arguments to so
     indicate:
 
 \begin{Verbatim}
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.12
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.13
   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.12
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.1.13
   alias javacheck='java -jar "$CHECKERFRAMEWORK/checker/dist/checker.jar"'
 
   # Windows
-  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.1.12\
+  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.1.13\
   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.12
+  javac 1.8.0-jsr308-2.1.13
 \end{Verbatim}
 
 
@@ -564,7 +564,7 @@ \section{Gradle\label{gradle}}
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '2.1.12'
+    ext.checkerFrameworkVersion = '2.1.13'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
 
@@ -676,7 +676,7 @@ \section{Android Studio 3.0 and the Android Gradle Plugin 3.0\label{android-grad
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '2.1.12'
+    ext.checkerFrameworkVersion = '2.1.13'
     implementation "org.checkerframework:checker-qual:${checkerFrameworkVersion}"
     annotationProcessor "org.checkerframework:checker:${checkerFrameworkVersion}"
     checkerFrameworkAnnotatedJDK "org.checkerframework:jdk8:${checkerFrameworkVersion}"
diff --git a/docs/manual/introduction.tex b/docs/manual/introduction.tex
@@ -208,7 +208,7 @@ \section{Installation\label{installation}}
   %BEGIN LATEX
   \\
   %END LATEX
-  \url{https://checkerframework.org/checker-framework-2.1.12.zip}
+  \url{https://checkerframework.org/checker-framework-2.1.13.zip}
 
 \item
   Unzip it to create a \code{checker-framework} directory.
diff --git a/docs/manual/manual.tex b/docs/manual/manual.tex
@@ -4,8 +4,8 @@
 
 \title{The Checker Framework Manual: \\ Custom pluggable types for Java}
 \author{\url{https://checkerframework.org/}}
-\newcommand{\ReleaseVersion}{2.1.12}
-\newcommand{\ReleaseInfo}{2.1.12 (1 Jun 2017)}
+\newcommand{\ReleaseVersion}{2.1.13}
+\newcommand{\ReleaseInfo}{2.1.13 (3 Jul 2017)}
 \date{Version \ReleaseInfo{}}
 
 \begin{document}
diff --git a/docs/tutorial/tests/testdemo/check-tainting.0.expected b/docs/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.12
+javac 1.8.0-jsr308-2.1.13
 /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/docs/tutorial/webpages/security-error-cmd.html b/docs/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.12
+[jsr308.javac] javac 1.8.0-jsr308-2.1.13
 [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.12
+[jsr308.javac] javac 1.8.0-jsr308-2.1.13
 [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.12
+[jsr308.javac] javac 1.8.0-jsr308-2.1.13
 
 BUILD SUCCESSFUL
 Total time: 2 seconds
diff --git a/maven-artifacts/poms/checkerCompatQualPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/checkerPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/checkerQualPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/compilerPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/dataflowPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->2.1.12<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
             <type>jar</type>
         </dependency>
     </dependencies>
diff --git a/maven-artifacts/poms/javacutilPom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/jdk7Pom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/poms/jdk8Pom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
diff --git a/maven-artifacts/release/checkerCompatQualReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/checkerQualReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/checkerReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/compilerReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://bitbucket.org/typetools/jsr308-langtools/</url>
diff --git a/maven-artifacts/release/dataflowReleasePom.xml b/maven-artifacts/release/dataflowReleasePom.xml
@@ -31,14 +31,14 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->2.1.12<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.1.13<!-- /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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/javacutilReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/jdk7ReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>
diff --git a/maven-artifacts/release/jdk8ReleasePom.xml b/maven-artifacts/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.12<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.1.13<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ configurations {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
`32`		`- ext.checkerFrameworkVersion = '2.1.12'`
	`32`	`+ ext.checkerFrameworkVersion = '2.1.13'`
`33`	`33`	`ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'`
`34`	`34`	`checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Deleting directory /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-`
`5`	`5`	`check-tainting:`
`6`	`6`	`Created dir: /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-projects/personalblog-demo/bin`
`7`	`7`	`Compiling 2 source files to /Users/smillst/src/jsr308/checker-framework/tutorial/eclipse-projects/personalblog-demo/bin`
`8`		`-javac 1.8.0-jsr308-2.1.12`
	`8`	`+javac 1.8.0-jsr308-2.1.13`
`9`	`9`	`/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.`
`10`	`10`	`+ "%' order by post.created desc");`
`11`	`11`	`^`