From f588b964d4443581b92daab4eea3859934e35c42 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Thu, 19 Jan 2017 16:16:22 -0800 Subject: [PATCH] Update Checker Framework URLs to https://checkerframework.org/ --- README.txt | 4 +-- changelog.txt | 13 +++---- checker/bin/README | 4 +-- checker/build.xml | 12 +++---- checker/jdk/annotate-jdk.sh | 4 +-- .../annotation/concurrent/GuardedBy.java | 2 +- .../src/net/jcip/annotations/GuardedBy.java | 2 +- .../checker/interning/InterningVisitor.java | 2 +- .../checker/lock/qual/EnsuresLockHeld.java | 2 +- .../checker/lock/qual/EnsuresLockHeldIf.java | 2 +- .../checker/lock/qual/GuardedBy.java | 4 +-- .../checker/lock/qual/Holding.java | 4 +-- .../nullness/AbstractNullnessChecker.java | 2 +- .../checker/regex/RegexUtil.java | 2 +- checker/tests/nullness-extra/shorthand/README | 2 +- docs/checker-framework-quick-start.html | 22 ++++++------ docs/manual/annotating-libraries.tex | 2 +- docs/manual/creating-a-checker.tex | 8 ++--- docs/manual/external-checkers.tex | 4 +-- docs/manual/external-tools.tex | 2 +- docs/manual/faq.tex | 4 +-- docs/manual/inference.tex | 4 +-- docs/manual/introduction.tex | 12 +++---- docs/manual/manual.tex | 4 +-- docs/manual/troubleshooting.tex | 4 +-- docs/tutorial/README | 6 ++-- docs/tutorial/README-sourcefiles.txt | 2 +- docs/tutorial/index.html | 24 ++++++------- .../webpages/encryption-checker-cmd.html | 16 ++++----- .../webpages/encryption-checker-eclipse.html | 16 ++++----- docs/tutorial/webpages/get-started-cmd.html | 14 ++++---- .../webpages/get-started-eclipse.html | 12 +++---- .../tutorial/webpages/security-error-cmd.html | 16 ++++----- .../webpages/security-error-eclipse.html | 16 ++++----- docs/tutorial/webpages/user-input-cmd.html | 18 +++++----- .../tutorial/webpages/user-input-eclipse.html | 16 ++++----- eclipse/README-developers.html | 10 +++--- .../feature.xml | 6 ++-- .../manual/index.html | 34 +++++++++---------- framework/build.xml | 2 +- .../util/element/ElementAnnotationUtil.java | 2 +- .../javacutil/dist/ManualTaglet.java | 2 +- maven-plugin/README-developers | 6 ++-- maven-plugin/pom.xml | 2 +- maven-plugin/poms/checkerCompatQualPom.xml | 2 +- maven-plugin/poms/checkerPom.xml | 2 +- maven-plugin/poms/checkerQualPom.xml | 2 +- maven-plugin/poms/compilerPom.xml | 2 +- maven-plugin/poms/dataflowPom.xml | 2 +- maven-plugin/poms/javacutilPom.xml | 2 +- maven-plugin/poms/jdk7Pom.xml | 2 +- maven-plugin/poms/jdk8Pom.xml | 2 +- maven-plugin/release/README-compiler | 2 +- maven-plugin/release/README-jdk | 4 +-- maven-plugin/release/README-plugin | 4 +-- .../release/checkerCompatQualReleasePom.xml | 2 +- .../release/checkerQualReleasePom.xml | 2 +- maven-plugin/release/checkerReleasePom.xml | 2 +- maven-plugin/release/compilerReleasePom.xml | 2 +- maven-plugin/release/dataflowReleasePom.xml | 2 +- maven-plugin/release/javacutilReleasePom.xml | 2 +- maven-plugin/release/jdk7ReleasePom.xml | 2 +- maven-plugin/release/jdk8ReleasePom.xml | 2 +- .../release/mavenPluginReleasePom.xml | 4 +-- release/README-release-process.html | 22 ++++++------ release/release_build.py | 4 +-- release/release_push.py | 18 +++++----- release/release_vars.py | 4 +-- release/sanity_checks.py | 2 +- release/test-checker-framework.sh | 2 +- release/types.htaccess | 2 +- 71 files changed, 224 insertions(+), 223 deletions(-) diff --git a/README.txt b/README.txt index b44d3cd23c0..5564408c5a4 100644 --- a/README.txt +++ b/README.txt @@ -7,5 +7,5 @@ It appears in this repository (after you run `make -C docs/manual`): Prebuilt versions also appear on the web: - * HTML: http://checker-framework.com/manual/ - * PDF: http://checker-framework.com/manual/checker-framework-manual.pdf + * HTML: https://checkerframework.org/manual/ + * PDF: https://checkerframework.org/manual/checker-framework-manual.pdf diff --git a/changelog.txt b/changelog.txt index 3c32eac594e..573042dbfc4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,8 @@ Version 2.1.8, 1 February 2017 -The Checker Framework webpage has moved to http://checker-framework.org/. -Old URLs should redirect to the new one, but please update your links. +The Checker Framework webpage has moved to https://checkerframework.org/. +Old URLs should redirect to the new one, but please update your links +and let us know if any old links are broken rather than redirecting. The documentation has been reorganized in the Checker Framework repository. The manual, tutorial, and webpages now appear under checker-framework/docs/. @@ -247,7 +248,7 @@ Documentation: For type-system developers: * The org.checkerframework.framework.qual.TypeQualifier{s} annotations are now deprecated. To indicate which annotations a checker supports, see - http://checker-framework.com/manual/#creating-indicating-supported-annotations . + https://checkerframework.org/manual/#creating-indicating-supported-annotations . Support for TypeQualifier{s} will be removed in the next release. * Renamed org.checkerframework.framework.qual.Default{,Qualifier}ForUnannotatedCode to @@ -840,7 +841,7 @@ Adapt to underlying jsr308-langtools changes. JDK 7 is now required. The Checker Framework does not build or run on JDK 6. Documentation: - A new tutorial is available at http://checker-framework.com/tutorial/ + A new tutorial is available at https://checkerframework.org/tutorial/ ---------------------------------------------------------------------- Version 1.5.0, 14 Jan 2013 @@ -1378,7 +1379,7 @@ Eclipse support: different repository (http://code.google.com/a/eclipselabs.org/p/checker-plugin/) but a user obtains it from the same URL as before: - http://checker-framework.com/eclipse/ + https://checkerframework.org/eclipse/ Property Key Checker: The property key checker allows multiple resource bundles and the @@ -2086,7 +2087,7 @@ Manual 8 Annotating libraries 9 How to create a new checker plugin Javadoc for the Checker Framework is included in its distribution and is - available online at http://checker-framework.com/api/ . + available online at https://checkerframework.org/api/ . ---------------------------------------------------------------------- Version 0.6.4, 9 June 2008 diff --git a/checker/bin/README b/checker/bin/README index feacb02b8e6..8047826afe7 100644 --- a/checker/bin/README +++ b/checker/bin/README @@ -21,7 +21,7 @@ checker.jar - Contains all the Checker Framework classes including the framework itself, all built-in checkers, and the annotations found in checker-qual.jar. javac.jar - Contains the Type Annotations Compiler -(see http://checker-framework.com/README-jsr308.html) +(see https://checkerframework.org/README-jsr308.html) jdk.jar - Each jdk.jar, where is a major java version (e.g., 6, 7, 8, or 9), contains a version of the OpenJDK annotated with Checker Framework @@ -33,4 +33,4 @@ all versions of jdk.jar by running "ant all.jdks.jar". maven-plugin/poms - this directory contains Maven POM files for each of the jars that is found in the dist directory. These POMs are used to deploy each jar as a Maven artifact to the -http://checker-framework.com/m2-repo/ maven repository. +https://checkerframework.org/m2-repo/ maven repository. diff --git a/checker/build.xml b/checker/build.xml index 22b885f356e..b7dfe3b503d 100644 --- a/checker/build.xml +++ b/checker/build.xml @@ -383,7 +383,7 @@ - + @@ -464,14 +464,14 @@ - + - + @@ -568,7 +568,7 @@ - + @@ -576,7 +576,7 @@ basedir="${checker-compat-qual-sources-tmp}"> - + @@ -1531,7 +1531,7 @@ So, use our own archived version. description="Create the instrumented jdkX.jar using the JDK specified by JAVA_HOME"> - + diff --git a/checker/jdk/annotate-jdk.sh b/checker/jdk/annotate-jdk.sh index 66c23b28335..c43b66a490b 100755 --- a/checker/jdk/annotate-jdk.sh +++ b/checker/jdk/annotate-jdk.sh @@ -157,13 +157,13 @@ stripDefs() { COMMENTS=0 # non-zero to enable if [ ${COMMENTS} -ne 0 ] ; then # download patch -[ -r annotated-jdk-comment-patch.jaif ] || wget http://checker-framework.com/annotated-jdk-comment-patch.jaif || exit $? +[ -r annotated-jdk-comment-patch.jaif ] || wget https://checkerframework.org/annotated-jdk-comment-patch.jaif || exit $? (cd "${JDK}" && patch -p1 < annotated-jdk-comment-patch.jaif) fi # download annotation definitions [ -r annotation-defs.jaif ]\ - || wget http://checker-framework.com/annotation-defs.jaif\ + || wget https://checkerframework.org/annotation-defs.jaif\ || exit $? diff --git a/checker/src/javax/annotation/concurrent/GuardedBy.java b/checker/src/javax/annotation/concurrent/GuardedBy.java index 92d50b98f34..26e5143bb44 100644 --- a/checker/src/javax/annotation/concurrent/GuardedBy.java +++ b/checker/src/javax/annotation/concurrent/GuardedBy.java @@ -24,7 +24,7 @@ /** * The Java expressions that need to be held. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] value() default {}; diff --git a/checker/src/net/jcip/annotations/GuardedBy.java b/checker/src/net/jcip/annotations/GuardedBy.java index f0bd581d206..f540abc74df 100644 --- a/checker/src/net/jcip/annotations/GuardedBy.java +++ b/checker/src/net/jcip/annotations/GuardedBy.java @@ -24,7 +24,7 @@ /** * The Java expressions that need to be held. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] value() default {}; diff --git a/checker/src/org/checkerframework/checker/interning/InterningVisitor.java b/checker/src/org/checkerframework/checker/interning/InterningVisitor.java index bf19f8246cb..3aac841f54b 100644 --- a/checker/src/org/checkerframework/checker/interning/InterningVisitor.java +++ b/checker/src/org/checkerframework/checker/interning/InterningVisitor.java @@ -69,7 +69,7 @@ public InterningVisitor(BaseTypeChecker checker) { /** * @return true if interning should be verified for the input expression. By default, all * classes are checked for interning unless {@code -Acheckclass} is specified. - * @see What the Interning + * @see What the Interning * Checker checks */ private boolean shouldCheckExpression(ExpressionTree tree) { diff --git a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java b/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java index 8711a618960..a86dbec299c 100644 --- a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java +++ b/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java @@ -26,7 +26,7 @@ /** * The Java expressions whose values are held after the method terminates successfully. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] value(); diff --git a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java b/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java index d1f119b7ad6..994481e16c1 100644 --- a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java +++ b/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java @@ -27,7 +27,7 @@ /** * Java expressions whose values are held after the method returns the given result. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] expression(); diff --git a/checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java b/checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java index fc7cf170466..f17a2829def 100644 --- a/checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java +++ b/checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java @@ -33,7 +33,7 @@ *

