Skip to content

Commit

Permalink
new release 1.9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
jthaine committed Nov 10, 2015
1 parent 3958c33 commit 8cbb34d
Show file tree
Hide file tree
Showing 26 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion build-common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## This file is shared between all subprojects.

# The Checker Framework version number
build.version = 1.9.7
build.version = 1.9.8

# The location of the OpenJDK distribution to use;
# must be a version that supports type annotations (JSR 308)
Expand Down
8 changes: 4 additions & 4 deletions checker/examples/MavenExample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version><!-- checker-framework-version -->1.9.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /checker-framework-version --></version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<version><!-- checker-framework-version -->1.9.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /checker-framework-version --></version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>compiler</artifactId>
<version><!-- checker-framework-version -->1.9.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /checker-framework-version --></version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions checker/manual/checker-framework-webpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1>The Checker Framework</h1>
<li>
Download: <a href="current/checker-framework.zip">checker-framework.zip</a>
version
<!-- checker-framework-version -->1.9.7, 24 Oct 2015<!-- /checker-framework-version -->
<!-- checker-framework-version -->1.9.8, 9 Nov 2015<!-- /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
Expand Down Expand Up @@ -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 -->24 Oct 2015<!-- /afu-date -->)
<li><a href="../annotation-file-utilities/annotation-tools.zip">annotation-tools.zip</a> (<!-- afu-date -->09 Nov 2015<!-- /afu-date -->)
</li>
<li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
</li>
Expand Down Expand Up @@ -235,7 +235,7 @@ <h3 id="bugs">Bug reports</h3>
<hr />

<p>
Last updated: <!-- checker-framework-date -->24 Oct 2015<!-- /checker-framework-date -->
Last updated: <!-- checker-framework-date -->9 Nov 2015<!-- /checker-framework-date -->
</p>

</body>
Expand Down
14 changes: 7 additions & 7 deletions checker/manual/external-tools.tex
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ \section{Javac compiler\label{javac-installation}}
\item
Option 1:
Add directory
\code{.../checker-framework-1.9.7/checker/bin} to your path, \emph{before} any other
\code{.../checker-framework-1.9.8/checker/bin} to your path, \emph{before} any other
directory that contains a \<javac> executable. Now, whenever
you run \code{javac}, you will use the updated compiler. 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.7
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.8
export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
\end{Verbatim}
then log out and back in to ensure that the environment variable
Expand All @@ -76,15 +76,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.7
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.8
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.7
export CHECKERFRAMEWORK=${HOME}/checker-framework-1.9.8
alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac -source 7 -target 7'
\end{Verbatim}

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

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

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

\begin{Verbatim}
javac 1.8.0-jsr308-1.9.7
javac 1.8.0-jsr308-1.9.8
\end{Verbatim}


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.7}
\newcommand{\ReleaseInfo}{1.9.7 (24 Oct 2015)}
\newcommand{\ReleaseVersion}{1.9.8}
\newcommand{\ReleaseInfo}{1.9.8 (9 Nov 2015)}
\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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /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.7<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->1.9.8<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
6 changes: 3 additions & 3 deletions release/types.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ Redirect /checker-framework/current/checkers-manual.html /checker-framework/curr
# We should add a similar rule for every other type system.
Redirect /checker-framework/current/api/checkers/nullness/quals/ /checker-framework/current/api/org/checkerframework/checker/nullness/qual/

RedirectMatch 302 /jsr308/current/jsr308-langtools.zip /jsr308/current/jsr308-langtools-1.9.7.zip
RedirectMatch 302 /annotation-file-utilities/annotation-tools.zip /annotation-file-utilities/releases/annotation-tools-3.6.21.zip
RedirectMatch 302 /checker-framework/current/checker-framework.zip /checker-framework/current/checker-framework-1.9.7.zip
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/releases/annotation-tools-3.6.22.zip
RedirectMatch 302 /checker-framework/current/checker-framework.zip /checker-framework/current/checker-framework-1.9.8.zip
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.7
javac 1.8.0-jsr308-1.9.8
/Users/smillst/src/jsr308/checker-framework/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,
^
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 @@ -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.7
[jsr308.javac] javac 1.8.0-jsr308-1.9.8
[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 @@ -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.7
[jsr308.javac] javac 1.8.0-jsr308-1.9.8
[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 @@ -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.7
[jsr308.javac] javac 1.8.0-jsr308-1.9.8

BUILD SUCCESSFUL
Total time: 2 seconds
Expand Down

0 comments on commit 8cbb34d

Please sign in to comment.