Prepare for release 1.7.

- There is no longer site archives. We forgot to do it for 1.6 but the sites are still in svn. - The Javadoc archives now point to the same place GitHub uses: javadoc.io - Checkstyle fixes.
2019-06-01 17:20:20 -04:00 · 2019-06-01 17:20:20 -04:00 · 33bfaeef8a
parent b94e5ac025
commit 33bfaeef8a
16 changed files with 152 additions and 113 deletions
--- 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)             |
--- a/NOTICE.txt
+++ b/NOTICE.txt
@ -1,5 +1,5 @@
 Apache Commons CSV
-Copyright 2005-2018 The Apache Software Foundation
+Copyright 2005-2019 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
--- 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 @@ Apache Commons CSV
 [![Build Status](https://travis-ci.org/apache/commons-csv.svg)](https://travis-ci.org/apache/commons-csv)
 [![Coverage Status](https://coveralls.io/repos/apache/commons-csv/badge.svg)](https://coveralls.io/r/apache/commons-csv)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-csv/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-csv/)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.6.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.6)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.7.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.7)

 The Apache Commons CSV library provides a simple interface for reading and writing
 CSV files of various types.
@ -55,7 +55,7 @@ Documentation
 -------------

 More information can be found on the [Apache Commons CSV homepage](https://commons.apache.org/proper/commons-csv).
-The [Javadoc](https://commons.apache.org/proper/commons-csv/javadocs/api-release) can be browsed.
+The [Javadoc](https://commons.apache.org/proper/commons-csv/apidocs) can be browsed.
 Questions related to the usage of Apache Commons CSV should be posted to the [user mailing list][ml].

 Where can I get the latest release?
@ -68,7 +68,7 @@ Alternatively you can pull it from the central Maven repositories:
 <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-csv</artifactId>
-  <version>1.6</version>
+  <version>1.7</version>
 </dependency>
 ```

--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@ -1,6 +1,59 @@
                        Apache Commons CSV
-                            Version 1.6
-                           Release Notes
+                        Version 1.7
+                        Release Notes
+
+
+INTRODUCTION:
+
+This document contains the release notes for the 1.7 version of Apache Commons CSV.
+Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
+
+The Apache Commons CSV library provides a simple interface for reading and writing
+CSV files of various types.
+
+Feature and bug fix release (Java 8)
+
+Changes in this version include:
+
+NEW FEATURES
+==============
+
+o CSV-233:  Add predefined CSVFormats for printing MongoDB CSV and TSV. Thanks to Gary Gregory.
+o CSV-234:  Add support for java.sql.Clob. Thanks to Roberto Benedetti, Gary Gregory.
+o CSV-239:  Cannot get headers in column order from CSVRecord. Thanks to Gary Gregory, Dave Moten.
+
+FIXED BUGS
+============
+
+o CSV-208:  Fix escape character for POSTGRESQL_TEXT and POSTGRESQL_CSV formats. Thanks to Jurrie Overgoor.
+o CSV-232:  Site link "Source Repository" does not work. Thanks to Jurrie Overgoor, Gary Gregory.
+o CSV-238:  Escape quotes in CLOBs #39. Thanks to Stephen Olander-Waters.
+
+CHANGES
+=========
+
+o CSV-237:  Update to Java 8. Thanks to Gary Gregory.
+o           Update tests from H2 1.4.198 to 1.4.199. Thanks to Gary Gregory.
+
+
+Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
+
+For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+
+http://commons.apache.org/proper/commons-csv/
+
+Download it from http://commons.apache.org/proper/commons-csv/download_csv.cgi
+
+Have fun!
+-Apache Commons CSV team
+
+------------------------------------------------------------------------------
+
+
+                        Apache Commons CSV
+                        Version 1.6
+                        Release Notes


 INTRODUCTION:
@ -53,8 +106,8 @@ Have fun!
 ------------------------------------------------------------------------------

                        Apache Commons CSV
-                            Version 1.5
-                           Release Notes
+                        Version 1.5
+                        Release Notes


 INTRODUCTION:
@ -110,8 +163,8 @@ Have fun!
 ------------------------------------------------------------------------------

                        Apache Commons CSV
-                            Version 1.4
-                           Release Notes
+                        Version 1.4
+                        Release Notes


 INTRODUCTION:
@ -154,8 +207,8 @@ Have fun!
 ------------------------------------------------------------------------------

                        Apache Commons CSV
-                           Version 1.3
-                          Release Notes
+                        Version 1.3
+                        Release Notes


 INTRODUCTION:
@ -203,8 +256,8 @@ Have fun!
 ------------------------------------------------------------------------------

                        Apache Commons CSV
-                           Version 1.2
-                          Release Notes
+                        Version 1.2
+                        Release Notes


 INTRODUCTION:
@ -246,8 +299,8 @@ Have fun!
 ------------------------------------------------------------------------------

                        Apache Commons CSV
-                           Version 1.1
-                          Release Notes
+                        Version 1.1
+                        Release Notes


 INTRODUCTION:
@ -292,8 +345,8 @@ Have fun!
 -------------------------------------------------------------------------------

                        Apache Commons CSV
-                           Version 1.0
-                          Release Notes
+                        Version 1.0
+                        Release Notes


 INTRODUCTION:
--- a/pom.xml
+++ b/pom.xml
@ -156,24 +156,14 @@ CSV files of various types.
    <checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt</checkstyle.resourceExcludes>

    <japicmp.skip>false</japicmp.skip>
+    
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
+    <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
  </properties>

  <build>
    <defaultGoal>clean verify apache-rat:check clirr:check javadoc:javadoc</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.1</version>
-          <configuration>
-            <ignorePathsToDelete>
-              <ignorePathToDelete>archives/**</ignorePathToDelete>
-            </ignorePathsToDelete>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
    <plugins>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@ -38,7 +38,7 @@
    <title>Release Notes</title>
  </properties>
  <body>
-    <release version="1.7" date="2019-MM-DD" description="Feature and bug fix release (Java 8)">
+    <release version="1.7" date="2019-06-01" description="Feature and bug fix release (Java 8)">
      <action issue="CSV-233" type="add" dev="ggregory" due-to="Gary Gregory">Add predefined CSVFormats for printing MongoDB CSV and TSV.</action>
      <action issue="CSV-208" type="fix" dev="ggregory" due-to="Jurrie Overgoor">Fix escape character for POSTGRESQL_TEXT and POSTGRESQL_CSV formats.</action>
      <action issue="CSV-232" type="fix" dev="ggregory" due-to="Jurrie Overgoor, Gary Gregory">Site link "Source Repository" does not work.</action>
--- a/src/main/java/org/apache/commons/csv/CSVFormat.java
+++ b/src/main/java/org/apache/commons/csv/CSVFormat.java
@ -882,13 +882,13 @@ public final class CSVFormat implements Serializable {

    /**
     * Returns true if and only if duplicate names are allowed in the headers.
-     * 
+     *
     * @return whether duplicate header names are allowed
     * @since 1.7
     */
    public boolean getAllowDuplicateHeaderNames() {
-		return allowDuplicateHeaderNames;
-	}
+        return allowDuplicateHeaderNames;
+    }

    /**
     * Specifies whether missing column names are allowed when parsing the header line.
@ -1681,7 +1681,7 @@ public final class CSVFormat implements Serializable {

    /**
     * Returns a new {@code CSVFormat} that allows duplicate header names.
-     * 
+     *
     * @return a new {@code CSVFormat} that allows duplicate header names
     * @since 1.7
     */
@ -1691,7 +1691,7 @@ public final class CSVFormat implements Serializable {

    /**
     * Returns a new {@code CSVFormat} with duplicate header names behavior set to the given value.
-     * 
+     *
     * @param allowDuplicateHeaderNames the duplicate header names behavior, true to allow, false to disallow.
     * @return a new {@code CSVFormat} with duplicate header names behavior set to the given value.
     * @since 1.7
--- a/src/main/java/org/apache/commons/csv/CSVParser.java
+++ b/src/main/java/org/apache/commons/csv/CSVParser.java
@ -500,9 +500,9 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
                    if (containsHeader) {
                        if (!emptyHeader && !this.format.getAllowDuplicateHeaderNames()) {
                            throw new IllegalArgumentException(
-                                    String.format("The header contains a duplicate name: \"%s\" in %s."
-                                        + " If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
-                                        header, Arrays.toString(headerRecord)));
+                                String.format(
+                                    "The header contains a duplicate name: \"%s\" in %s. If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
+                                    header, Arrays.toString(headerRecord)));
                        }
                        if (emptyHeader && !this.format.getAllowMissingColumnNames()) {
                            throw new IllegalArgumentException(
@ -512,7 +512,7 @@ public final class CSVParser implements Iterable<CSVRecord>, Closeable {
                    if (header != null) {
                        hdrMap.put(header, Integer.valueOf(i));
                        if (headerNames == null) {
-                        	headerNames = new ArrayList<>(headerRecord.length);
+                            headerNames = new ArrayList<>(headerRecord.length);
                        }
                        headerNames.add(header);
                    }
--- a/src/main/java/org/apache/commons/csv/CSVRecord.java
+++ b/src/main/java/org/apache/commons/csv/CSVRecord.java
@ -281,8 +281,8 @@ public final class CSVRecord implements Serializable, Iterable<String> {
     */
    @Override
    public String toString() {
-        return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values="
-            + Arrays.toString(values) + "]";
+        return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" + 
+            Arrays.toString(values) + "]";
    }

    String[] values() {
--- a/src/site/site.xml
+++ b/src/site/site.xml
@ -34,28 +34,19 @@
    </menu>

    <menu name="Development">
-      <item name="History"               href="/changes-report.html"/>
-      <item name="Mailing Lists"         href="/mail-lists.html"/>
-      <item name="Issue Tracking"        href="/issue-tracking.html"/>
-      <item name="Team"                  href="/team.html"/>
-      <item name="Javadoc trunk"         href="/apidocs/index.html"/>
-      <item name="Javadoc 1.7"           href="/archives/1.7/apidocs/index.html"/>
-      <item name="Javadoc 1.6"           href="/archives/1.6/apidocs/index.html"/>
-      <item name="Javadoc 1.5"           href="/archives/1.5/apidocs/index.html"/>
-      <item name="Javadoc 1.4"           href="/archives/1.4/apidocs/index.html"/>
-      <item name="Javadoc 1.3"           href="/archives/1.3/apidocs/index.html"/>
-      <item name="Javadoc 1.2"           href="/archives/1.2/apidocs/index.html"/>
-      <item name="Javadoc 1.1"           href="/archives/1.1/apidocs/index.html"/>
-      <item name="Javadoc 1.0"           href="/archives/1.0/apidocs/index.html"/>
-    </menu>
-
-    <menu name="Site Archives">
-      <item name="CSV 1.5"       href="/archives/1.5/index.html"/>
-      <item name="CSV 1.4"       href="/archives/1.4/index.html"/>
-      <item name="CSV 1.3"       href="/archives/1.3/index.html"/>
-      <item name="CSV 1.2"       href="/archives/1.2/index.html"/>
-      <item name="CSV 1.1"       href="/archives/1.1/index.html"/>
-      <item name="CSV 1.0"       href="/archives/1.0/index.html"/>
+      <item name="History"         href="/changes-report.html"/>
+      <item name="Mailing Lists"   href="/mail-lists.html"/>
+      <item name="Issue Tracking"  href="/issue-tracking.html"/>
+      <item name="Team"            href="/team.html"/>
+      <item name="Javadoc"         href="/apidocs/index.html"/>
+      <item name="Javadoc 1.7"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.7"/>
+      <item name="Javadoc 1.6"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.6"/>
+      <item name="Javadoc 1.5"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.5"/>
+      <item name="Javadoc 1.4"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.4"/>
+      <item name="Javadoc 1.3"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.3"/>
+      <item name="Javadoc 1.2"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.2"/>
+      <item name="Javadoc 1.1"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.1"/>
+      <item name="Javadoc 1.0"     href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.0"/>
    </menu>

  </body>
--- a/src/site/xdoc/download_csv.xml
+++ b/src/site/xdoc/download_csv.xml
@ -26,22 +26,24 @@ limitations under the License.
 | 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 @@ limitations under the License.
        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>SHA-512</code> hash (<code>*.sha512</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 @@ limitations under the License.
      </p>
    </subsection>
    </section>
-    <section name="Apache Commons CSV 1.6 (Java 7+)">
+    <section name="Apache Commons CSV 1.7 (Java 8)">
      <subsection name="Binaries">
        <table>
          <tr>
-              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.6-bin.tar.gz">commons-csv-1.6-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.6-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.6-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.7-bin.tar.gz">commons-csv-1.7-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.7-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.7-bin.tar.gz.asc">pgp</a></td>
          </tr>
          <tr>
-              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.6-bin.zip">commons-csv-1.6-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.6-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.6-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/binaries/commons-csv-1.7-bin.zip">commons-csv-1.7-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.7-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/binaries/commons-csv-1.7-bin.zip.asc">pgp</a></td>
          </tr>
        </table>
      </subsection>
      <subsection name="Source">
        <table>
          <tr>
-              <td><a href="[preferred]/commons/csv/source/commons-csv-1.6-src.tar.gz">commons-csv-1.6-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.6-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.6-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/source/commons-csv-1.7-src.tar.gz">commons-csv-1.7-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.7-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.7-src.tar.gz.asc">pgp</a></td>
          </tr>
          <tr>
-              <td><a href="[preferred]/commons/csv/source/commons-csv-1.6-src.zip">commons-csv-1.6-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.6-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.6-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/csv/source/commons-csv-1.7-src.zip">commons-csv-1.7-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.7-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/csv/source/commons-csv-1.7-src.zip.asc">pgp</a></td>
          </tr>
        </table>
      </subsection>
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@ -51,13 +51,13 @@ The Javadoc API documents are available online:
 </p>
 <ul>
  <li><a href="apidocs/index.html">Javadoc trunk</a></li>
-  <li><a href="archives/1.6/apidocs/index.html">Javadoc 1.6</a></li>
-  <li><a href="archives/1.5/apidocs/index.html">Javadoc 1.5</a></li>
-  <li><a href="archives/1.4/apidocs/index.html">Javadoc 1.4</a></li>
-  <li><a href="archives/1.3/apidocs/index.html">Javadoc 1.3</a></li>
-  <li><a href="archives/1.2/apidocs/index.html">Javadoc 1.2</a></li>
-  <li><a href="archives/1.1/apidocs/index.html">Javadoc 1.1</a></li>
-  <li><a href="archives/1.0/apidocs/index.html">Javadoc 1.0</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.6">Javadoc 1.6</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.5">Javadoc 1.5</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.4">Javadoc 1.4</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.3">Javadoc 1.3</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.2">Javadoc 1.2</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.1">Javadoc 1.1</a></li>
+  <li><a href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.0">Javadoc 1.0</a></li>
 </ul>
 <p>
 The <a href="source-repository.html">git repository</a> can be
@ -67,13 +67,14 @@ The <a href="source-repository.html">git repository</a> can be
 <!-- ================================================== -->
 <section name="Releases">
 <ul>
-  <li><a href="http://commons.apache.org/csv/download_csv.cgi">Apache Commons CSV 1.6 (mirrors)</a> requires Java 1.7</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.5 (archives)</a> requires Java 1.7</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.4 (archives)</a> requires Java 1.6</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.3 (archives)</a> requires Java 1.6</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.2 (archives)</a> requires Java 1.6</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.1 (archives)</a> requires Java 1.6</li>
-  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.0 (archives)</a> requires Java 1.6</li>
+  <li><a href="http://commons.apache.org/csv/download_csv.cgi">Apache Commons CSV 1.7 (mirrors)</a> requires Java 8</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.6 (archives)</a> requires Java 7</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.5 (archives)</a> requires Java 7</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.4 (archives)</a> requires Java 6</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.3 (archives)</a> requires Java 6</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.2 (archives)</a> requires Java 6</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.1 (archives)</a> requires Java 6</li>
+  <li><a href="http://archive.apache.org/dist/commons/csv/">Apache Commons CSV 1.0 (archives)</a> requires Java 6</li>
 </ul>
 <p>
 See the
@ -91,7 +92,7 @@ For previous releases, see the <a href="http://archive.apache.org/dist/commons/c
  <pre>&lt;dependency&gt;
    &lt;groupId&gt;org.apache.commons&lt;/groupId&gt;
    &lt;artifactId&gt;commons-csv&lt;/artifactId&gt;
-    &lt;version&gt;1.6&lt;/version&gt;
+    &lt;version&gt;1.7&lt;/version&gt;
 &lt;/dependency&gt;</pre>
 </p>
 <p>
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@ -26,7 +26,7 @@ limitations under the License.
 | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
 +======================================================================+
 |                                                                      |
- | 1) Re-generate using: mvn commons:jira-page                          |
+ | 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)             |
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@ -26,7 +26,7 @@ limitations under the License.
 | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
 +======================================================================+
 |                                                                      |
- | 1) Re-generate using: mvn commons:mail-page                          |
+ | 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)          |
--- a/src/site/xdoc/user-guide.xml
+++ b/src/site/xdoc/user-guide.xml
@ -34,14 +34,16 @@ limitations under the License.
      The CSVFormat class provides some commonly used CSV variants:
      
      <dl>
-        <dr><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#DEFAULT">DEFAULT</a></dr><dd>Standard Comma Separated Value format, as for RFC4180 but allowing empty lines.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#DEFAULT">DEFAULT</a></dt><dd>Standard Comma Separated Value format, as for RFC4180 but allowing empty lines.</dd>
        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#EXCEL">EXCEL</a></dt><dd>The Microsoft Excel CSV format.</dd>
-        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#INFORMIX_UNLOAD">INFORMIX_UNLOAD</a></dt><dd>Informix <a href="http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm">UNLOAD</a> format used by the <code>UNLOAD TO file_name</code> operation.</dd>
-        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#INFORMIX_UNLOAD_CSV">INFORMIX_UNLOAD_CSV</a></dt><dd>Informix <a href="http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm">CSV UNLOAD</a> format used by the <code>UNLOAD TO file_name</code> operation (escaping is disabled.)</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#INFORMIX_UNLOAD">INFORMIX_UNLOAD<sup>1.3</sup></a></dt><dd>Informix <a href="http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm">UNLOAD</a> format used by the <code>UNLOAD TO file_name</code> operation.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#INFORMIX_UNLOAD_CSV">INFORMIX_UNLOAD_CSV<sup>1.3</sup></a></dt><dd>Informix <a href="http://www.ibm.com/support/knowledgecenter/SSBJG3_2.5.0/com.ibm.gen_busug.doc/c_fgl_InOutSql_UNLOAD.htm">CSV UNLOAD</a> format used by the <code>UNLOAD TO file_name</code> operation (escaping is disabled.)</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#MYSQL">MONGO_CSV<sup>1.7</sup></a></dt><dd>MongoDB CSV format used by the <code>mongoexport</code> operation.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#MYSQL">MONGO_TSV<sup>1.7</sup></a></dt><dd>MongoDB TSV format used by the <code>mongoexport</code> operation.</dd>
        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#MYSQL">MYSQL</a></dt><dd>The MySQL CSV format.</dd>
-        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#ORACLE">ORACLE</a></dt><dd>Default Oracle format used by the SQL*Loader utility.</dd>
-        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#POSTGRESSQL_CSV">POSTGRESSQL_CSV</a></dt><dd>Default PostgreSQL CSV format used by the COPY operation.</dd>
-        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#POSTGRESSQL_TEXT">POSTGRESSQL_TEXT</a></dt><dd>Default PostgreSQL text format used by the COPY operation.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#ORACLE">ORACLE<sup>1.6</sup></a></dt><dd>Default Oracle format used by the SQL*Loader utility.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#POSTGRESSQL_CSV">POSTGRESSQL_CSV<sup>1.5</sup></a></dt><dd>Default PostgreSQL CSV format used by the COPY operation.</dd>
+        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#POSTGRESSQL_TEXT">POSTGRESSQL_TEXT<sup>1.5</sup></a></dt><dd>Default PostgreSQL text format used by the COPY operation.</dd>
        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#RFC4180">RFC-4180</a></dt><dd>The RFC-4180 format defined by <a href="https://tools.ietf.org/html/rfc4180">RFC-4180</a>.</dd>
        <dt><a href="http://commons.apache.org/proper/commons-csv/apidocs/org/apache/commons/csv/CSVFormat.html#TDF">TDF</a></dt><dd>A tab delimited format.</dd>
      </dl>
--- a/src/test/java/org/apache/commons/csv/CSVParserTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVParserTest.java
@ -423,7 +423,7 @@ public class CSVParserTest {

    /**
     * Tests an exported Excel worksheet with a header row and rows that have more columns than the headers
-     * @throws Exception 
+     * @throws Exception
     */
    @Test
    public void testExcelHeaderCountLessThanData() throws Exception {