{@code @GuardedBy({})} is the default type qualifier. * *

The argument is a string or set of strings that indicates the expression(s) that must be held, - * using the syntax of + * using the syntax of * Java expressions described in the manual. The expressions evaluate to an intrinsic (built-in, * synchronization) monitor or an explicit {@link java.util.concurrent.locks.Lock}. The expression * {@code ""} is also permitted; the type {@code @GuardedBy("") Object o} indicates that @@ -73,7 +73,7 @@ /** * The Java value expressions that need to be held. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] value() default {}; diff --git a/checker/src/org/checkerframework/checker/lock/qual/Holding.java b/checker/src/org/checkerframework/checker/lock/qual/Holding.java index b48accb1b9e..55685d28e1a 100644 --- a/checker/src/org/checkerframework/checker/lock/qual/Holding.java +++ b/checker/src/org/checkerframework/checker/lock/qual/Holding.java @@ -12,7 +12,7 @@ * is invoked. * *

The argument is a string or set of strings that indicates the expression(s) that must be held, - * using the syntax of + * using the syntax of * Java expressions described in the manual. The expressions evaluate to an intrinsic (built-in, * synchronization) monitor, or an explicit {@link java.util.concurrent.locks.Lock}. * @@ -28,7 +28,7 @@ /** * The Java expressions that need to be held. * - * @see Syntax of + * @see Syntax of * Java expressions */ String[] value(); diff --git a/checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java b/checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java index 89dde3fff3a..91bec965956 100644 --- a/checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java +++ b/checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java @@ -21,7 +21,7 @@ // which is allowed by default. // Forbidding is sound and will eventually be the default. // Allowing is unsound, as described in Section 3.3.4, "Nullness and arrays": - // http://checker-framework.com/manual/#nullness-arrays + // https://checkerframework.org/manual/#nullness-arrays // It is the default temporarily, until we improve the analysis to reduce false positives or we // learn what advice to give programmers about avoid false positive warnings. // See issue #986: https://github.com/typetools/checker-framework/issues/986 diff --git a/checker/src/org/checkerframework/checker/regex/RegexUtil.java b/checker/src/org/checkerframework/checker/regex/RegexUtil.java index 3883a557a1d..68c3adfd350 100644 --- a/checker/src/org/checkerframework/checker/regex/RegexUtil.java +++ b/checker/src/org/checkerframework/checker/regex/RegexUtil.java @@ -17,7 +17,7 @@ * expression. * *

For an example of intended use, see section Testing whether a string is a + * href="https://checkerframework.org/manual/#regexutil-methods">Testing whether a string is a * regular expression in the Checker Framework manual. * *

Runtime Dependency: Using this class introduces a runtime dependency. This means that diff --git a/checker/tests/nullness-extra/shorthand/README b/checker/tests/nullness-extra/shorthand/README index 44007ca1e49..a406bbc63ce 100644 --- a/checker/tests/nullness-extra/shorthand/README +++ b/checker/tests/nullness-extra/shorthand/README @@ -1,5 +1,5 @@ This is a test of the "checker shorthand" feature. -See: http://checker-framework.com/manual/#shorthand-for-checkers +See: https://checkerframework.org/manual/#shorthand-for-checkers This test is not Nullness specific. We have placed this test in this location because it has two preconditions: diff --git a/docs/checker-framework-quick-start.html b/docs/checker-framework-quick-start.html index b24a64daf13..d16553773fc 100644 --- a/docs/checker-framework-quick-start.html +++ b/docs/checker-framework-quick-start.html @@ -15,12 +15,12 @@

Checker Framework quick start guide

A pluggable type-checker, or “checker” for short, prevents certain run-time errors. For example, it can prove that your code never suffers a -NullPointerException. Choose which checker you want to run from the list +NullPointerException. Choose which checker you want to run from the list of checkers.

-To install the Checker Framework, download and unzip +To install the Checker Framework, download and unzip the Checker Framework distribution: checker-framework-2.1.7.zip.
Or, the @@ -29,7 +29,7 @@

Checker Framework quick start guide

-To run a checker, supply the -processor command-line argument: +To run a checker, supply the -processor command-line argument: 

@@ -38,7 +38,7 @@ 
Checker Framework quick start guide

 
 

 You write annotations in your code.  Then, the checker
-verifies
+verifies
 two facts: (1) the annotations you wrote are correct (they are consistent with your source code), and (2) your program will not suffer certain exceptions or errors at run time.
 

 
@@ -56,7 +56,7 @@ 
Checker Framework quick start guide

 "", but does not include null.
 

 You write a type annotation right before a use of a type (on the same
-line), as in:
+line), as in:
 
   @NonNull String s;
   List<@Positive Integer> l;
@@ -81,14 +81,14 @@ 
Checker Framework quick start guide

 
 

 For the most part, you only need to write annotations on method signatures and fields.
-Most annotations within method bodies are inferred for you automatically.
+Most annotations within method bodies are inferred for you automatically.
 Furthermore, each checker applies certain defaults to further reduce your
 annotation burden; for example, using the
-Nullness
+Nullness
   Checker, you do not need to write @NonNull, only
   @Nullable which appears less often.
 See the manual for more
-tips
+tips
   about writing annotations.
 

 
@@ -96,12 +96,12 @@ 
Checker Framework quick start guide

 To learn more, you can read:
 

 
 
diff --git a/docs/manual/annotating-libraries.tex b/docs/manual/annotating-libraries.tex
index 31ee64ba5c4..6e3543dbb52 100644
--- a/docs/manual/annotating-libraries.tex
+++ b/docs/manual/annotating-libraries.tex
@@ -92,7 +92,7 @@ \section{Creating an annotated library\label{annotated-libraries-creating}}
   % library.  You would express the annotations textually, typically as an
   % annotation index file, and
   % then insert them in the library by using the Annotation File Utilities
