Skip to content

Commit

Permalink
new release 1.9.13
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Apr 1, 2016
1 parent df3e39a commit 97199de
Show file tree
Hide file tree
Showing 28 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion build-common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.12
build.version = 1.9.13

# The location of the OpenJDK distribution to use;
# must be a version that supports type annotations (JSR 308)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ configurations {
}

dependencies {
ext.checkerFrameworkVersion = '1.9.12'
ext.checkerFrameworkVersion = '1.9.13'
ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"

Expand Down
2 changes: 1 addition & 1 deletion checker/examples/MavenExample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></checkerFrameworkVersion>
<checkerFrameworkVersion><!-- checker-framework-version -->1.9.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>-->
Expand Down
2 changes: 1 addition & 1 deletion checker/manual/checker-framework-quick-start.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.12.zip<!-- /checker-framework-zip-version --></a>.<br/>
<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/>
</p>

<p>
Expand Down
8 changes: 4 additions & 4 deletions checker/manual/checker-framework-webpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ <h1>The Checker Framework</h1>

<ul>
<li>
Download: <a href="current/checker-framework-1.9.12.zip"><!-- checker-framework-zip-version -->checker-framework-1.9.12.zip<!-- /checker-framework-zip-version --></a>
(<!-- checker-framework-date -->2 Mar 2016<!-- /checker-framework-date -->);
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 -->);
includes source, platform-independent binary, tests, and documentation.<br/>
Then, see the <a
href="current/checker-framework-manual.html#installation"><b>installation
Expand Down Expand Up @@ -93,7 +93,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.26.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.26.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->02 Mar 2016<!-- /afu-date -->)
<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>
<li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
</li>
Expand Down Expand Up @@ -214,7 +214,7 @@ <h3 id="bugs">Bug reports</h3>
<hr />

<p>
Last updated: <!-- checker-framework-date -->2 Mar 2016<!-- /checker-framework-date -->
Last updated: <!-- checker-framework-date -->1 Apr 2016<!-- /checker-framework-date -->
</p>

</body>
Expand Down
16 changes: 8 additions & 8 deletions checker/manual/external-tools.tex
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ \section{Javac compiler\label{javac-installation}}
\item
Option 1:
Add directory
\code{.../checker-framework-1.9.12/checker/bin} to your path, \emph{before} any other
\code{.../checker-framework-1.9.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-1.9.12
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.13
export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
\end{Verbatim}
then log out and back in to ensure that the environment variable
Expand All @@ -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.12
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.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-1.9.12
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.13
alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac -source 7 -target 7'
\end{Verbatim}

Expand All @@ -114,11 +114,11 @@ \section{Javac compiler\label{javac-installation}}

\begin{Verbatim}
# Unix
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.12
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.13
alias javacheck='java -jar $CHECKERFRAMEWORK/checker/dist/checker.jar'
# Windows
set CHECKERFRAMEWORK = C:\Program Files\checker-framework-1.9.12\
set CHECKERFRAMEWORK = C:\Program Files\checker-framework-1.9.13\
doskey javacheck=java -jar %CHECKERFRAMEWORK%\checker\dist\checker.jar $*
\end{Verbatim}

Expand All @@ -140,7 +140,7 @@ \section{Javac compiler\label{javac-installation}}
The output should be:

\begin{Verbatim}
javac 1.8.0-jsr308-1.9.12
javac 1.8.0-jsr308-1.9.13
\end{Verbatim}


Expand Down Expand Up @@ -513,7 +513,7 @@ \section{Gradle\label{gradle}}
\begin{Verbatim}
dependencies {
... existing dependencies...
ext.checkerFrameworkVersion = '1.9.12'
ext.checkerFrameworkVersion = '1.9.13'
ext.jdkVersion = JavaVersion.current().isJava7() ? 'jdk7' : 'jdk8'
checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
Expand Down
2 changes: 1 addition & 1 deletion checker/manual/introduction.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.zip}
\url{http://types.cs.washington.edu/checker-framework/current/checker-framework-1.9.13.zip}

\item
Unzip it to create a \code{checker-framework} directory.
Expand Down
4 changes: 2 additions & 2 deletions checker/manual/manual.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

\title{The Checker Framework Manual: \\ Custom pluggable types for Java}
\author{\url{http://checkerframework.org/}}
\newcommand{\ReleaseVersion}{1.9.12}
\newcommand{\ReleaseInfo}{1.9.12 (2 Mar 2016)}
\newcommand{\ReleaseVersion}{1.9.13}
\newcommand{\ReleaseInfo}{1.9.13 (1 Apr 2016)}
\date{Version \ReleaseInfo{}}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/checkerCompatQualPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/checkerPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/checkerQualPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/compilerPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin/poms/dataflowPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>javacutil</artifactId>
<version><!-- checker-framework-version -->1.9.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/javacutilPom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/jdk7Pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/poms/jdk8Pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/checkerCompatQualReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/checkerQualReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/checkerReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/compilerReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://bitbucket.org/typetools/jsr308-langtools/</url>
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin/release/dataflowReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>javacutil</artifactId>
<version><!-- checker-framework-version -->1.9.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.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 -->1.9.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/javacutilReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/jdk7ReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/jdk8ReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/release/mavenPluginReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.13<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion tutorial/tests/testdemo/check-tainting.0.expected
Original file line number Diff line number Diff line change
Expand Up @@ -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.12
javac 1.8.0-jsr308-1.9.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");
^
Expand Down
6 changes: 3 additions & 3 deletions tutorial/webpages/security-error-cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.12
[jsr308.javac] javac 1.8.0-jsr308-1.9.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] ^
Expand Down Expand Up @@ -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.12
[jsr308.javac] javac 1.8.0-jsr308-1.9.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] ^
Expand Down Expand Up @@ -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.12
[jsr308.javac] javac 1.8.0-jsr308-1.9.13

BUILD SUCCESSFUL
Total time: 2 seconds
Expand Down

0 comments on commit 97199de

Please sign in to comment.