new release 2.0.0

typetools · May 3, 2016 · 73838f9 · 73838f9
1 parent b10c1be
commit 73838f9
Show file tree

Hide file tree

Showing 28 changed files with 44 additions and 44 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.13
+build.version = 2.0.0
 
 # 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
@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    ext.checkerFrameworkVersion = '1.9.13'
+    ext.checkerFrameworkVersion = '2.0.0'
     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
@@ -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 -->1.9.13<!-- /checker-framework-version --></checkerFrameworkVersion>
+    <checkerFrameworkVersion><!-- checker-framework-version -->2.0.0<!-- /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
@@ -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-1.9.13.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.13.zip<!-- /checker-framework-zip-version --></a>.<br/>
+<a href="current/checker-framework-2.0.0.zip"><!-- checker-framework-zip-version -->checker-framework-2.0.0.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
@@ -33,8 +33,8 @@ <h1>The Checker Framework</h1>
 
 <ul>
   <li>
-    Download: <a href="current/checker-framework-1.9.13.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.13.zip<!-- /checker-framework-zip-version --></a>
-    (<!-- checker-framework-date -->1 Apr 2016<!-- /checker-framework-date -->);
+    Download: <a href="current/checker-framework-2.0.0.zip"><!-- checker-framework-zip-version -->checker-framework-2.0.0.zip<!-- /checker-framework-zip-version --></a>
+    (<!-- checker-framework-date -->2 May 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.27.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.27.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->01 Apr 2016<!-- /afu-date -->)
+          <li><a href="../annotation-file-utilities/current/annotation-tools-3.6.28.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.28.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->02 May 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 -->1 Apr 2016<!-- /checker-framework-date -->
+Last updated: <!-- checker-framework-date -->2 May 2016<!-- /checker-framework-date -->
 </p>
 
 </body>

diff --git a/checker/manual/external-tools.tex b/checker/manual/external-tools.tex
@@ -46,14 +46,14 @@ \section{Javac compiler\label{javac-installation}}
   \item
     Option 1:
     Add directory
-    \code{.../checker-framework-1.9.13/checker/bin} to your path, \emph{before} any other
+    \code{.../checker-framework-2.0.0/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.13
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.0.0
   export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
 \end{Verbatim}
     then log out and back in to ensure that the environment variable
@@ -78,15 +78,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.13
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.0.0
   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.13
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.0.0
   alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac -source 7 -target 7'
 \end{Verbatim}
 
@@ -112,11 +112,11 @@ \section{Javac compiler\label{javac-installation}}
 
 \begin{Verbatim}
   # Unix
-  export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.13
+  export CHECKERFRAMEWORK=${HOME}/checker-framework-2.0.0
   alias javacheck='java -jar $CHECKERFRAMEWORK/checker/dist/checker.jar'
 
   # Windows
-  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-1.9.13\
+  set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.0.0\
   doskey javacheck=java -jar %CHECKERFRAMEWORK%\checker\dist\checker.jar $*
 \end{Verbatim}
 
@@ -138,7 +138,7 @@ \section{Javac compiler\label{javac-installation}}
 The output should be:
 
 \begin{Verbatim}
-  javac 1.8.0-jsr308-1.9.13
+  javac 1.8.0-jsr308-2.0.0
 \end{Verbatim}
 
 
@@ -511,7 +511,7 @@ \section{Gradle\label{gradle}}
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '1.9.13'
+    ext.checkerFrameworkVersion = '2.0.0'
     ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
     checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
 
@@ -593,7 +593,7 @@ \section{Android plugin for Gradle\label{android-gradle}}
 \begin{Verbatim}
 dependencies {
     ... existing dependencies...
-    ext.checkerFrameworkVersion = '1.9.13'
+    ext.checkerFrameworkVersion = '2.0.0'
     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
@@ -204,7 +204,7 @@ \section{Installation\label{installation}}
   %BEGIN LATEX
   \\
   %END LATEX
-  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-1.9.13.zip}
+  \url{http://types.cs.washington.edu/checker-framework/current/checker-framework-2.0.0.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.13}
-\newcommand{\ReleaseInfo}{1.9.13 (1 Apr 2016)}
+\newcommand{\ReleaseVersion}{2.0.0}
+\newcommand{\ReleaseInfo}{2.0.0 (2 May 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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /checker-framework-version --></version>
 
     <distributionManagement>
         <repository>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>javacutil</artifactId>
-            <version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+            <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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.13<!-- /checker-framework-version --></version>
+    <version><!-- checker-framework-version -->2.0.0<!-- /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
@@ -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.13
+javac 1.8.0-jsr308-2.0.0
 /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
@@ -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-1.9.13
+[jsr308.javac] javac 1.8.0-jsr308-2.0.0
 [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-1.9.13
+[jsr308.javac] javac 1.8.0-jsr308-2.0.0
 [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-1.9.13
+[jsr308.javac] javac 1.8.0-jsr308-2.0.0
 
 BUILD SUCCESSFUL
 Total time: 2 seconds