-  % (\myurl{http://checker-framework.com/annotation-file-utilities/}).
+  % (\myurl{https://checkerframework.org/annotation-file-utilities/}).
   % See the Annotation File Utilities documentation for full details.
 
   With this compilation approach, the syntax of the library annotations is
diff --git a/docs/manual/creating-a-checker.tex b/docs/manual/creating-a-checker.tex
index 56ad480f448..3404b8480c1 100644
--- a/docs/manual/creating-a-checker.tex
+++ b/docs/manual/creating-a-checker.tex
@@ -63,7 +63,7 @@ \chapter{How to create a new checker\label{creating-a-checker}}
 of those.
 The Javadoc documentation of the framework and the checkers is in the
 distribution and is also available online at
-\myurl{http://checker-framework.com/api/}.
+\myurl{https://checkerframework.org/api/}.
 
 If you write a new checker and wish to advertise it to the world, let us
 know so we can mention it in the Checker Framework Manual, link to
@@ -104,10 +104,10 @@ \section{How checkers build on the Checker Framework\label{creating-tool-relatio
 Other \par tools
 \\ \hline
 \multicolumn{6}{|p{6\bw}|}{\centering Checker Framework \par (enables creation of pluggable type-checkers)} &
-\multicolumn{2}{p{3\bw}|}{\centering \href{http://checker-framework.com/annotation-file-utilities/}{Annotation File Utilities} \par (\code{.java} $\leftrightarrow$ \code{.class} files)}
+\multicolumn{2}{p{3\bw}|}{\centering \href{https://checkerframework.org/annotation-file-utilities/}{Annotation File Utilities} \par (\code{.java} $\leftrightarrow$ \code{.class} files)}
 \\ \hline
 \multicolumn{8}{|p{8.5\bw}|}{\centering
-  \href{http://checker-framework.com/jsr308/}{Type Annotations} syntax
+  \href{https://checkerframework.org/jsr308/}{Type Annotations} syntax
   and classfile format (``JSR 308'') \par \centering (no built-in semantics)} \\ \hline
 \end{tabular}
 \end{center}
@@ -899,7 +899,7 @@ \section{Dataflow: enhancing flow-sensitive type qualifier inference\label{creat
 The Checker Framework's type refinement is implemented with a dataflow algorithm
 which can be customized to enhance the built-in type refinement. The next
 sections detail dataflow customization.  It would also be helpful to read the
-\href{http://checker-framework.com/manual/checker-framework-dataflow-manual.pdf}
+\href{https://checkerframework.org/manual/checker-framework-dataflow-manual.pdf}
 {Dataflow Manual}, which gives a more in-depth description of the Checker
 Framework's dataflow framework.
 
diff --git a/docs/manual/external-checkers.tex b/docs/manual/external-checkers.tex
index fb40ef7fdca..8a1983f964a 100644
--- a/docs/manual/external-checkers.tex
+++ b/docs/manual/external-checkers.tex
@@ -106,7 +106,7 @@ \section{SPARTA information flow type-checker for Android\label{sparta-checker}}
 an app store.  SPARTA provides an information-flow type-checker that is
 customized to Android but can also be applied to other domains.
 The SPARTA toolset is available from
-\url{http://checker-framework.com/sparta/}.
+\url{https://checkerframework.org/sparta/}.
 The paper
 \href{http://homes.cs.washington.edu/~mernst/pubs/infoflow-ccs2014.pdf}{``Collaborative
     verification of information flow for a high-assurance app store''}
@@ -120,7 +120,7 @@ \section{Immutability checkers:  IGJ, OIGJ, and Javari\label{igj-checker}\label{
 constraints.  Type-checkers for all three type systems were distributed
 with the Checker Framework through release 1.9.13 (dated 1 April 2016).
 If you wish to use them, install
-\href{http://checker-framework.com/releases/1.9.13/}{Checker
+\href{https://checkerframework.org/releases/1.9.13/}{Checker
   Framework version 1.9.13}.
 
 They were removed from the main distribution on June 1, 2016 because the
diff --git a/docs/manual/external-tools.tex b/docs/manual/external-tools.tex
index d287a7bdfae..ac26b92d296 100644
--- a/docs/manual/external-tools.tex
+++ b/docs/manual/external-tools.tex
@@ -759,7 +759,7 @@ \subsection{Eclipse plugin for the Checker Framework\label{eclipse-plugin}}
 
 The Checker framework Eclipse Plugin enables the use of the Checker
 Framework within the Eclipse IDE\@.
-Its website (\myurl{http://checker-framework.com/eclipse/}).
+Its website (\myurl{https://checkerframework.org/eclipse/}).
 The website contains instructions for installing and using the plugin.
 % The plugin has been substantially improved through a Google Summer of Code 2010 project
 % and supports all checkers that are distributed with the Checker Framework.
diff --git a/docs/manual/faq.tex b/docs/manual/faq.tex
index 1bbeebbd792..01b6aa64c13 100644
--- a/docs/manual/faq.tex
+++ b/docs/manual/faq.tex
@@ -620,7 +620,7 @@ \subsection{How can I do run-time monitoring of properties that were not statica
 \section{Syntax of type annotations\label{faq-syntax-section}}
 
 There is also a separate FAQ for the type annotations syntax
-(\url{http://checker-framework.com/jsr308/jsr308-faq.html}).
+(\url{https://checkerframework.org/jsr308/jsr308-faq.html}).
 
 
 \subsection{What is a ``receiver''?\label{faq-receiver}}
@@ -1302,7 +1302,7 @@ \subsection{Is the Checker Framework an official part of Java?\label{faq-checker
 The Checker Framework is not an official part of Java.
 The Checker Framework relies on
 type annotations, which are part of Java 8.  See the
-\href{http://checker-framework.com/jsr308/jsr308-faq.html#pluggable-type-checking-in-java}{Type
+\href{https://checkerframework.org/jsr308/jsr308-faq.html#pluggable-type-checking-in-java}{Type
   Annotations (JSR 308) FAQ} for more details.
 
 
diff --git a/docs/manual/inference.tex b/docs/manual/inference.tex
index 9c149963ec0..b17c98356ed 100644
--- a/docs/manual/inference.tex
+++ b/docs/manual/inference.tex
@@ -145,7 +145,7 @@ \subsection{Whole-program inference\label{whole-program-inference}}
 
 \begin{enumerate}
 \item Optional: Command-line arguments to
-  \href{http://checker-framework.com/annotation-file-utilities/#insert-annotations-to-source}{\}.
+  \href{https://checkerframework.org/annotation-file-utilities/#insert-annotations-to-source}{\}.
 \item Processor's name.
 \item Target program's classpath.  This argument is required; pass "" if it
   is empty.
@@ -294,7 +294,7 @@ \subsubsection{How whole-program inference works\label{how-whole-program-inferen
 relative to where you executed the javac command.
 
 You can use the Annotation File Utilities
-(\myurl{http://checker-framework.com/annotation-file-utilities/}) to
+(\myurl{https://checkerframework.org/annotation-file-utilities/}) to
 insert these refined types in your program.  Then, the next time that you
 run type-checking, there are likely to be fewer type-checking warnings.
 
diff --git a/docs/manual/introduction.tex b/docs/manual/introduction.tex
index 6e084190698..c19419ffa42 100644
--- a/docs/manual/introduction.tex
+++ b/docs/manual/introduction.tex
@@ -184,7 +184,7 @@ \section{Installation\label{installation}}
 This section describes how to install the Checker Framework.
 (If you wish to use the Checker Framework from Eclipse, see the Checker
 Framework Eclipse Plugin webpage instead:
-\url{http://checker-framework.com/eclipse/}.)
+\url{https://checkerframework.org/eclipse/}.)
 (If you wish to try the Checker Framework without installing it, use the
 \href{http://eisop.uwaterloo.ca/live/}{Checker Framework Live Demo} webpage.)
 \end{sloppypar}
@@ -208,7 +208,7 @@ \section{Installation\label{installation}}
   %BEGIN LATEX
   \\
   %END LATEX
-  \url{http://checker-framework.com/checker-framework-2.1.7.zip}
+  \url{https://checkerframework.org/checker-framework-2.1.7.zip}
 
 \item
   Unzip it to create a \code{checker-framework} directory.
@@ -235,7 +235,7 @@ \section{Installation\label{installation}}
 That's all there is to it!  Now you are ready to start using the checkers.
 
 We recommend that you work through the
-\ahreforurl{http://checker-framework.com/tutorial/}{Checker
+\ahreforurl{https://checkerframework.org/tutorial/}{Checker
 Framework tutorial}, which walks you through how to use the Checker
 Framework in Eclipse or on
 the command line.
@@ -251,7 +251,7 @@ \section{Installation\label{installation}}
 \section{Example use:  detecting a null pointer bug\label{example-use}}
 
 This section gives a very simple example of running the Checker Framework.
-There is also a \ahreforurl{http://checker-framework.com/tutorial/}{tutorial}
+There is also a \ahreforurl{https://checkerframework.org/tutorial/}{tutorial}
 that gives more extensive instructions for using the Checker Framework in
 Eclipse or on the command line,
 and a
@@ -438,7 +438,7 @@ \chapter{Using a checker\label{using-a-checker}}
 
 
 Finally, there is a
-\ahreforurl{http://checker-framework.com/tutorial/}{tutorial}
+\ahreforurl{https://checkerframework.org/tutorial/}{tutorial}
 that walks you through using the Checker Framework in Eclipse or on the
 command line, and a separate
 \ahreforurl{https://github.com/glts/safer-spring-petclinic/wiki}{Nullness Checker tutorial}.
@@ -452,7 +452,7 @@ \section{Writing annotations\label{writing-annotations}}
 
 The syntax of type annotations in Java is specified by
 the Java Language Specification (Java SE 8 edition).
-% \href{http://checker-framework.com/jsr308/}{JSR 308}~\cite{JSR308-2008-09-12}.
+% \href{https://checkerframework.org/jsr308/}{JSR 308}~\cite{JSR308-2008-09-12}.
 
 Java 5 defines declaration annotations such as \<@Deprecated>, which apply
 to a class, method, or field, but do not apply to the method's return type
diff --git a/docs/manual/manual.tex b/docs/manual/manual.tex
index 42ba6c0df86..eeec895f83c 100644
--- a/docs/manual/manual.tex
+++ b/docs/manual/manual.tex
@@ -3,7 +3,7 @@
 \input{manual-style.tex}
 
 \title{The Checker Framework Manual: \\ Custom pluggable types for Java}
-\author{\url{http://checker-framework.com/}}
+\author{\url{https://checkerframework.org/}}
 \newcommand{\ReleaseVersion}{2.1.7}
 \newcommand{\ReleaseInfo}{2.1.7 (3 Jan 2017)}
 \date{Version \ReleaseInfo{}}
@@ -26,7 +26,7 @@
 Section~\refwithpageparen{installation}
 describes how to \textbf{install and use} pluggable type-checkers.
 
-%HEVEA This manual is also available in \href{http://checker-framework.com/manual/checker-framework-manual.pdf}{PDF}.
+%HEVEA This manual is also available in \href{https://checkerframework.org/manual/checker-framework-manual.pdf}{PDF}.
 
 %HEVEA \setcounter{tocdepth}{1}
 % Not supported by Hevea, so don't bother: \dominitoc
diff --git a/docs/manual/troubleshooting.tex b/docs/manual/troubleshooting.tex
index 88319450a86..5b647e7fbc2 100644
--- a/docs/manual/troubleshooting.tex
+++ b/docs/manual/troubleshooting.tex
@@ -1099,7 +1099,7 @@ \section{Comparison to other tools\label{other-tools}}
 For a more detailed comparison to Eclipse, see Section~\ref{faq-eclipse}.
 
 Also see the
-\href{http://checker-framework.com/jsr308/}{JSR 308}~\cite{JSR308-2008-09-12}
+\href{https://checkerframework.org/jsr308/}{JSR 308}~\cite{JSR308-2008-09-12}
 documentation for another discussion of related work.
 
 
@@ -1108,7 +1108,7 @@ \section{Credits and changelog\label{credits}}
 Differences from previous versions of the checkers and framework can be found
 in the \code{changelog.txt} file.  This file is included in the
 Checker Framework distribution and is also available on the web at
-\myurl{http://checker-framework.com/changelog.txt}.
+\myurl{https://checkerframework.org/changelog.txt}.
 
 Developers who have contributed code to the Checker Framework include
 %
diff --git a/docs/tutorial/README b/docs/tutorial/README
index 21706d44a4b..02072b4e668 100644
--- a/docs/tutorial/README
+++ b/docs/tutorial/README
@@ -12,8 +12,8 @@ If you want to present the tutorial when Internet is not available, try this:
 
 mkdir cf-tutorial
 cd cf-tutorial
-wget -r -k -np http://checker-framework.com/tutorial/
-wget -r -k -np http://checker-framework.com/eclipse/
-wget -r -k -np http://checker-framework.com/manual/
+wget -r -k -np https://checkerframework.org/tutorial/
+wget -r -k -np https://checkerframework.org/eclipse/
+wget -r -k -np https://checkerframework.org/manual/
 cd ..
 zip -r cf-tutorial cf-tutorial
diff --git a/docs/tutorial/README-sourcefiles.txt b/docs/tutorial/README-sourcefiles.txt
index be346236898..080d211ad75 100644
--- a/docs/tutorial/README-sourcefiles.txt
+++ b/docs/tutorial/README-sourcefiles.txt
@@ -1,3 +1,3 @@
 This zipfile contains source code corresponding to the
 Checker Framework tutorial:
-http://checker-framework.com/tutorial/
+https://checkerframework.org/tutorial/
diff --git a/docs/tutorial/index.html b/docs/tutorial/index.html
index cddb5011930..6aa0f71c5f8 100644
--- a/docs/tutorial/index.html
+++ b/docs/tutorial/index.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
 
 
 
@@ -25,10 +25,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -78,7 +78,7 @@ 
Introduction

       Framework either via its Eclipse plugin or from the command line. Both
       tutorials use the same examples. The Checker
       Framework can also be used with other tools
+      "https://checkerframework.org/manual/#external-tools">tools
       such as Maven or InteliJ IDEA, and you could follow
       the command-line version of the tutorial using one of those tools.

     

@@ -92,7 +92,7 @@ 
Using the Checker Framework Eclipse plugin

     

       
    
         
  1. Install
+        "https://checkerframework.org/eclipse/">Install
         the Eclipse Plugin and then return to this page.
    2. 
 
         
  2. Download and unzip the
@@ -123,10 +123,10 @@ 
    Using the Checker Framework from the command line
    
     
    
       
      
         
    1. 
+        "https://checkerframework.org/manual/#installation">
         Install the Checker Framework and then return to this page.
      
         As described in the installation instructions,
-        set
+        set
         the alias
         javacheck to the Checker Framework compiler.
      2. 
 
@@ -158,10 +158,10 @@ 
      Resources
      
     
      
       
      
     
    
-  
Checker Framework logo
+  Checker Framework logo
 
   

@@ -76,7 +76,7 @@ 
Writing an Encryption Checker
     section.

 
     
Although the Checker Framework ships with 
+    "https://checkerframework.org/manual/#introduction">
     many checkers, you may wish to write your own checker because
     there are other run-time problems you wish to prevent.  If you do
     not wish to write a new type-checker, feel free to skip this section
@@ -220,7 +220,7 @@ 
8. Learn more about writing your own checker

 
     
For further explanations, see the Checker Framework manual, chapter
     How
+    "https://checkerframework.org/manual/#writing-a-checker">How
     to create a new checker.

   

 
diff --git a/docs/tutorial/webpages/encryption-checker-eclipse.html b/docs/tutorial/webpages/encryption-checker-eclipse.html
index 596dd14fbab..c028e566b49 100644
--- a/docs/tutorial/webpages/encryption-checker-eclipse.html
+++ b/docs/tutorial/webpages/encryption-checker-eclipse.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
   
 
 
@@ -25,10 +25,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -76,7 +76,7 @@ 
Writing an Encryption Checker
     section.

 
     
Although the Checker Framework ships with 
+    "https://checkerframework.org/manual/#introduction">
     many checkers, you may wish to write your own checker because
     there are other run-time problems you wish to prevent.  If you do
     not wish to write a new type-checker, feel free to skip this section
@@ -253,7 +253,7 @@ 
8. Learn more about writing your own checker

 
     
For further explanations, see the Checker Framework manual, chapter
     How
+    "https://checkerframework.org/manual/#writing-a-checker">How
     to create a new checker.

   

 
diff --git a/docs/tutorial/webpages/get-started-cmd.html b/docs/tutorial/webpages/get-started-cmd.html
index 810d4e8ff78..0c4a6ade12d 100644
--- a/docs/tutorial/webpages/get-started-cmd.html
+++ b/docs/tutorial/webpages/get-started-cmd.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
 
 
 
@@ -25,10 +25,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -123,7 +123,7 @@ 
2. Run the Nullness Checker

         

         (Note: You should have already made
         javacheck 
+        "https://checkerframework.org/manual/#installation">
         an alias to the Checker Framework compiler.)

         
 $ javacheck -processor org.checkerframework.checker.nullness.NullnessChecker NullnessExample.java
diff --git a/docs/tutorial/webpages/get-started-eclipse.html b/docs/tutorial/webpages/get-started-eclipse.html
index c3ff65fa3d5..6de0c9eabf1 100644
--- a/docs/tutorial/webpages/get-started-eclipse.html
+++ b/docs/tutorial/webpages/get-started-eclipse.html
@@ -11,7 +11,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
 
 
 
@@ -24,10 +24,10 @@
         
       

     
-  Checker Framework logo
+  Checker Framework logo
 
   

diff --git a/docs/tutorial/webpages/security-error-cmd.html b/docs/tutorial/webpages/security-error-cmd.html
index 860bc8867ac..dc384d9accb 100644
--- a/docs/tutorial/webpages/security-error-cmd.html
+++ b/docs/tutorial/webpages/security-error-cmd.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
   
 
 
@@ -25,10 +25,10 @@
         
       

     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -96,7 +96,7 @@ 
1. Run the Tainting Checker — 1 error found

       
Run the buildfile:
       
 (The Ant buildfile
       makes use of the 
+      "https://checkerframework.org/manual/#ant-task">
       Checker Framework support for Ant.)

       
 $ cd personalblog-demo
@@ -215,7 +215,7 @@ 
5. Re-run the Tainting Checker — no errors

 
       
For a complete discussion of how to use the Tainting Checker,
       please read the 
+      "https://checkerframework.org/manual/#tainting-checker">
       Tainting Checker chapter in the Checker Framework manual.

     

   
diff --git a/docs/tutorial/webpages/security-error-eclipse.html b/docs/tutorial/webpages/security-error-eclipse.html
index cfd31658e38..36080fa97c6 100644
--- a/docs/tutorial/webpages/security-error-eclipse.html
+++ b/docs/tutorial/webpages/security-error-eclipse.html
@@ -11,7 +11,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
   
 
 
@@ -24,10 +24,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -114,7 +114,7 @@ 
Expected Warnings

         
This example has already been annotated to prevent the SQL
         injections. It does this by annotating
         PersonalBlogService.executeQuery(String) with
-        
+        
         @Untainted and providing a method,
         ReadAction.validate(String) , to validate the user
         input.

@@ -185,7 +185,7 @@ 
5. Re-run the Tainting Checker — no errors

 
       
For a complete discussion of how to use the Tainting Checker,
       please read the 
+      "https://checkerframework.org/manual/#tainting-checker">
       Tainting Checker chapter in the Checker Framework manual.

     

   
diff --git a/docs/tutorial/webpages/user-input-cmd.html b/docs/tutorial/webpages/user-input-cmd.html
index 84362a4415c..a3f547372c6 100644
--- a/docs/tutorial/webpages/user-input-cmd.html
+++ b/docs/tutorial/webpages/user-input-cmd.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
   
 
 
@@ -25,10 +25,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -179,7 +179,7 @@ 
4. Fix the Code

         
The right way to fix the problems is for the code to issue a
         user-friendly message at run time.  It should verify the user
         input using the
-        RegexUtil.isRegex(String, int) method.
+        RegexUtil.isRegex(String, int) method.
         If the string is not a valid regular
         expression, it should print an error message and halt.
         If it is a valid regular expression, perform as before.
@@ -226,12 +226,12 @@ 
6. Run the Example

 
         
(If this issues an error

         
Exception in thread "main" java.lang.UnsupportedClassVersionError: RegexExample : Unsupported major.minor version 52.0

-        
, then change the javacheck
+        
, then change the javacheck
         alias to pass the -source 7 -target 7 command-line
         arguments and rerun the javacheck command.)

 
         
For a full discussion of the Regex Checker, please see the 
+        "https://checkerframework.org/manual/#regex-checker">
         Regex Checker chapter of the Checker Framework manual.

       

     
diff --git a/docs/tutorial/webpages/user-input-eclipse.html b/docs/tutorial/webpages/user-input-eclipse.html
index 8c56a6932ac..c9f221c3d80 100644
--- a/docs/tutorial/webpages/user-input-eclipse.html
+++ b/docs/tutorial/webpages/user-input-eclipse.html
@@ -12,7 +12,7 @@
 
   
   
+  "https://checkerframework.org/favicon-checkerframework.png">
   
 
 
@@ -25,10 +25,10 @@
         
       
     
-  Checker Framework logo
+  Checker Framework logo
 
   

@@ -184,7 +184,7 @@ 
4. Fix the Code

         
The right way to fix the problems is for the code to issue a
         user-friendly message at run time.  It should verify the user
         input using the
-        RegexUtil.isRegex(String, int) method.
+        RegexUtil.isRegex(String, int) method.
         If the string is not a valid regular
         expression, it should print an error message and halt.
         If it is a valid regular expression, perform as before.
@@ -228,7 +228,7 @@ 
6. Run the Example

 

 
         
For a full discussion of the Regex Checker, please see the 
+        "https://checkerframework.org/manual/#regex-checker">
         Regex Checker chapter of the Checker Framework manual.

       
     
diff --git a/eclipse/README-developers.html b/eclipse/README-developers.html
index 11e3bd409d8..94952537d6a 100644
--- a/eclipse/README-developers.html
+++ b/eclipse/README-developers.html
@@ -110,7 +110,7 @@ 
Pre-build Checklist

             2.
             Import the Checker Framework project in Eclipse

                 The Checker Framework manual has instructions on building the Checker Framework from source:

-                http://checker-framework.com/manual/#build-source
+                https://checkerframework.org/manual/#build-source
                 

                 You do not need to build the framework but you do need the Checker Framework source.  Use a local clone
                 of the Checker Framework and import that project into a workspace.
@@ -591,7 +591,7 @@ 
Releasing the Plugin

 

     
Testing

     
To test your plugin, you should install it locally.  You can find installation instructions at:

-       http://checker-framework.com/eclipse/

+       https://checkerframework.org/eclipse/

        However, when installing the plugin, rather than using the above URL for the location of the
        plugin, you should press the "Local" button and select the directory of your
        checker-framework-update-site project.  The IDE will treat that directory as an update site
@@ -609,8 +609,8 @@ 
Testing

         
     
     
When performing a release, you should test the "Getting Started" and "Validating User Input" guides from
-    the checker framework tutorial: 
-        http://checker-framework.com/tutorial/
+    the checker framework tutorial: 
+        https://checkerframework.org/tutorial/
 
     

         In the next section we discuss a typical workflow for testing the Eclipse plugin.  This workflow
@@ -696,7 +696,7 @@ 
Debugging

     

         Note: Since the Checker Framework process is run in another process from Eclipse,
         setting a breakpoint in Checker Framework code will NOT cause Eclipse to pause at this code.  One
-        way of debugging this other process is to pass debug arguments (see 23.8.5)
+        way of debugging this other process is to pass debug arguments (see 23.8.5)
         in the Eclipse->Checker Framework preferences.  This will cause the Checker Framework to pause and wait
         for a debugger before Executing.  You can then hook another debugger to this process to debug it separately
         from the process used to debug the Eclipse plugin.
diff --git a/eclipse/checker-framework-eclipse-feature/feature.xml b/eclipse/checker-framework-eclipse-feature/feature.xml
index ceceace930c..eed0eb13a29 100644
--- a/eclipse/checker-framework-eclipse-feature/feature.xml
+++ b/eclipse/checker-framework-eclipse-feature/feature.xml
@@ -5,7 +5,7 @@
       version="2.1.7"
       provider-name="Checker Framework Development Team">
 
-   
+   
       The Checker Framework plugin makes it easier to run a pluggable
       type-checker.  A pluggable type-checker finds bugs at compile time that
       would ordinarily manifest at run time.  If the pluggable type-checker
@@ -13,7 +13,7 @@
       occur at run time.
    
 
-   
+   
       Copyright Checker Framework Development Team
    
 
@@ -371,7 +371,7 @@ as provided by Sun in the LICENSE file that accompanied this code."
    
 
    
-      
+      
    
 
    
diff --git a/eclipse/checker-framework-eclipse-update-site/manual/index.html b/eclipse/checker-framework-eclipse-update-site/manual/index.html
index b05889ba25f..bc1e8407ce8 100644
--- a/eclipse/checker-framework-eclipse-update-site/manual/index.html
+++ b/eclipse/checker-framework-eclipse-update-site/manual/index.html
@@ -8,7 +8,7 @@
     
 
     
-    
+    
 
 
 
@@ -20,8 +20,8 @@
         

             

 

 
-Checker Framework logo
+Checker Framework logo
 
 

     
Checker Framework Eclipse Plugin: Pluggable type-checking for Java

@@ -44,11 +44,11 @@ 
Introduction

 
     

         

-            The Checker Framework is a pluggable type-checking
+            The Checker Framework is a pluggable type-checking
             system for Java:  It warns you, at compile time, about errors in your programs, beyond those that Java's built-in
             type-checker does.
             This document tells you how to get started using the
-            Checker Framework
+            Checker Framework
             in Eclipse.
         

     

@@ -72,7 +72,7 @@ 
Instructions

                 
  • Enter the following:
                     
-                        
+                        
    
                         
    Name:     Checker Framework
    Location: http://checker-framework.com/eclipse
    Location: https://checkerframework.org/eclipse
    
                     
    
                     Click OK.
                 
    • 
@@ -88,11 +88,11 @@ 
    Instructions
    
 
         
    
         Note: You may want to add 
-            
+            
                 checker-qual.jar
              to your classpath for each Eclipse project you wish to check.
             It provides the annotations used by the
-            Checker Framework for
+            Checker Framework for
             its built-in type checkers.  
     To add the checker-qual.jar to your Eclipse project, download the
             jar from the above link.  Then right click the project you wish to check and select
             Properties -> Java Build Path -> Libraries -> Add External Jars.  Select checker-qual.jar from
@@ -110,7 +110,7 @@ 
    Using the Plugin
    
         
    Running a Built-In Checker
    
         
    
             Here is how to run one or more
-            built-in type checkers
+            built-in type checkers
             from the Checker Framework:
         
    
         
    
@@ -142,7 +142,7 @@ 
    Running a Built-In Checker
    
             (Checker Framework ‑> Clear Checker Markers).
         
    
 
-        
    Warning! When using the Subtyping Checker,
+        
    Warning! When using the Subtyping Checker,
             you must provide the -Aquals argument or an error will be reported.  Follow the instructions in the
             Additional Compiler Params section to
             add the -Aquals argument.
@@ -153,7 +153,7 @@ 
    Running a Built-In Checker
    
         
    Running a Custom Checker
    
         
    
             The Checker Framework
-            also allows you to write a custom checker that enforces rules of your own.
+            also allows you to write a custom checker that enforces rules of your own.
             
    
             To run a custom checker that you have written, do the following:
         
    
@@ -247,12 +247,12 @@ 
    Other Preferences
    
                 
    
                     Processor/build options
    
                     The Checker Framework
-                    supports command-line options to its compiler (usually prefaced by -A).  One
+                    supports command-line options to its compiler (usually prefaced by -A).  One
                     way to use these options is enabling the various options under the label "Processor/build options".
                     If you are using the
                     Checker Framework
                     on a project for which other developers are not, you may be specifically interested in its
-                    backward compatibility features, such as annotations in comments and
+                    backward compatibility features, such as annotations in comments and
                     implicit import statement.  If you check the box next to the text "Use implicit imports for annotation classes"
                     then, for built-in checkers, all of the appropriate annotations will be imported implicitly.
                 
    
@@ -276,7 +276,7 @@ 
    Other Preferences
    
             text-field will first be split on white space and then added (without further manipulation) to
             the command line that runs the Checker Framework compiler.  Please make sure any options added here
             are well-formed javac options or
-            Checker Framework
+            Checker Framework
             options.  If they are malformed you can check the "Errors" window for any error messages or
             exceptions thrown by the compiler/plugin.
         
    
@@ -291,9 +291,9 @@ 
    Troubleshooting and Support
    
         
    
             To get support for either the Checker Framework or this plugin please
             first consult the
-            Checker Framework Manual,
+            Checker Framework Manual,
             specifically the chapter
-            
+            
                 "Troubleshooting and getting help"
             .
             If you find a bug, please report it at
diff --git a/framework/build.xml b/framework/build.xml
index f44a24a0d6e..e0482f18791 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -623,7 +623,7 @@
     
       
       
       TypeAnnotationPositions have bound indices when they represent an upper bound on a
      * TypeVariable. The index 0 ALWAYS refers to the superclass type. If that supertype is implied
diff --git a/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java b/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java
index eb830d363f7..01f35485e53 100644
--- a/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java
+++ b/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java
@@ -76,7 +76,7 @@ private String formatLink(String[] parts) {
             text = parts[1];
         }
         return String.format(
-                "%s", anchor, text);
+                "%s", anchor, text);
     }
 
     /**
diff --git a/maven-plugin/README-developers b/maven-plugin/README-developers
index b5584d1f8b2..db89d93f2f4 100644
--- a/maven-plugin/README-developers
+++ b/maven-plugin/README-developers
@@ -4,10 +4,10 @@ This document is intended for people who want to use a custom version of
 the Checker Framework together with Maven, or who wish to work on the Maven
 plugin itself.  If you just wish to use the Checker Framework Maven plugin
 then you should follow the directions in the Checker Framework manual (see
-http://checker-framework.com/manual/#maven-plugin).
+https://checkerframework.org/manual/#maven-plugin).
 
 Ordinarily, the Maven plugin loads artifacts such as the Checker Framework
-from the repository http://checker-framework.com/m2-repo .  You may wish
+from the repository https://checkerframework.org/m2-repo .  You may wish
 to load your own version of the artifacts.
  * If you have your own modified version of the Checker Framework (say, it
    adds a new type-checker or fixes a bug), then follow the instructions for
@@ -38,7 +38,7 @@ The artifact names are:
 The version number is specified by the checkerFrameworkVersion element in your
 pom.xml or, if the checkerFrameworkVersion element is missing, is the version of
 your Maven plugin.  See
-http://checker-framework.com/manual/#maven.
+https://checkerframework.org/manual/#maven.
 
 
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index cb6bcc043b1..8c66176833e 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -67,7 +67,7 @@
     
         
             checker-releases
-            http://checker-framework.com/m2-repo
+            https://checkerframework.org/m2-repo
         
     
 
diff --git a/maven-plugin/poms/checkerCompatQualPom.xml b/maven-plugin/poms/checkerCompatQualPom.xml
index 5a2e1087ec0..410ad11b8d3 100644
--- a/maven-plugin/poms/checkerCompatQualPom.xml
+++ b/maven-plugin/poms/checkerCompatQualPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/checkerPom.xml b/maven-plugin/poms/checkerPom.xml
index eec18e70ce6..a7cf8d9c0c0 100644
--- a/maven-plugin/poms/checkerPom.xml
+++ b/maven-plugin/poms/checkerPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/checkerQualPom.xml b/maven-plugin/poms/checkerQualPom.xml
index 7826e743336..49b05d74c67 100644
--- a/maven-plugin/poms/checkerQualPom.xml
+++ b/maven-plugin/poms/checkerQualPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/compilerPom.xml b/maven-plugin/poms/compilerPom.xml
index 8511160737a..26fc9798371 100644
--- a/maven-plugin/poms/compilerPom.xml
+++ b/maven-plugin/poms/compilerPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/dataflowPom.xml b/maven-plugin/poms/dataflowPom.xml
index f24c847c8ce..e0f382463c9 100644
--- a/maven-plugin/poms/dataflowPom.xml
+++ b/maven-plugin/poms/dataflowPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/javacutilPom.xml b/maven-plugin/poms/javacutilPom.xml
index ff4bf83a5c1..bc16678c87e 100644
--- a/maven-plugin/poms/javacutilPom.xml
+++ b/maven-plugin/poms/javacutilPom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/jdk7Pom.xml b/maven-plugin/poms/jdk7Pom.xml
index 054a74b7825..9fe6d590cd6 100644
--- a/maven-plugin/poms/jdk7Pom.xml
+++ b/maven-plugin/poms/jdk7Pom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/poms/jdk8Pom.xml b/maven-plugin/poms/jdk8Pom.xml
index 453e94d226c..58e1160c45b 100644
--- a/maven-plugin/poms/jdk8Pom.xml
+++ b/maven-plugin/poms/jdk8Pom.xml
@@ -14,7 +14,7 @@
     
         
             checker-releases
-            http://checker-framework.com/dev/m2-repo
+            https://checkerframework.org/dev/m2-repo
         
     
 
diff --git a/maven-plugin/release/README-compiler b/maven-plugin/release/README-compiler
index 4ac0d6ef920..7693ee173ed 100644
--- a/maven-plugin/release/README-compiler
+++ b/maven-plugin/release/README-compiler
@@ -1,7 +1,7 @@
 This jar is a stand-in for either source/javadoc for the
 jsr308-langtools compiler.
 For more information please visit:
-http://checker-framework.com/jsr308/
+https://checkerframework.org/jsr308/
 
 For source code visit:
 https://bitbucket.org/typetools/jsr308-langtools
diff --git a/maven-plugin/release/README-jdk b/maven-plugin/release/README-jdk
index 5db4e1b5639..c1885b39c3f 100644
--- a/maven-plugin/release/README-jdk
+++ b/maven-plugin/release/README-jdk
@@ -4,7 +4,7 @@ JDKs contain source code annotations used in type checking by
 the Checker Framework.
 
 For Checker Framework information visit:
-http://checker-framework.com/
+https://checkerframework.org/
 
 For information on annotated JDKs visit:
-http://checker-framework.com/manual/#annotating-libraries
+https://checkerframework.org/manual/#annotating-libraries
diff --git a/maven-plugin/release/README-plugin b/maven-plugin/release/README-plugin
index 7786022c86b..80c2137eb25 100644
--- a/maven-plugin/release/README-plugin
+++ b/maven-plugin/release/README-plugin
@@ -2,7 +2,7 @@ This jar is a stand in for either javadoc for Maven plugin
 of the Checker Framework
 
 For Checker Framework information visit:
-http://checker-framework.com/
+https://checkerframework.org/
 
 For information on the Maven plugin:
-http://checker-framework.com/manual/#maven-plugin
+https://checkerframework.org/manual/#maven-plugin
diff --git a/maven-plugin/release/checkerCompatQualReleasePom.xml b/maven-plugin/release/checkerCompatQualReleasePom.xml
index 2fb8cf4fb56..cea874fe28e 100644
--- a/maven-plugin/release/checkerCompatQualReleasePom.xml
+++ b/maven-plugin/release/checkerCompatQualReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Checker Qual
-    http://checker-framework.com
+    https://checkerframework.org
     
         Checker Qual is the set of annotations (qualifiers) and supporting classes
         used by the Checker Framework to type check Java source code.  Please
diff --git a/maven-plugin/release/checkerQualReleasePom.xml b/maven-plugin/release/checkerQualReleasePom.xml
index 950b8e9ecf8..080256add2d 100644
--- a/maven-plugin/release/checkerQualReleasePom.xml
+++ b/maven-plugin/release/checkerQualReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Checker Qual
-    http://checker-framework.com
+    https://checkerframework.org
     
         Checker Qual is the set of annotations (qualifiers) and supporting classes
         used by the Checker Framework to type check Java source code.  Please
diff --git a/maven-plugin/release/checkerReleasePom.xml b/maven-plugin/release/checkerReleasePom.xml
index fff4cc5b071..841d8a65710 100644
--- a/maven-plugin/release/checkerReleasePom.xml
+++ b/maven-plugin/release/checkerReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Checker Framework
-    http://checker-framework.com
+    https://checkerframework.org
     
         The Checker Framework enhances Java's type system to
         make it more powerful and useful. This lets software developers
diff --git a/maven-plugin/release/compilerReleasePom.xml b/maven-plugin/release/compilerReleasePom.xml
index 4c8fa715879..d07a836a5e0 100644
--- a/maven-plugin/release/compilerReleasePom.xml
+++ b/maven-plugin/release/compilerReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Type Annotations Compiler
-    http://checker-framework.com/jsr308/
+    https://checkerframework.org/jsr308/
     
         The Type Annotations Compiler is a fully backwards compatible customization
         of the Open JDK javac compiler with additional support for type annotations.
diff --git a/maven-plugin/release/dataflowReleasePom.xml b/maven-plugin/release/dataflowReleasePom.xml
index 1c3ddb5f07a..2105e9f1471 100644
--- a/maven-plugin/release/dataflowReleasePom.xml
+++ b/maven-plugin/release/dataflowReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Dataflow
-    http://checker-framework.com
+    https://checkerframework.org
     
         Dataflow is a dataflow framework based on the javac compiler.
     
diff --git a/maven-plugin/release/javacutilReleasePom.xml b/maven-plugin/release/javacutilReleasePom.xml
index 0aa51aea6e7..603444664c8 100644
--- a/maven-plugin/release/javacutilReleasePom.xml
+++ b/maven-plugin/release/javacutilReleasePom.xml
@@ -5,7 +5,7 @@
     jar
 
     Javacutil
-    http://checker-framework.com
+    https://checkerframework.org
     
         Javacutil is a collection of utility classes for the javac compiler.
     
diff --git a/maven-plugin/release/jdk7ReleasePom.xml b/maven-plugin/release/jdk7ReleasePom.xml
index c28c972113f..34b199f6185 100644
--- a/maven-plugin/release/jdk7ReleasePom.xml
+++ b/maven-plugin/release/jdk7ReleasePom.xml
@@ -4,7 +4,7 @@
     4.0.0
     jar
     Annotated JDK 7
-    http://checker-framework.com
+    https://checkerframework.org
     
         Annotated JDK 7 consists of bytecode implementing the Open JDK Java 7 api
         annotated with Checker Framework annotations.  Method implementations
diff --git a/maven-plugin/release/jdk8ReleasePom.xml b/maven-plugin/release/jdk8ReleasePom.xml
index 7d62ecf0b69..734195cecf0 100644
--- a/maven-plugin/release/jdk8ReleasePom.xml
+++ b/maven-plugin/release/jdk8ReleasePom.xml
@@ -4,7 +4,7 @@
     4.0.0
     jar
     Annotated JDK 8
-    http://checker-framework.com
+    https://checkerframework.org
     
         Annotated JDK 8 consists of bytecode implementing the Open JDK Java 8 api
         annotated with Checker Framework annotations.  Method implementations
diff --git a/maven-plugin/release/mavenPluginReleasePom.xml b/maven-plugin/release/mavenPluginReleasePom.xml
index 5dece1d380b..05a9953e406 100644
--- a/maven-plugin/release/mavenPluginReleasePom.xml
+++ b/maven-plugin/release/mavenPluginReleasePom.xml
@@ -5,12 +5,12 @@
     maven-plugin
 
     Checker Framework Maven Plugin
-    http://checker-framework.com
+    https://checkerframework.org
     
         The Checker Framework Maven Plugin allows you to easily run the
         Checker Framework in your Maven build.  Directions can be found
         at:
-        http://checker-framework.com/manual/#maven-plugin
+        https://checkerframework.org/manual/#maven-plugin
     
 
     org.checkerframework
diff --git a/release/README-release-process.html b/release/README-release-process.html
index ddf126cff64..4a8c7cd36f5 100644
--- a/release/README-release-process.html
+++ b/release/README-release-process.html
@@ -522,13 +522,13 @@ 
    File Layout
    
 
       
         /cse/www2/types
-        The file system location of the website: 
    http://checker-framework.com/.
+        The file system location of the website: 
    https://checkerframework.org/.
       
       
         
         m2-repo
         The location of the in-house Maven repository.  It is accessed through URL: 
    
-          http://checker-framework.com/m2-repo
+          https://checkerframework.org/m2-repo
         
       
 
@@ -538,7 +538,7 @@ 
    File Layout
    
 
       
         /cse/www2/types/dev
-        The file system location of the development staging website: 
    http://checker-framework.com/dev.
+        The file system location of the development staging website: 
    https://checkerframework.org/dev.
       
       
         
@@ -551,7 +551,7 @@ 
    File Layout
    
         
         m2-repo
         The location of the in-house staging version of the Maven repository.  It is accessed through URL: 
    
-          http://checker-framework.com/dev/m2-repo
+          https://checkerframework.org/dev/m2-repo
         
       
     
@@ -568,17 +568,17 @@ 
    Release Scripts
    
         Reverts the build/interm repositories to the state of their master repositories in GitHub/Bitbucket.
           It then builds the projects and all their artifacts and then stages a development
           version of all websites to
-          http://checker-framework.com/dev/
+          https://checkerframework.org/dev/
           This script is thoroughly documented in code comments located in its main() function.
         
       
       
         release_push.py
         Verifies the release at
-          http://checker-framework.com/dev/
+          https://checkerframework.org/dev/
           is correct through scripts and manual steps.  When the user is satisfied the website
           is correct it deploys the website to the live website:
-          http://checker-framework.com/.
+          https://checkerframework.org/.
           It also pushes Maven artifacts to our checker-framework.com repo and Maven central.
           Furthermore, there are a number of prompts to manually build the Eclipse plugin and
           test various components.
@@ -625,13 +625,13 @@ 
    Content Guidelines
    
       
  • Only (and all) changes that affect users go into the changelog.
         If a change is breaking, no matter how small, mention it.
    • 
       
  • List all issues (in issue trackers) resolved since the previous release, for
-          the Checker Framework (previous release,
+          the Checker Framework (previous release,
           issues query,
           current changelog),
-          Annotation File Utilities (previous release,
+          Annotation File Utilities (previous release,
           issues query,
            current changelog),
-          and jsr308-langtools (previous release,
+          and jsr308-langtools (previous release,
           issues query,
            current changelog).
       
    • 
@@ -725,7 +725,7 @@ 
    Future Improvements
    
     
    Open JDK/JSR308 Javadoc
     
     Generating the Javadocs for the entire JDK is not simple.  We have previously generated these but have
     not updated them in a while.  They can be found here:
    
-    http://checker-framework.com/jdk-api/
    
+    https://checkerframework.org/jdk-api/
    
     When we generate javadoc for the Type Annotations Compiler and Checker Framework we link against these docs.
     But because they were generated in a faulty manner in the first place, there are many broken links related to
     package summaries of the jdk-api docs.  It is highly unlikely that users will ever run into these links, since
diff --git a/release/release_build.py b/release/release_build.py
index 0e0d4c958c5..02d785155de 100755
--- a/release/release_build.py
+++ b/release/release_build.py
@@ -494,7 +494,7 @@ def main(argv):
     # The projects are built in the following order: JSR308-Langtools,
     # Annotation File Utilities, and Checker Framework. Furthermore, their
     # manuals and websites are also built and placed in their relevant locations
-    # at http://checker-framework.com/dev/ .  This is the most time-consuming
+    # at https://checkerframework.org/dev/ .  This is the most time-consuming
     # piece of the release. There are no prompts from this step forward; you
     # might want to get a cup of coffee and do something else until it is done.
 
@@ -528,7 +528,7 @@ def main(argv):
     commit_to_interm_projects(jsr308_version, afu_version, projects_to_release)
 
     # Adds read/write/execute group permissions to all of the new dev website directories
-    # under http://checker-framework.com/dev/ These directories need group read/execute
+    # under https://checkerframework.org/dev/ These directories need group read/execute
     # permissions in order for them to be served.
 
     print_step("\n\nBuild Step 9: Add group permissions to repos.")
diff --git a/release/release_push.py b/release/release_push.py
index e531116b706..8c4b9c984ae 100755
--- a/release/release_push.py
+++ b/release/release_push.py
@@ -197,7 +197,7 @@ def check_all_links(jsr308_website, afu_website, checker_website, suffix, test_m
     afuCheck = run_link_checker(afu_website, TMP_DIR + "/afu." + suffix + ".check")
     additional_param = ""
     if checker_version_of_broken_link_to_suppress != "":
-        additional_param = "--suppress-broken 404:http://checker-framework.com/checker-framework-" + checker_version_of_broken_link_to_suppress + ".zip"
+        additional_param = "--suppress-broken 404:https://checkerframework.org/checker-framework-" + checker_version_of_broken_link_to_suppress + ".zip"
     checkerCheck = run_link_checker(checker_website, TMP_DIR + "/checker-framework." + suffix + ".check", additional_param)
 
     is_jsr308Check_empty = is_file_empty(jsr308Check)
@@ -319,7 +319,7 @@ def main(argv):
     print "AFU:                       current-version=%s    new-version=%s" % (current_afu_version, new_afu_version)
 
     # Runs the link the checker on all websites at:
-    # http://checker-framework.com/dev/
+    # https://checkerframework.org/dev/
     # The output of the link checker is written to files in the /scratch/$USER/jsr308-release directory
     # whose locations will be output at the command prompt if the link checker reported errors.
 
@@ -350,7 +350,7 @@ def main(argv):
             maven_sanity_check("maven-dev", MAVEN_DEV_REPO, new_checker_version)
 
         print_step("3c: Build the Eclipse plugin and test.")
-        print "Please download: http://checker-framework.com/dev/checker-framework/checker-framework-%s.zip" % new_checker_version
+        print "Please download: https://checkerframework.org/dev/checker-framework/checker-framework-%s.zip" % new_checker_version
         print("Use the jars in the dist directory along with the instructions at " +
               "checker-framework/eclipse/README-developers.html to build the Eclipse plugin.\n" +
               "Please install this version in the latest version of Eclipse and follow the tutorial at:\n" +
@@ -428,7 +428,7 @@ def main(argv):
             # Ensure that the jsr308-langtools javac works with the system-wide java launcher
             if not os.path.isdir(SANITY_TEST_JSR308_LANGTOOLS_DIR):
                 execute("mkdir -p " + SANITY_TEST_JSR308_LANGTOOLS_DIR)
-            execute("wget http://checker-framework.com/jsr308/jsr308-langtools-" + new_checker_version + ".zip", True, False, SANITY_TEST_JSR308_LANGTOOLS_DIR)
+            execute("wget https://checkerframework.org/jsr308/jsr308-langtools-" + new_checker_version + ".zip", True, False, SANITY_TEST_JSR308_LANGTOOLS_DIR)
             execute("unzip -uq jsr308-langtools-" + new_checker_version +".zip", True, False, SANITY_TEST_JSR308_LANGTOOLS_DIR)
             execute("env -i bash --noprofile jsr308-langtools-" + new_checker_version + "/dist/bin/javac -version", True, False, SANITY_TEST_JSR308_LANGTOOLS_DIR)
     else:
@@ -446,7 +446,7 @@ def main(argv):
         print  "Test mode: Skipping deployment of the Eclipse Plugin to the live site."
 
     # Runs the link the checker on all websites at:
-    # http://checker-framework.com/
+    # https://checkerframework.org/
     # The output of the link checker is written to files in the /scratch/$USER/jsr308-release directory whose locations
     # will be output at the command prompt. Review the link checker output.
 
@@ -531,14 +531,14 @@ def main(argv):
         msg = ("\n" +
                "* Download the following files to your local machine." +
                "\n" +
-               "http://checker-framework.com/checker-framework-" + new_checker_version + ".zip\n" +
-               "http://checker-framework.com/annotation-file-utilities/annotation-tools-" + new_afu_version + ".zip\n" +
+               "https://checkerframework.org/checker-framework-" + new_checker_version + ".zip\n" +
+               "https://checkerframework.org/annotation-file-utilities/annotation-tools-" + new_afu_version + ".zip\n" +
                "\n" +
                "To post the Checker Framework release on GitHub:\n" +
                "\n" +
                "* Go to https://github.com/typetools/checker-framework/releases/new?tag=checker-framework-" + new_checker_version + "\n" +
                "* For the release title, enter: Checker Framework " + new_checker_version + "\n" +
-               "* For the description, insert the latest Checker Framework changelog entry (available at http://checker-framework.com/changelog.txt). Please include the first line with the release version and date.\n" +
+               "* For the description, insert the latest Checker Framework changelog entry (available at https://checkerframework.org/changelog.txt). Please include the first line with the release version and date.\n" +
                "* Find the link below \"Attach binaries by dropping them here or selecting them.\" Click on \"selecting them\" and upload checker-framework-" + new_checker_version + ".zip from your machine.\n" +
                "* Click on the green \"Publish release\" button.\n" +
                "\n" +
@@ -546,7 +546,7 @@ def main(argv):
                "\n" +
                "* Go to https://github.com/typetools/annotation-tools/releases/new?tag=" + new_afu_version + "\n" +
                "* For the release title, enter: Annotation File Utilities " + new_afu_version + "\n" +
-               "* For the description, insert the latest Annotation File Utilities changelog entry (available at http://checker-framework.com/annotation-file-utilities/changelog.html). Please include the first line with the release version and date. For bullet points, use the * Markdown character.\n" +
+               "* For the description, insert the latest Annotation File Utilities changelog entry (available at https://checkerframework.org/annotation-file-utilities/changelog.html). Please include the first line with the release version and date. For bullet points, use the * Markdown character.\n" +
                "* Find the link below \"Attach binaries by dropping them here or selecting them.\" Click on \"selecting them\" and upload annotation-tools-" + new_afu_version + ".zip from your machine.\n" +
                "* Click on the green \"Publish release\" button.\n")
 
diff --git a/release/release_vars.py b/release/release_vars.py
index 98054c7a26c..96ffb116f89 100755
--- a/release/release_vars.py
+++ b/release/release_vars.py
@@ -45,12 +45,12 @@ def append_to_PATH(paths):
 MAX_DOWNLOAD_SIZE = 2000000000
 
 # The location the test site is built in
-HTTP_PATH_TO_DEV_SITE = "http://checker-framework.com/dev"
+HTTP_PATH_TO_DEV_SITE = "https://checkerframework.org/dev"
 FILE_PATH_TO_DEV_SITE = "/cse/www2/types/dev/checker-framework"
 DEV_HTACCESS = os.path.join(FILE_PATH_TO_DEV_SITE, ".htaccess")
 
 # The location the test site is pushed to when it is ready
-HTTP_PATH_TO_LIVE_SITE = "http://checker-framework.com"
+HTTP_PATH_TO_LIVE_SITE = "https://checkerframework.org"
 FILE_PATH_TO_LIVE_SITE = "/cse/www2/types/checker-framework"
 LIVE_HTACCESS = os.path.join(FILE_PATH_TO_LIVE_SITE, ".htaccess")
 
diff --git a/release/sanity_checks.py b/release/sanity_checks.py
index 24b27509698..a16891fb54c 100755
--- a/release/sanity_checks.py
+++ b/release/sanity_checks.py
@@ -65,7 +65,7 @@ def javac_sanity_check(checker_framework_website, release_version):
     ])
 
     # this is a smoke test for the built-in checker shorthand feature
-    # http://checker-framework.com/manual/#shorthand-for-checkers
+    # https://checkerframework.org/manual/#shorthand-for-checkers
     nullness_shorthand_output = os.path.join(deploy_dir, "output_shorthand.log")
     cmd = sanity_javac + " -processor NullnessChecker " + nullness_example + " -Anomsgtext"
     execute_write_to_file(cmd, nullness_shorthand_output, False)
diff --git a/release/test-checker-framework.sh b/release/test-checker-framework.sh
index 61922990176..dfc4fa1a632 100755
--- a/release/test-checker-framework.sh
+++ b/release/test-checker-framework.sh
@@ -17,7 +17,7 @@ fi
 rm -f checker-framework-$1.zip
 rm -rf checker-framework-$1/
 
-wget http://checker-framework.com/checker-framework-$1.zip
+wget https://checkerframework.org/checker-framework-$1.zip
 unzip -q checker-framework-$1.zip
 
 export CHECKERFRAMEWORK=checker-framework-$1
diff --git a/release/types.htaccess b/release/types.htaccess
index b33275ff592..141bedb9997 100644
--- a/release/types.htaccess
+++ b/release/types.htaccess
@@ -9,7 +9,7 @@ Options +FollowSymlinks
 # Redirect /specification/java-annotation-design.html /jsr308/specification/java-annotation-design.html
 # Redirect /dev/specification/java-annotation-design.html /dev/jsr308/specification/java-annotation-design.html
 # Don't remove this redirect.  The old URL is
-# http://checker-framework.com/checkers-manual.html
+# https://checkerframework.org/checkers-manual.html
 # is referenced from
 # https://blogs.oracle.com/java-platform-group/entry/java_8_s_new_type
 # and perhaps from elsewhere.