Skip to content

Commit

Permalink
new release 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
smillst committed Apr 2, 2018
1 parent cb96cbd commit 0907c7e
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion build-common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
checkerframework=${basedir}/..

# The Checker Framework version number
build.version = 2.4.0
build.version = 2.5.0

# 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 docs/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="checker-framework-2.4.0.zip"><!-- checker-framework-zip-version -->checker-framework-2.4.0.zip<!-- /checker-framework-zip-version --></a>
(<!-- checker-framework-date -->1 Mar 2018<!-- /checker-framework-date -->);
Download: <a href="checker-framework-2.5.0.zip"><!-- checker-framework-zip-version -->checker-framework-2.5.0.zip<!-- /checker-framework-zip-version --></a>
(<!-- checker-framework-date -->2 Apr 2018<!-- /checker-framework-date -->);
includes source, platform-independent binary, tests, and documentation.<br/>
Then, see the <a
href="manual/#installation"><b>installation
Expand Down Expand Up @@ -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.51.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.51.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->01 Mar 2018<!-- /afu-date -->)
<li><a href="annotation-file-utilities/annotation-tools-3.6.52.zip"><!-- annotation-tools-zip-version -->annotation-tools-3.6.52.zip<!-- /annotation-tools-zip-version --></a> (<!-- afu-date -->02 Apr 2018<!-- /afu-date -->)
</li>
<li><a href="https://github.com/typetools/annotation-tools/">source code repository</a>
</li>
Expand Down Expand Up @@ -213,7 +213,7 @@ <h3 id="bugs">Bug reports</h3>
<hr />

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

</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ configurations {
}

dependencies {
ext.checkerFrameworkVersion = '2.4.0'
ext.checkerFrameworkVersion = '2.5.0'
ext.jdkVersion = 'jdk8'
checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"
checkerFrameworkJavac "org.checkerframework:compiler:${checkerFrameworkVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ configurations {
}

dependencies {
ext.checkerFrameworkVersion = '2.4.0'
ext.checkerFrameworkVersion = '2.5.0'
ext.jdkVersion = 'jdk8'
checkerFrameworkAnnotatedJDK "org.checkerframework:${jdkVersion}:${checkerFrameworkVersion}"

Expand Down
2 changes: 1 addition & 1 deletion docs/examples/MavenExample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- These properties will be set by the Maven Dependency plugin -->
<annotatedJdk>${org.checkerframework:jdk8:jar}</annotatedJdk>
<checkerFrameworkVersion><!-- checker-framework-version -->2.4.0<!-- /checker-framework-version --></checkerFrameworkVersion>
<checkerFrameworkVersion><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></checkerFrameworkVersion>
</properties>

<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions docs/manual/external-tools.tex
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ \section{Android Studio 3.0 and the Android Gradle Plugin 3.0\label{android-grad
\begin{Verbatim}
dependencies {
... existing dependencies...
ext.checkerFrameworkVersion = '2.4.0'
ext.checkerFrameworkVersion = '2.5.0'
implementation "org.checkerframework:checker-qual:${checkerFrameworkVersion}"
annotationProcessor "org.checkerframework:checker:${checkerFrameworkVersion}"
checkerFrameworkAnnotatedJDK "org.checkerframework:jdk8:${checkerFrameworkVersion}"
Expand Down Expand Up @@ -405,14 +405,14 @@ \section{Javac compiler\label{javac-installation}}
\item
Option 1:
Add directory
\code{.../checker-framework-2.4.0/checker/bin} to your path, \emph{before} any other
\code{.../checker-framework-2.5.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_profile| or \verb|~/.bashrc|) file:
\begin{Verbatim}
export CHECKERFRAMEWORK=${HOME}/checker-framework-2.4.0
export CHECKERFRAMEWORK=${HOME}/checker-framework-2.5.0
export PATH=${CHECKERFRAMEWORK}/checker/bin:${PATH}
\end{Verbatim}
then log out and back in to ensure that the environment variable
Expand All @@ -436,7 +436,7 @@ \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.4.0
export CHECKERFRAMEWORK=${HOME}/checker-framework-2.5.0
alias javacheck='$CHECKERFRAMEWORK/checker/bin/javac'
\end{Verbatim}
Expand All @@ -455,11 +455,11 @@ \section{Javac compiler\label{javac-installation}}
\begin{Verbatim}
# Unix
export CHECKERFRAMEWORK=${HOME}/checker-framework-2.4.0
export CHECKERFRAMEWORK=${HOME}/checker-framework-2.5.0
alias javacheck='java -jar "$CHECKERFRAMEWORK/checker/dist/checker.jar"'
# Windows
set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.4.0\
set CHECKERFRAMEWORK = C:\Program Files\checker-framework-2.5.0\
doskey javacheck=java -jar "%CHECKERFRAMEWORK%\checker\dist\checker.jar" $*
\end{Verbatim}
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/introduction.tex
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ \section{Installation\label{installation}}
%BEGIN LATEX
\\
%END LATEX
\url{https://checkerframework.org/checker-framework-2.4.0.zip}
\url{https://checkerframework.org/checker-framework-2.5.0.zip}

\item
Unzip it to create a \code{checker-framework} directory.
Expand Down
4 changes: 2 additions & 2 deletions docs/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{https://checkerframework.org/}}
\newcommand{\ReleaseVersion}{2.4.0}
\newcommand{\ReleaseInfo}{2.4.0 (1 Mar 2018)}
\newcommand{\ReleaseVersion}{2.5.0}
\newcommand{\ReleaseInfo}{2.5.0 (2 Apr 2018)}
\date{Version \ReleaseInfo{}}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion docs/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-2.4.0
javac 1.8.0-jsr308-2.5.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");
^
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorial/webpages/security-error-cmd.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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.4.0
[jsr308.javac] javac 1.8.0-jsr308-2.5.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] ^
Expand Down Expand Up @@ -153,7 +153,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.4.0
[jsr308.javac] javac 1.8.0-jsr308-2.5.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] ^
Expand Down Expand Up @@ -196,7 +196,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.4.0
[jsr308.javac] javac 1.8.0-jsr308-2.5.0

BUILD SUCCESSFUL
Total time: 2 seconds
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
4 changes: 2 additions & 2 deletions maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>javacutil</artifactId>
<version><!-- checker-framework-version -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<distributionManagement>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/release/checkerQualReleasePom.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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
6 changes: 3 additions & 3 deletions maven-artifacts/release/dataflowReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version><!-- checker-framework-version -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>javacutil</artifactId>
<version><!-- checker-framework-version -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
4 changes: 2 additions & 2 deletions maven-artifacts/release/javacutilReleasePom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version><!-- checker-framework-version -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down
2 changes: 1 addition & 1 deletion maven-artifacts/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 -->2.4.0<!-- /checker-framework-version --></version>
<version><!-- checker-framework-version -->2.5.0<!-- /checker-framework-version --></version>

<scm>
<url>https://github.com/typetools/checker-framework.git</url>
Expand Down

0 comments on commit 0907c7e

Please sign in to comment.