[commons-csv] 04/07: Merge tag 'upstream/1.4'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-csv.

commit b7b244dc1e564be877c1afdc7bb8690cfc798f1d
Merge: 061402a 9162243
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 28 22:56:37 2016 +0200

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4

 NOTICE.txt                                         |  19 +-
 RELEASE-NOTES.txt                                  |  98 ++-
 pom.xml                                            |  30 +-
 src/{main => }/assembly/bin.xml                    |   0
 src/{main => }/assembly/src.xml                    |   0
 src/changes/changes.xml                            |  21 +-
 src/changes/release-notes.vm                       |   2 +-
 .../java/org/apache/commons/csv/Assertions.java    |   6 +-
 .../java/org/apache/commons/csv/CSVFormat.java     | 862 +++++++++++++++++----
 .../java/org/apache/commons/csv/CSVParser.java     |  28 +-
 .../java/org/apache/commons/csv/CSVPrinter.java    | 191 +----
 .../java/org/apache/commons/csv/CSVRecord.java     |  18 +-
 .../java/org/apache/commons/csv/Constants.java     |  47 +-
 .../apache/commons/csv/ExtendedBufferedReader.java |   4 +-
 src/main/java/org/apache/commons/csv/Lexer.java    |   8 +-
 src/site/site.xml                                  |   4 +
 src/site/xdoc/cvs-usage.xml                        |  52 --
 src/site/xdoc/download_csv.xml                     |  60 +-
 src/site/xdoc/examples.xml                         |  31 -
 src/site/xdoc/index.xml                            |  18 +-
 src/site/xdoc/issue-tracking.xml                   |  30 +-
 src/site/xdoc/mail-lists.xml                       |   2 +-
 src/site/xdoc/user-guide.xml                       | 179 ++++-
 .../org/apache/commons/csv/CSVFileParserTest.java  |  10 +-
 .../java/org/apache/commons/csv/CSVFormatTest.java |  33 +-
 .../java/org/apache/commons/csv/CSVParserTest.java | 167 ++--
 .../org/apache/commons/csv/CSVPrinterTest.java     | 781 +++++++++++++------
 .../java/org/apache/commons/csv/FercGovTest.java   |  89 ---
 src/test/java/org/apache/commons/csv/Utils.java    |   6 +-
 .../apache/commons/csv/bugs/JiraCsv164Test.java    |  55 ++
 .../apache/commons/csv/bugs/JiraCsv167Test.java    |  87 +++
 src/test/resources/csv-167/sample1.csv             |   8 +
 src/test/resources/ferc.gov/contract.txt           |  23 -
 src/test/resources/ferc.gov/readme.txt             |   1 -
 src/test/resources/ferc.gov/transaction.txt        |  25 -
 35 files changed, 1966 insertions(+), 1029 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-csv.git