Prepare for release 1.7.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5b1c9ea..a079867 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:contributing-md                    |
+ | 1) Re-generate using: mvn commons-build:contributing-md              |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.jira.id  (required, alphabetic, upper case)             |
diff --git a/README.md b/README.md
index 5fb2d4f..18e6fb9 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:readme-md                          |
+ | 1) Re-generate using: mvn commons-build:readme-md                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
@@ -46,7 +46,7 @@
 [![Build Status](https://travis-ci.org/apache/commons-text.svg)](https://travis-ci.org/apache/commons-text)
 [![Coverage Status](https://coveralls.io/repos/apache/commons-text/badge.svg)](https://coveralls.io/r/apache/commons-text)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-text/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-text/)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-text/1.6.svg)](https://javadoc.io/doc/org.apache.commons/commons-text/1.6)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-text/1.7.svg)](https://javadoc.io/doc/org.apache.commons/commons-text/1.7)
 
 Apache Commons Text is a library focused on algorithms working on strings.
 
@@ -54,7 +54,7 @@
 -------------
 
 More information can be found on the [Apache Commons Text homepage](https://commons.apache.org/proper/commons-text).
-The [Javadoc](https://commons.apache.org/proper/commons-text/javadocs/api-release) can be browsed.
+The [Javadoc](https://commons.apache.org/proper/commons-text/apidocs) can be browsed.
 Questions related to the usage of Apache Commons Text should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
@@ -67,7 +67,7 @@
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-text</artifactId>
-  <version>1.6</version>
+  <version>1.7</version>
 </dependency>
 ```
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b11c5af..b444127 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,53 @@
+Apache Commons Text
+Version 1.7
+Release Notes
+
+INTRODUCTION:
+
+This document contains the release notes for the 1.7 version of Apache Commons Text.
+Commons Text is a set of utility functions and reusable components for the purpose of processing
+and manipulating text that should be of use in a Java environment.
+
+Apache Commons Text is a library focused on algorithms working on strings.
+
+Changes in this version include:
+
+New features:
+
+o TEXT-148:  Add an enum to the lookup package that lists all StringLookups
+o TEXT-127:  Add a toggle to throw an exception when a variable is unknown in StringSubstitutor Thanks to Jean-Baptiste REICH, Sebb, Don Jeba, Gary Gregory.
+o TEXT-138:  TextStringBuilder append sub-sequence not consistent with Appendable. Thanks to Neal Johnson, Don Jeba.
+o TEXT-152:  Fix possible infinite loop in WordUtils.wrap for a regex pattern that would trigger on a match of 0 length Thanks to @CAPS50.
+o TEXT-155:  Add a generic IntersectionSimilarity measure
+
+Fixed Bugs:
+
+o TEXT-111:  WordUtils.wrap must calculate offset increment from wrapOn pattern length Thanks to @CAPS50.
+o TEXT-151:  Fix the JaroWinklerSimilarity to use StringUtils.equals to test for CharSequence equality
+o TEXT-165:  ResourceBundleStringLookup.lookup(String) throws MissingResourceException instead of returning null.
+
+Changes:
+
+o TEXT-104:  Jaro Winkler Distance refers to similarity Thanks to Sascha Szott.
+o TEXT-153:  Make prefixSet in LookupTranslator a BitSet Thanks to amirhadadi.
+o TEXT-156:  Fix the RegexTokenizer to use a static Pattern
+o TEXT-157:  Remove rounding from JaccardDistance and JaccardSimilarity
+o TEXT-162:  Update Apache Commons Lang from 3.8.1 to 3.9.
+o            Update tests from org.assertj:assertj-core 3.12.1 to 3.12.2.
+o            Update site from com.puppycrawl.tools:checkstyle 8.18 to 8.21.
+
+Historical list of changes: http://commons.apache.org/proper/commons-text/changes-report.html
+
+For complete information on Apache Commons Text, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons Text website:
+
+http://commons.apache.org/proper/commons-text
+
+Download it from http://commons.apache.org/proper/commons-text/download_text.cgi
+
+
+=============================================================================
+
                           Apache Commons Text
                               Version 1.6
                              Release Notes
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4fe0468..d1034d7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,7 +45,7 @@
   </properties>
   <body>
 
-  <release version="1.7" date="2018-MM-DD" description="Release 1.7">
+  <release version="1.7" date="2018-06-30" description="Release 1.7">
     <action issue="TEXT-111" type="fix" dev="kinow" due-to="@CAPS50">WordUtils.wrap must calculate offset increment from wrapOn pattern length</action>
     <action issue="TEXT-104" type="update" dev="kinow" due-to="Sascha Szott">Jaro Winkler Distance refers to similarity</action>
     <action issue="TEXT-148" type="add" dev="ggregory">Add an enum to the lookup package that lists all StringLookups</action>
diff --git a/src/site/xdoc/download_text.xml b/src/site/xdoc/download_text.xml
index 4c4802f..e22e0e6 100644
--- a/src/site/xdoc/download_text.xml
+++ b/src/site/xdoc/download_text.xml
@@ -26,22 +26,24 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:download-page                      |
+ | 1) Re-generate using: mvn commons-build:download-page                |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
- |    - commons.componentid (required, alphabetic, lower case)          |
+ |    - commons.componentid     (required, alphabetic, lower case)      |
  |    - commons.release.version (required)                              |
  |    - commons.release.name    (required)                              |
  |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
  |    - commons.release.desc    (optional)                              |
  |    - commons.release.subdir  (optional)                              |
+ |    - commons.release.hash    (optional, lowercase, default sha512)   |
  |                                                                      |
- |    - commons.release.2/3.version       (conditional)                 |
- |    - commons.release.2/3.name          (conditional)                 |
- |    - commons.release.2/3.binary.suffix (optional)                    |
- |    - commons.release.2/3.desc          (optional)                    |
- |    - commons.release.2/3.subdir        (optional)                    |
+ |    - commons.release.[234].version       (conditional)               |
+ |    - commons.release.[234].name          (conditional)               |
+ |    - commons.release.[234].binary.suffix (optional)                  |
+ |    - commons.release.[234].desc          (optional)                  |
+ |    - commons.release.[234].subdir        (optional)                  |
+ |    - commons.release.[234].hash       (optional, lowercase, [sha512])|
  |                                                                      |
  | 3) Example Properties                                                |
  |    (commons.release.name inherited by parent:                        |
@@ -102,7 +104,7 @@
         It is essential that you
         <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
         of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
-        failing that using the <code>SHA1</code> hash (<code>*.sha1</code> checksum files).
+        failing that using the <code>SHA512</code> hash (<code>*.sha512</code> checksum files).
       </p>
       <p>
         The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
@@ -111,36 +113,32 @@
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Text 1.6 (Java 8+)">
+    <section name="Apache Commons Text 1.7 (Java 8+)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/text/binaries/commons-text-1.6-bin.tar.gz">commons-text-1.6-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/text/binaries/commons-text-1.7-bin.tar.gz">commons-text-1.7-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.7-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.7-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/text/binaries/commons-text-1.6-bin.zip">commons-text-1.6-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.6-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/text/binaries/commons-text-1.7-bin.zip">commons-text-1.7-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.7-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/binaries/commons-text-1.7-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/text/source/commons-text-1.6-src.tar.gz">commons-text-1.6-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/text/source/commons-text-1.7-src.tar.gz">commons-text-1.7-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.7-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.7-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/text/source/commons-text-1.6-src.zip">commons-text-1.6-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.6-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/text/source/commons-text-1.7-src.zip">commons-text-1.7-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.7-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/text/source/commons-text-1.7-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 093dda1..59a838a 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -42,10 +42,10 @@
 </section>
 <!-- ================================================== -->
 <section name="Release Information">
-<p>The latest stable release of Text is 1.6. You may: </p>
+<p>The latest stable release of Text is 1.7. You may: </p>
 <ul>
-<li>Download <a href="http://commons.apache.org/proper/commons-text/download_text.cgi">1.6</a></li>
-<li>Read the <a href="release-notes/RELEASE-NOTES-1.6.txt">1.6 release notes</a></li>
+<li>Download the <a href="http://commons.apache.org/proper/commons-text/download_text.cgi">current version</a></li>
+<li>Read the <a href="release-notes/RELEASE-NOTES-1.7.txt">release notes</a></li>
 </ul>
 <p>
 Alternatively you can pull it from the central Maven repositories:
@@ -53,7 +53,7 @@
 &lt;dependency&gt;
    &lt;groupId&gt;org.apache.commons&lt;/groupId&gt;
    &lt;artifactId&gt;commons-text&lt;/artifactId&gt;
-   &lt;version&gt;1.6&lt;/version&gt;
+   &lt;version&gt;1.7&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 </p>
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index fc8fc38..167f329 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -1,102 +1,102 @@
-<?xml version="1.0"?>

-<!--

-Licensed to the Apache Software Foundation (ASF) under one or more

-contributor license agreements.  See the NOTICE file distributed with

-this work for additional information regarding copyright ownership.

-The ASF licenses this file to You under the Apache License, Version 2.0

-(the "License"); you may not use this file except in compliance with

-the License.  You may obtain a copy of the License at

-

-     http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

--->

-<!--

- +======================================================================+

- |****                                                              ****|

- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|

- |****                    DO NOT EDIT DIRECTLY                      ****|

- |****                                                              ****|

- +======================================================================+

- | TEMPLATE FILE: issue-tracking-template.xml                           |

- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |

- +======================================================================+

- |                                                                      |

- | 1) Re-generate using: mvn commons:jira-page                          |

- |                                                                      |

- | 2) Set the following properties in the component's pom:              |

- |    - commons.jira.id  (required, alphabetic, upper case)             |

- |    - commons.jira.pid (required, numeric)                            |

- |                                                                      |

- | 3) Example Properties                                                |

- |                                                                      |

- |  <properties>                                                        |

- |    <commons.jira.id>MATH</commons.jira.id>                           |

- |    <commons.jira.pid>12310485</commons.jira.pid>                     |

- |  </properties>                                                       |

- |                                                                      |

- +======================================================================+

--->

-<document>

-  <properties>

-    <title>Apache Commons Text Issue tracking</title>

-    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>

-  </properties>

-  <body>

-

-    <section name="Apache Commons Text Issue tracking">

-      <p>

-      Apache Commons Text uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.

-      See the <a href="https://issues.apache.org/jira/browse/TEXT">Apache Commons Text JIRA project page</a>.

-      </p>

-

-      <p>

-      To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>

-      (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically

-      created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>

-      page to get a new password).

-      </p>

-

-      <p>

-      If you would like to report a bug, or raise an enhancement request with

-      Apache Commons Text please do the following:

-      <ol>

-        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.

-            If you find your issue listed then please add a comment with your details.</li>

-        <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.

-            You may find your issue or idea has already been discussed.</li>

-        <li>Decide if your issue is a bug or an enhancement.</li>

-        <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>

-            or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>

-      </ol>

-      </p>

-

-      <p>

-      Please also remember these points:

-      <ul>

-        <li>the more information you provide, the better we can help you</li>

-        <li>test cases are vital, particularly for any proposed enhancements</li>

-        <li>the developers of Apache Commons Text are all unpaid volunteers</li>

-      </ul>

-      </p>

-

-      <p>

-      For more information on subversion and creating patches see the

-      <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.

-      </p>

-

-      <p>

-      You may also find these links useful:

-      <ul>

-        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Text bugs</a></li>

-        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Text bugs</a></li>

-        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Text bugs</a></li>

-      </ul>

-      </p>

-    </section>

-  </body>

-</document>

+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: issue-tracking-template.xml                           |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons-build:jira-page                    |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.jira.id  (required, alphabetic, upper case)             |
+ |    - commons.jira.pid (required, numeric)                            |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.jira.id>MATH</commons.jira.id>                           |
+ |    <commons.jira.pid>12310485</commons.jira.pid>                     |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+-->
+<document>
+  <properties>
+    <title>Apache Commons Text Issue tracking</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
+  </properties>
+  <body>
+
+    <section name="Apache Commons Text Issue tracking">
+      <p>
+      Apache Commons Text uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+      See the <a href="https://issues.apache.org/jira/browse/TEXT">Apache Commons Text JIRA project page</a>.
+      </p>
+
+      <p>
+      To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+      (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
+      created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+      page to get a new password).
+      </p>
+
+      <p>
+      If you would like to report a bug, or raise an enhancement request with
+      Apache Commons Text please do the following:
+      <ol>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
+            If you find your issue listed then please add a comment with your details.</li>
+        <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
+            You may find your issue or idea has already been discussed.</li>
+        <li>Decide if your issue is a bug or an enhancement.</li>
+        <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+            or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+      </ol>
+      </p>
+
+      <p>
+      Please also remember these points:
+      <ul>
+        <li>the more information you provide, the better we can help you</li>
+        <li>test cases are vital, particularly for any proposed enhancements</li>
+        <li>the developers of Apache Commons Text are all unpaid volunteers</li>
+      </ul>
+      </p>
+
+      <p>
+      For more information on subversion and creating patches see the
+      <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
+      </p>
+
+      <p>
+      You may also find these links useful:
+      <ul>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Text bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Text bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12318221&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Text bugs</a></li>
+      </ul>
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 510a8bc..92d0245 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -1,205 +1,205 @@
-<?xml version="1.0"?>

-<!--

-Licensed to the Apache Software Foundation (ASF) under one or more

-contributor license agreements.  See the NOTICE file distributed with

-this work for additional information regarding copyright ownership.

-The ASF licenses this file to You under the Apache License, Version 2.0

-(the "License"); you may not use this file except in compliance with

-the License.  You may obtain a copy of the License at

-

-     http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

--->

-<!--

- +======================================================================+

- |****                                                              ****|

- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|

- |****                    DO NOT EDIT DIRECTLY                      ****|

- |****                                                              ****|

- +======================================================================+

- | TEMPLATE FILE: mail-lists-template.xml                               |

- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |

- +======================================================================+

- |                                                                      |

- | 1) Re-generate using: mvn commons:mail-page                          |

- |                                                                      |

- | 2) Set the following properties in the component's pom:              |

- |    - commons.componentid (required, alphabetic, lower case)          |

- |                                                                      |

- | 3) Example Properties                                                |

- |                                                                      |

- |  <properties>                                                        |

- |    <commons.componentid>math</commons.componentid>                   |

- |  </properties>                                                       |

- |                                                                      |

- +======================================================================+

--->

-<document>

-  <properties>

-    <title>Apache Commons Text Mailing Lists</title>

-    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>

-  </properties>

-  <body>

-

-    <section name="Overview">

-      <p>

-        <a href="index.html">Apache Commons Text</a> shares mailing lists with all the other

-        <a href="http://commons.apache.org/components.html">Commons Components</a>.

-        To make it easier for people to only read messages related to components they are interested in,

-        the convention in Commons is to prefix the subject line of messages with the component's name,

-        for example:

-        <ul>

-          <li>[text] Problem with the ...</li>

-        </ul>

-      </p>

-      <p>

-        Questions related to the usage of Apache Commons Text should be posted to the

-        <a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.

-        <br />

-        The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>

-        is for questions and discussion related to the development of Apache Commons Text.

-        <br />

-        Please do not cross-post; developers are also subscribed to the user list.

-        <br />

-        You must be subscribed to post to the mailing lists.  Follow the Subscribe links below

-        to subscribe.

-      </p>

-      <p>

-        <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.

-        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.

-        Otherwise, please upload the file to a public server and include the URL in the mail.

-      </p>

-    </section>

-

-    <section name="Apache Commons Text Mailing Lists">

-      <p>

-        <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Text</a>

-        with <i>[text]</i></strong> - <i>thanks!</i>

-        <br />

-        <br />

-      </p>

-

-      <table>

-        <tr>

-          <th>Name</th>

-          <th>Subscribe</th>

-          <th>Unsubscribe</th>

-          <th>Post</th>

-          <th>Archive</th>

-          <th>Other Archives</th>

-        </tr>

-

-

-        <tr>

-          <td>

-            <strong>Commons User List</strong>

-            <br /><br />

-            Questions on using Apache Commons Text.

-            <br /><br />

-          </td>

-          <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>

-          <td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>

-          <td><a href="mailto:user@commons.apache.org?subject=[text]">Post</a></td>

-          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>

-          <td><a href="http://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />

-              <a href="http://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />

-              <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>

-          </td>

-        </tr>

-

-

-        <tr>

-          <td>

-            <strong>Commons Developer List</strong>

-            <br /><br />

-            Discussion of development of Apache Commons Text.

-            <br /><br />

-          </td>

-          <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>

-          <td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>

-          <td><a href="mailto:dev@commons.apache.org?subject=[text]">Post</a></td>

-          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>

-          <td><a href="http://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />

-              <a href="http://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />

-              <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>

-          </td>

-        </tr>

-

-

-        <tr>

-          <td>

-            <strong>Commons Issues List</strong>

-            <br /><br />

-            Only for e-mails automatically generated by the <a href="issue-tracking.html">issue tracking</a> system.

-            <br /><br />

-          </td>

-          <td><a href="mailto:issues-subscribe@commons.apache.org">Subscribe</a></td>

-          <td><a href="mailto:issues-unsubscribe@commons.apache.org">Unsubscribe</a></td>

-          <td><i>read only</i></td>

-          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a></td>

-          <td><a href="http://markmail.org/list/org.apache.commons.issues/">markmail.org</a><br />

-              <a href="http://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a>

-          </td>

-        </tr>

-

-

-        <tr>

-          <td>

-            <strong>Commons Commits List</strong>

-            <br /><br />

-            Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem.

-            <br /><br />

-          </td>

-          <td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>

-          <td><a href="mailto:commits-unsubscribe@commons.apache.org">Unsubscribe</a></td>

-          <td><i>read only</i></td>

-          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a></td>

-          <td><a href="http://markmail.org/list/org.apache.commons.commits/">markmail.org</a><br />

-              <a href="http://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a>

-          </td>

-        </tr>

-

-      </table>

-

-    </section>

-    <section name="Apache Mailing Lists">

-      <p>

-        Other mailing lists which you may find useful include:

-      </p>

-

-      <table>

-        <tr>

-          <th>Name</th>

-          <th>Subscribe</th>

-          <th>Unsubscribe</th>

-          <th>Post</th>

-          <th>Archive</th>

-          <th>Other Archives</th>

-        </tr>

-        <tr>

-          <td>

-            <strong>Apache Announce List</strong>

-            <br /><br />

-            General announcements of Apache project releases.

-            <br /><br />

-          </td>

-          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>

-          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>

-          <td><i>read only</i></td>

-          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>

-          <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />

-              <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />

-              <a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />

-              <a class="externalLink" href="http://news.gmane.org/gmane.comp.apache.announce">news.gmane.org</a>

-          </td>

-        </tr>

-      </table>

-

-    </section>

-  </body>

-</document>

+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: mail-lists-template.xml                               |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons-build:mail-page                    |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.componentid (required, alphabetic, lower case)          |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.componentid>math</commons.componentid>                   |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+-->
+<document>
+  <properties>
+    <title>Apache Commons Text Mailing Lists</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
+  </properties>
+  <body>
+
+    <section name="Overview">
+      <p>
+        <a href="index.html">Apache Commons Text</a> shares mailing lists with all the other
+        <a href="http://commons.apache.org/components.html">Commons Components</a>.
+        To make it easier for people to only read messages related to components they are interested in,
+        the convention in Commons is to prefix the subject line of messages with the component's name,
+        for example:
+        <ul>
+          <li>[text] Problem with the ...</li>
+        </ul>
+      </p>
+      <p>
+        Questions related to the usage of Apache Commons Text should be posted to the
+        <a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
+        <br />
+        The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
+        is for questions and discussion related to the development of Apache Commons Text.
+        <br />
+        Please do not cross-post; developers are also subscribed to the user list.
+        <br />
+        You must be subscribed to post to the mailing lists.  Follow the Subscribe links below
+        to subscribe.
+      </p>
+      <p>
+        <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.
+        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
+        Otherwise, please upload the file to a public server and include the URL in the mail.
+      </p>
+    </section>
+
+    <section name="Apache Commons Text Mailing Lists">
+      <p>
+        <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Text</a>
+        with <i>[text]</i></strong> - <i>thanks!</i>
+        <br />
+        <br />
+      </p>
+
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Subscribe</th>
+          <th>Unsubscribe</th>
+          <th>Post</th>
+          <th>Archive</th>
+          <th>Other Archives</th>
+        </tr>
+
+
+        <tr>
+          <td>
+            <strong>Commons User List</strong>
+            <br /><br />
+            Questions on using Apache Commons Text.
+            <br /><br />
+          </td>
+          <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
+          <td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
+          <td><a href="mailto:user@commons.apache.org?subject=[text]">Post</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
+          <td><a href="http://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />
+              <a href="http://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />
+              <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
+          </td>
+        </tr>
+
+
+        <tr>
+          <td>
+            <strong>Commons Developer List</strong>
+            <br /><br />
+            Discussion of development of Apache Commons Text.
+            <br /><br />
+          </td>
+          <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
+          <td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
+          <td><a href="mailto:dev@commons.apache.org?subject=[text]">Post</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
+          <td><a href="http://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />
+              <a href="http://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />
+              <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
+          </td>
+        </tr>
+
+
+        <tr>
+          <td>
+            <strong>Commons Issues List</strong>
+            <br /><br />
+            Only for e-mails automatically generated by the <a href="issue-tracking.html">issue tracking</a> system.
+            <br /><br />
+          </td>
+          <td><a href="mailto:issues-subscribe@commons.apache.org">Subscribe</a></td>
+          <td><a href="mailto:issues-unsubscribe@commons.apache.org">Unsubscribe</a></td>
+          <td><i>read only</i></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a></td>
+          <td><a href="http://markmail.org/list/org.apache.commons.issues/">markmail.org</a><br />
+              <a href="http://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a>
+          </td>
+        </tr>
+
+
+        <tr>
+          <td>
+            <strong>Commons Commits List</strong>
+            <br /><br />
+            Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem.
+            <br /><br />
+          </td>
+          <td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>
+          <td><a href="mailto:commits-unsubscribe@commons.apache.org">Unsubscribe</a></td>
+          <td><i>read only</i></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a></td>
+          <td><a href="http://markmail.org/list/org.apache.commons.commits/">markmail.org</a><br />
+              <a href="http://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a>
+          </td>
+        </tr>
+
+      </table>
+
+    </section>
+    <section name="Apache Mailing Lists">
+      <p>
+        Other mailing lists which you may find useful include:
+      </p>
+
+      <table>
+        <tr>
+          <th>Name</th>
+          <th>Subscribe</th>
+          <th>Unsubscribe</th>
+          <th>Post</th>
+          <th>Archive</th>
+          <th>Other Archives</th>
+        </tr>
+        <tr>
+          <td>
+            <strong>Apache Announce List</strong>
+            <br /><br />
+            General announcements of Apache project releases.
+            <br /><br />
+          </td>
+          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
+          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
+          <td><i>read only</i></td>
+          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
+          <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />
+              <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
+              <a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />
+              <a class="externalLink" href="http://news.gmane.org/gmane.comp.apache.announce">news.gmane.org</a>
+          </td>
+        </tr>
+      </table>
+
+    </section>
+  </body>
+</document>
diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml
index 09b3e67..0c9ff1f 100644
--- a/src/site/xdoc/release-history.xml
+++ b/src/site/xdoc/release-history.xml
@@ -27,6 +27,9 @@
 <table>
 <tr><th>Version</th><th>Release date (YYYY-MM-DD)</th><th>Required Java Version</th><th>Javadoc</th><th>Release notes</th></tr>
 <tr>
+  <td>1.7</td><td>2019-06-30</td><td>8</td><td><a href="javadocs/api-1.7/index.html">api-1.7</a></td><td><a href="release-notes/RELEASE-NOTES-1.7.txt">release notes for 1.6</a></td>
+</tr>
+<tr>
   <td>1.6</td><td>2018-10-12</td><td>8</td><td><a href="javadocs/api-1.6/index.html">api-1.6</a></td><td><a href="release-notes/RELEASE-NOTES-1.6.txt">release notes for 1.6</a></td>
 </tr>
 <tr>