new release 1.9.10

typetools · Jan 5, 2016 · c710ebf · c710ebf
1 parent 88f6dc4
commit c710ebf
Show file tree

Hide file tree

Showing 27 changed files with 49 additions and 49 deletions.
diff --git a/build-common.properties b/build-common.properties
@@ -4,7 +4,7 @@
 ## ${basedir} is a child of checker-framework/, e.g. checker-framework/checker
 
 # The Checker Framework version number
-build.version = 1.9.9
+build.version = 1.9.10
 
 # The location of the OpenJDK distribution to use;
 # must be a version that supports type annotations (JSR 308)

diff --git a/checker/examples/MavenExample/pom.xml b/checker/examples/MavenExample/pom.xml
@@ -29,23 +29,23 @@
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
-      <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+      <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker</artifactId>
-      <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+      <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>compiler</artifactId>
-      <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+      <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
     </dependency>
     <!-- The annotated JDK to use (change to jdk7 if using Java 7) -->
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>jdk8</artifactId>
-      <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+      <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/checker/manual/checker-framework-webpage.html b/checker/manual/checker-framework-webpage.html
@@ -34,9 +34,9 @@ <h1>The Checker Framework</h1>
 
 <ul>
   <li>
-    Download: <a href="current/checker-framework-1.9.9.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.9.zip<!-- /checker-framework-zip-version --></a>
+    Download: <a href="current/checker-framework-1.9.10.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.10.zip<!-- /checker-framework-zip-version --></a>
     version
-    <!-- checker-framework-version -->1.9.9, 2 Dec 2015<!-- /checker-framework-version -->
+    <!-- checker-framework-version -->1.9.10, 4 Jan 2016<!-- /checker-framework-version -->
     (includes source, platform-independent binary, tests, and documentation)<br/>
     Then, see the <a
     href="current/checker-framework-manual.html#installation"><b>installation
@@ -114,7 +114,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.zip">annotation-tools.zip</a> (<!-- afu-date -->02 Dec 2015<!-- /afu-date -->)
+          <li><a href="../annotation-file-utilities/annotation-tools.zip">annotation-tools.zip</a> (<!-- afu-date -->04 Jan 2016<!-- /afu-date -->)
           </li>
           <li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
           </li>
@@ -235,7 +235,7 @@ <h3 id="bugs">Bug reports</h3>
 <hr />
 
 <p>
-Last updated: <!-- checker-framework-date -->2 Dec 2015<!-- /checker-framework-date -->
+Last updated: <!-- checker-framework-date -->4 Jan 2016<!-- /checker-framework-date -->
 </p>
 
 </body>

diff --git a/checker/manual/external-tools.tex b/checker/manual/external-tools.tex
@@ -48,14 +48,14 @@ \section{Javac compiler\label{javac-installation}}
   \item
     Option 1:
     Add directory
-    \code{.../checker-framework-1.9.9/checker/bin} to your path, \emph{before} any other
+    \code{.../checker-framework-1.9.10/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-1.9.9
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.10
   export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
 \end{Verbatim}
     then log out and back in to ensure that the environment variable
@@ -80,15 +80,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-1.9.9
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.10
   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-1.9.9
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.10
   alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac -source 7 -target 7'
 \end{Verbatim}
 
@@ -114,11 +114,11 @@ \section{Javac compiler\label{javac-installation}}
 
 \begin{Verbatim}
   # Unix
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.9
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.10
   alias javacheck='java -jar $CHECKERFRAMEWORK/checker/dist/checker.jar'
 
   # Windows
-  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-1.9.9\
+  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-1.9.10\
   doskey javacheck=java -jar %CHECKERFRAMEWORK%\checker\dist\checker.jar $*
 \end{Verbatim}
 
@@ -140,7 +140,7 @@ \section{Javac compiler\label{javac-installation}}
 The output should be:
 
 \begin{Verbatim}
-  javac 1.8.0-jsr308-1.9.9
+  javac 1.8.0-jsr308-1.9.10
 \end{Verbatim}
 
 

diff --git a/checker/manual/introduction.tex b/checker/manual/introduction.tex
@@ -211,7 +211,7 @@ \section{Installation\label{installation}}
   %BEGIN LATEX
   \\
   %END LATEX
-  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-1.9.9.zip}
+  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-1.9.10.zip}
 
 \item
   Unzip it to create a \code{checker-framework} directory.

