Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-validator into VALIDATOR_1_7_BRANCH
diff --git a/README.md b/README.md
index 7e78cc5..0461c75 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)          |
@@ -43,8 +43,10 @@
 Apache Commons Validator
 ===================
 
-[![Build Status](https://travis-ci.org/apache/commons-validator.svg?branch=trunk)](https://travis-ci.org/apache/commons-validator)
+[![Build Status](https://travis-ci.org/apache/commons-validator.svg)](https://travis-ci.org/apache/commons-validator)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-validator/badge.svg)](https://coveralls.io/r/apache/commons-validator)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-validator/commons-validator/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-validator/commons-validator/)
+[![Javadocs](https://javadoc.io/badge/commons-validator/commons-validator/1.7.svg)](https://javadoc.io/doc/commons-validator/commons-validator/1.7)
 
 Apache Commons Validator provides the building blocks for both client side validation and server side data validation.
     It may be used standalone or with a framework like Struts.
@@ -53,7 +55,7 @@
 -------------
 
 More information can be found on the [Apache Commons Validator homepage](https://commons.apache.org/proper/commons-validator).
-The [Javadoc](https://commons.apache.org/proper/commons-validator/javadocs/api-release) can be browsed.
+The [Javadoc](https://commons.apache.org/proper/commons-validator/apidocs) can be browsed.
 Questions related to the usage of Apache Commons Validator should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
@@ -66,7 +68,7 @@
 <dependency>
   <groupId>commons-validator</groupId>
   <artifactId>commons-validator</artifactId>
-  <version>1.6</version>
+  <version>1.7</version>
 </dependency>
 ```
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 267620b..2ced1f7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,7 +1,7 @@
-              Apache Commons Validator 1.6
+              Apache Commons Validator 1.7
                   RELEASE NOTES
 
-The Apache Commons Validator team is pleased to announce the release of Apache Commons Validator 1.6
+The Apache Commons Validator team is pleased to announce the release of Apache Commons Validator 1.7
 
 Apache Commons Validator provides the building blocks for both client side validation and server side data validation.
 It may be used standalone or with a framework like Struts.
@@ -9,50 +9,67 @@
 This is primarily a maintenance release.
 All projects are encouraged to update to this release of Apache Commons Validator.
 
-Commons Validator requires Java 1.6 or later.
+Commons Validator requires Java 7 or later.
 
 Main enhancements
 =================
 
-* Modulus Ten Check Digit Implementation
-* Generic CreditCard validation (syntax and checkdigit only; does not check IIN)
 * CreditCard validation specification by numeric range
+* DomainValidator instances can be created with instance overrides
+* DomainValidator supports overrides of LOCAL TLDs
 
 IMPORTANT NOTES
 ===============
 
 BREAKING CHANGES:
 
- * NONE.
+ * Now requires Java 7
 
 DEPENDENCIES
 ============
-The dependencies for Validator have not changed since the 1.4 release.
+ *
+ Updates Apache Commons BeanUtils dependency from 1.9.2 to 1.9.3.
+
+
+This picks up BEANUTILS-482: Update commons-collections from 3.2.1 to 3.2.2 (CVE-2015-4852).
 For the current list of dependencies, please see http://commons.apache.org/validator/dependencies.html
 
 Changes in this version include:
 
 New features:
-o VALIDATOR-415:  Simplify building new CreditCard validators
-o VALIDATOR-413:  Generic CreditCard validation
-o VALIDATOR-394:  General Modulus Ten Check Digit Implementation Thanks to Niall Pemberton.
+o VALIDATOR-474:  DomainValidator should allow local overrides
+o VALIDATOR-473:  Allow Email- and UrlValidator to use specified DomainValidator
+o VALIDATOR-471:  Allow DomainValidator overrides at run-time
+o VALIDATOR-423:  Add ISINValidator
+o VALIDATOR-455:  Add IBAN validator for VA – Vatican City State Thanks to Eugen Hanussek.
+o VALIDATOR-446:  ISSN Validator extract ISSN from EAN-13 Thanks to Alex.
 
 Fixed Bugs:
-o VALIDATOR-420:  Query params validator shouldn't accept whitespaces Thanks to Marcin Gasior.
-o VALIDATOR-419:  Invalid IPv6 addresses that are IPv4-mapped pass InetAddressValidator validation Thanks to Denis Iskhakov.
-o VALIDATOR-418:  UrlValidatorTest: testIsValid() does not run all tests Thanks to Robert McGuigan.
-o VALIDATOR-379:  CodeValidator unconditionally trim()s the input string - document the behavior
-o VALIDATOR-387:  Userinfo without colon should be valid in UrlValidator Thanks to Shumpei Akai.
-o VALIDATOR-411:  UrlValidator accepts ports above max limit of 16-bit unsigned integer
-o VALIDATOR-407:  Generic .shop top level domain is considered invalid
-o VALIDATOR-405:  IBANValidator - Costa Rica entry has been updated in SWIFT docs
-o VALIDATOR-401:  IBANValidator fails for Seychelles and Ukraine
-o VALIDATOR-391:  UrlValidator.isValid throws exception for FILEURLs
-                  Fixed code so it handles URLs with no authority field Thanks to Mark E. Scott, Jr. & Jason Loomis.
+o VALIDATOR-403:  Accept Discover cards of 17 digits long that start with 6011 Thanks to Tanya.
+o VALIDATOR-408:  DISCOVER Card Validation Patterns Thanks to Raj Vaida.
+o VALIDATOR-472:  UrlValidator should not be more lax than java.net.URI
+o VALIDATOR-283:  URLValidator should check for illegal Hex characters Thanks to RC Johnson.
+o VALIDATOR-445:  Inet6Address may also contain a scope id Thanks to devson.
+o VALIDATOR-452:  Validation of URL containing IPv4-mapped IPv6 address Thanks to devson.
+o VALIDATOR-438:  IBANValidator fails for El Salvador
+                  Add definition Thanks to Simon Marti.
+o VALIDATOR-434:  Field does not synchronize iteration on synchronized list Thanks to emopers.
+o VALIDATOR-437:  Update Apache Commons BeanUtils dependency from 1.9.2 to 1.9.3.
+                  This picks up BEANUTILS-482: Update commons-collections from 3.2.1 to 3.2.2 (CVE-2015-4852).
+o VALIDATOR-460:  Update Apache Commons BeanUtils dependency from 1.9.3 to 1.9.4
+                  This picks up BEANUTILS-520: Mitigate CVE-2014-0114. Thanks to Jeff Schram.
+o VALIDATOR-461:  Generic .gmbh top level domain is considered invalid Thanks to Nils Reischmann.
+o VALIDATOR-444:  LongValidator: numbers bigger than the maxvalue are Valid Thanks to Martin Scholz.
+o VALIDATOR-416:  CreditCardValidator default ctor disagrees with Javadoc
+o VALIDATOR-467:  URL validator fails if path starts with double slash and has underscores Thanks to Ivan Larionov.
+o VALIDATOR-464:  UrlValidator says "file://bad ^ domain.com/label/test" is valid Thanks to Sebastian Choina.
+o VALIDATOR-449:  Leading and trailing spaces in EmailValidator should not be valid Thanks to Frederic Boutin.
+o VALIDATOR-302:  EMailValidator: Addresses with leading spaces must not be accepted Thanks to Guido Zockoll.
+o VALIDATOR-468:  DomainValidator.getTLDArray does not synch mutable arrays
 
 Changes:
-o                 IANA TLD lists: Updated to Version 2017020400, Last Updated Sat Feb  4 07:07:01 2017 UTC
-o                 Update to version 73 of SWIFT IBAN list: added BY (Belarus) and IQ (Iraq); fixed Santa Lucia format
+o                 IANA TLD lists: Updated to Version 2020073100, Last Updated Fri Jul 31 07:07:01 2020 UTC
+o VALIDATOR-428:  Update commons digester to 2.1 Thanks to Matthew Zavislak.
 
 
 Historical list of changes: http://commons.apache.org/proper/commons-validator/changes-report.html
diff --git a/pom.xml b/pom.xml
index 9a0123d..ea68c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>commons-validator</groupId>
   <artifactId>commons-validator</artifactId>
-  <version>1.7-SNAPSHOT</version>
+  <version>1.7</version>
   <name>Apache Commons Validator</name>
   <description>
     Apache Commons Validator provides the building blocks for both client side validation and server side data validation.
diff --git a/src/site/xdoc/download_validator.xml b/src/site/xdoc/download_validator.xml
index ec80f4b..688df90 100644
--- a/src/site/xdoc/download_validator.xml
+++ b/src/site/xdoc/download_validator.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:                        |
@@ -64,7 +66,7 @@
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
+        builds, but you <strong>must</strong> <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of
         the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
         be available from all the mirrors.
@@ -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>MD5</code> hash (<code>*.md5</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,32 +113,32 @@
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Validator 1.6 (requires JDK 1.6)">
+    <section name="Apache Commons Validator 1.7 (requires JDK 1.7)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/validator/binaries/commons-validator-1.6-bin.tar.gz">commons-validator-1.6-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.6-bin.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.6-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/validator/binaries/commons-validator-1.7-bin.tar.gz">commons-validator-1.7-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.7-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.7-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/validator/binaries/commons-validator-1.6-bin.zip">commons-validator-1.6-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.6-bin.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.6-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/validator/binaries/commons-validator-1.7-bin.zip">commons-validator-1.7-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.7-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/binaries/commons-validator-1.7-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/validator/source/commons-validator-1.6-src.tar.gz">commons-validator-1.6-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.6-src.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.6-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/validator/source/commons-validator-1.7-src.tar.gz">commons-validator-1.7-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.7-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.7-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/validator/source/commons-validator-1.6-src.zip">commons-validator-1.6-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.6-src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.6-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/validator/source/commons-validator-1.7-src.zip">commons-validator-1.7-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.7-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/validator/source/commons-validator-1.7-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>