diff --git 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}{1.9.9}
-\newcommand{\ReleaseInfo}{1.9.9 (2 Dec 2015)}
+\newcommand{\ReleaseVersion}{1.9.10}
+\newcommand{\ReleaseInfo}{1.9.10 (4 Jan 2016)}
 \date{Version \ReleaseInfo{}}
 
 \begin{document}

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <build>
         <plugins>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
             <type>jar</type>
         </dependency>
     </dependencies>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>

diff --git 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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -31,14 +31,14 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->1.9.9<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->1.9.10<!-- /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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /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
@@ -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 -->1.9.9<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->1.9.10<!-- /checker-framework-version --></version>
 
     <scm>
         <url>https://github.com/typetools/checker-framework.git</url>

diff --git a/release/types.htaccess b/release/types.htaccess
@@ -17,9 +17,9 @@ Options +FollowSymlinks
 # Therefore, users should see the real file names.
 # With these links, "wget http://types.cs.washington.edu/checker-framework/current/checker-framework.zip"
 # produces a file checker-framework.zip which gives no indication of its version number.
-# RedirectMatch 302 /jsr308/current/jsr308-langtools.zip /jsr308/current/jsr308-langtools-1.9.8.zip
-# RedirectMatch 302 /annotation-file-utilities/annotation-tools.zip /annotation-file-utilities/current/annotation-tools-3.6.22.zip
-# RedirectMatch 302 /checker-framework/current/checker-framework.zip /checker-framework/current/checker-framework-1.9.8.zip
-# RedirectMatch 302 /dev/jsr308/current/jsr308-langtools.zip /dev/jsr308/current/jsr308-langtools-1.9.8.zip
-# RedirectMatch 302 /dev/annotation-file-utilities/annotation-tools.zip /dev/annotation-file-utilities/current/annotation-tools-3.6.22.zip
-# RedirectMatch 302 /dev/checker-framework/current/checker-framework.zip /dev/checker-framework/current/checker-framework-1.9.8.zip
+# RedirectMatch 302 /jsr308/current/jsr308-langtools.zip /jsr308/current/jsr308-langtools-1.9.10.zip
+# RedirectMatch 302 /annotation-file-utilities/annotation-tools.zip /annotation-file-utilities/current/annotation-tools-3.6.24.zip
+# RedirectMatch 302 /checker-framework/current/checker-framework.zip /checker-framework/current/checker-framework-1.9.10.zip
+# RedirectMatch 302 /dev/jsr308/current/jsr308-langtools.zip /dev/jsr308/current/jsr308-langtools-1.9.10.zip
+# RedirectMatch 302 /dev/annotation-file-utilities/annotation-tools.zip /dev/annotation-file-utilities/current/annotation-tools-3.6.24.zip
+# RedirectMatch 302 /dev/checker-framework/current/checker-framework.zip /dev/checker-framework/current/checker-framework-1.9.10.zip
diff --git 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-1.9.9
+javac 1.8.0-jsr308-1.9.10
 /home/mernst/research/types/checker-framework-REAL/tutorial/eclipse-projects/personalblog-demo/src/net/eyde/personalblog/service/PersonalBlogService.java:173: error: [argument.type.incompatible] incompatible types in argument.
                     "where post.category like '%" + category +
                                                              ^

diff --git a/tutorial/webpages/security-error-cmd.html b/tutorial/webpages/security-error-cmd.html
@@ -109,7 +109,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-1.9.9
+[jsr308.javac] javac 1.8.0-jsr308-1.9.10
 [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]                                                    ^
@@ -158,7 +158,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-1.9.9
+[jsr308.javac] javac 1.8.0-jsr308-1.9.10
 [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]                                                   ^
@@ -201,7 +201,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-1.9.9
+[jsr308.javac] javac 1.8.0-jsr308-1.9.10
 
 BUILD SUCCESSFUL
 Total time: 2 seconds