Merge remote-tracking branch 'upstream/master'

Author: aeschwabe

.travis.yml

@@ -14,15 +14,11 @@
 # limitations under the License.
 
 language: java
-sudo: false
-
-script:
-  - mvn
 
 jdk:
-  - openjdk7
   - oraclejdk8
   - oraclejdk9
 
 after_success:
-  - mvn -B -V -Ptravis-jacoco clean test jacoco:report coveralls:report
+  - mvn -B -V clean test jacoco:report coveralls:report -Ptravis-jacoco
+  

CONTRIBUTING.md

@@ -50,7 +50,7 @@ Getting Started
 
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons CSV's scope.
++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons CSV's scope.
 + Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.
@@ -107,7 +107,7 @@ Additional Resources
 + [Apache Commons CSV JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
 + `#apache-commons` IRC channel on `irc.freenode.net`
 

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Commons CSV
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

@@ -43,10 +43,10 @@
 Apache Commons CSV
 ===================
 
-[![Build Status](https://travis-ci.org/apache/commons-csv.svg?branch=master)](https://travis-ci.org/apache/commons-csv)
-[![Coverage Status](https://coveralls.io/repos/apache/commons-csv/badge.svg?branch=master)](https://coveralls.io/r/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/)
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.6.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.6)
 
 The Apache Commons CSV library provides a simple interface for reading and writing
 CSV files of various types.
@@ -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.5</version>
+  <version>1.6</version>
 </dependency>
 ```
 

RELEASE-NOTES.txt

@@ -1,3 +1,57 @@
+                        Apache Commons CSV
+                            Version 1.6
+                           Release Notes
+
+
+INTRODUCTION:
+
+This document contains the release notes for the 1.6 version of
+Apache Commons CSV. Commons CSV reads and writes files in variations of the
+Comma Separated Value (CSV) format.
+
+CSV requires at least Java 7.
+
+The Apache Commons CSV library provides a simple interface for reading and
+writing CSV files of various types.
+
+Feature and bug fix release.
+
+Changes in this version include:
+
+NEW FEATURES
+==============
+
+o CSV-217:  Add autoFlush option for CsvPrinter. PR #24.
+            Thanks to Korolyov Alexei.
+o CSV-220:  Add API org.apache.commons.csv.CSVFormat.withSystemRecordSeparator().
+            Thanks to Gary Gregory.
+
+FIXED BUGS
+============
+
+o CSV-219:  The behavior of quote char using is not similar as Excel does when
+            the first string contains CJK char(s). Thanks to Zhang Hongda.
+o CSV-172:  Don't quote cells just because they have UTF-8 encoded characters.
+            Thanks to Andrew Pennebaker.
+o CSV-223:  Inconsistency between Javadoc of CSVFormat DEFAULT EXCEL.
+            Thanks to Samuel Martin.
+o CSV-209:  Create CSVFormat.ORACLE preset. Thanks to Gary Gregory.
+o CSV-224:  Some multi-iterator parsing peek sequences incorrectly consume
+            elements. Thanks to David Warshaw.
+o CSV-225:  Parse method should avoid creating a redundant BufferedReader.
+            Thanks to Anson Schwabecher.
+
+CHANGES
+=========
+
+o CSV-231:  Add more documentation to CSVPrinter.
+
+
+Have fun!
+-Apache Commons CSV team
+
+------------------------------------------------------------------------------
+
                         Apache Commons CSV
                             Version 1.5
                            Release Notes

pom.xml

@@ -20,10 +20,10 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>43</version>
+    <version>47</version>
   </parent>
   <artifactId>commons-csv</artifactId>
-  <version>1.6-SNAPSHOT</version>
+  <version>1.7-SNAPSHOT</version>
   <name>Apache Commons CSV</name>
   <url>http://commons.apache.org/proper/commons-csv/</url>
   <description>
@@ -53,13 +53,13 @@ CSV files of various types.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
+      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.196</version>
+      <version>1.4.198</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -134,24 +134,30 @@ CSV files of various types.
   </distributionManagement>
 
   <properties>
-    <commons.release.version>1.6</commons.release.version>
-    <commons.release.desc>(Java 7+)</commons.release.desc>
+    <commons.release.version>1.7</commons.release.version>
+    <commons.release.desc>(Java 8)</commons.release.desc>
     <!-- The RC version used in the staging repository URL. -->
     <commons.rc.version>RC1</commons.rc.version>
     <commons.componentid>csv</commons.componentid>
     <commons.module.name>org.apache.commons.csv</commons.module.name>
     <commons.jira.id>CSV</commons.jira.id>
     <commons.jira.pid>12313222</commons.jira.pid>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <project.inceptionYear>2005</project.inceptionYear>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <!-- Ensure copies work OK (can be removed later when this is in parent POM) -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <commons.encoding>UTF-8</commons.encoding>
 
-    <checkstyle.version>2.17</checkstyle.version>
+    <checkstyle.version>3.0.0</checkstyle.version>
     <checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
     <checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt</checkstyle.resourceExcludes>
+
+    <!-- Fix for COMMONSSITE-124 remove once commons-parent 48 has been released -->
+    <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${project.artifactId}</commons.scmPubUrl>
+    <!-- Fix for COMMONSSITE-125 remove once commons-parent 48 has been released -->
+    <commons.osgi.symbolicName>org.apache.commons.${commons.componentid}</commons.osgi.symbolicName>
   </properties>
 
   <build>
@@ -214,7 +220,6 @@ CSV files of various types.
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>${commons.rat.version}</version>
         <!-- Should agree with config in reporting section -->
         <configuration>
           <excludes>
@@ -237,6 +242,7 @@ CSV files of various types.
           </excludes>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 
@@ -263,7 +269,7 @@ CSV files of various types.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.8</version>
+        <version>3.11.0</version>
         <configuration>
           <targetJdk>${maven.compiler.target}</targetJdk>
         </configuration>

src/changes/changes.xml

@@ -38,16 +38,27 @@
     <title>Release Notes</title>
   </properties>
   <body>
-    <release version="1.6" date="2018-MM-DD" description="Feature and bug fix release">
+    <release version="1.7" date="2019-MM-DD" 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 anJ 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>
+      <action issue="CSV-234" type="add" dev="ggregory" due-to="Roberto Benedetti, Gary Gregory">Add support for java.sql.Clob.</action>
+      <action issue="CSV-237" type="update" dev="ggregory" due-to="Gary Gregory">Update to Java 8.</action>
+      <action issue="CSV-238" type="fix" dev="ggregory" due-to="Stephen Olander-Waters">Escape quotes in CLOBs #39.</action>
+    </release>
+    <release version="1.6" date="2018-09-22" description="Feature and bug fix release (Java 7)">
+      <action issue="CSV-231" type="update" dev="britter">Add more documentation to CSVPrinter.</action>
       <action issue="CSV-217" type="add" dev="ggregory" due-to="Korolyov Alexei">Add autoFlush option for CsvPrinter. PR #24.</action>
       <action issue="CSV-219" type="fix" dev="ggregory" due-to="Zhang Hongda">The behavior of quote char using is not similar as Excel does when the first string contains CJK char(s).</action>
       <action issue="CSV-172" type="fix" dev="ggregory" due-to="Andrew Pennebaker">Don't quote cells just because they have UTF-8 encoded characters.</action>
       <action issue="CSV-220" type="add" dev="ggregory" due-to="Gary Gregory">Add API org.apache.commons.csv.CSVFormat.withSystemRecordSeparator().</action>
       <action issue="CSV-223" type="fix" dev="ggregory" due-to="Samuel Martin">Inconsistency between Javadoc of CSVFormat DEFAULT EXCEL.</action>
       <action issue="CSV-209" type="fix" dev="ggregory" due-to="Gary Gregory">Create CSVFormat.ORACLE preset.</action>
-      <action issue="CSV-224" type="fix" dev="ggregory" due-to="David Warshaw">Some Multi Iterator Parsing Peek Sequences Incorrectly Consume Elements.</action>
+      <action issue="CSV-224" type="fix" dev="ggregory" due-to="David Warshaw">Some multi-iterator parsing peek sequences incorrectly consume elements.</action>
+      <action issue="CSV-225" type="fix" dev="ggregory" due-to="Anson Schwabecher">Parse method should avoid creating a redundant BufferedReader.</action>
+      <action issue="CSV-233" type="fix" dev="ggregory" due-to="Gary Gregory">Add predefined CSVFormats for printing MongoDB CSV and TSV.</action>
     </release>
-    <release version="1.5" date="2017-09-03" description="Feature and bug fix release">
+    <release version="1.5" date="2017-09-03" description="Feature and bug fix release (Java 7)">
       <action issue="CSV-203" type="fix" dev="ggregory" due-to="Richard Wheeldon, Kai Paroth">withNullString value is printed without quotes when QuoteMode.ALL is specified; add QuoteMode.ALL_NON_NULL. PR #17.</action>
       <action issue="CSV-194" type="fix" dev="ggregory" due-to="Marc Prud'hommeaux">Fix outdated comments about FileReader in CSVParser #13</action>
       <action issue="CSV-193" type="fix" dev="ggregory" due-to="Matthias Wiehl">Fix incorrect method name 'withFirstRowAsHeader' in user guide.</action>
@@ -62,12 +73,12 @@
       <action issue="CSV-207" type="add" dev="ggregory" due-to="Gary Gregory">Provide a CSV Format for printing PostgreSQL CSV and Text formats.</action>
       <action issue="CSV-214" type="add" dev="ggregory" due-to="Nitin Mahendru, Gary Gregory">Adding a placeholder in the Lexer and CSV parser to store the end-of-line string.</action>
     </release>
-    <release version="1.4" date="2016-05-28" description="Feature and bug fix release">
+    <release version="1.4" date="2016-05-28" description="Feature and bug fix release (Java 6)">
       <action issue="CSV-181" type="update" dev="ggregory" due-to="Gary Gregory">Make CSVPrinter.print(Object) GC-free.</action>
       <action issue="CSV-182" type="add" dev="ggregory" due-to="Gary Gregory">Allow some printing operations directly from CSVFormat.</action>
       <action issue="CSV-183" type="update" dev="ggregory">Drop ferc.gov tests.</action>
     </release>
-    <release version="1.3" date="2016-05-09" description="Feature and bug fix release">
+    <release version="1.3" date="2016-05-09" description="Feature and bug fix release (Java 6)">
       <action issue="CSV-179" type="add" dev="britter">Add shortcut method for using first record as header to CSVFormat</action>
       <action issue="CSV-180" type="add" dev="britter">Add withHeader(Class&lt;? extends Enum&gt;) to CSVFormat</action>
       <action issue="CSV-167" type="update" dev="sebb" due-to="Rene">Comment line hides next record; update Javadoc to make behaviour clear</action>
@@ -81,12 +92,12 @@
       <action issue="CSV-177" type="add" dev="ggregory" due-to="Gary Gregory">Support trimming leading and trailing blanks.</action>
       <action issue="CSV-178" type="add" dev="ggregory" due-to="Gary Gregory">Create default formats for Informix UNLOAD and UNLOAD CSV.</action>
     </release>
-    <release version="1.2" date="2015-08-24" description="Feature and bug fix release">
+    <release version="1.2" date="2015-08-24" description="Feature and bug fix release (Java 6)">
       <action issue="CSV-145" type="fix" dev="ggregory" due-to="Frank Ulbricht">CSVFormat.with* methods clear the header comments</action>
       <action issue="CSV-156" type="fix" dev="ggregory" due-to="Jason Steenstra-Pickens">Incorrect Javadoc on QuoteMode.NONE</action>
       <action issue="CSV-157" type="add" dev="ggregory">Add enum CSVFormat.Predefined that contains the default CSVFormat values.</action>
     </release>
-    <release version="1.1" date="2014-11-16" description="Feature and bug fix release">
+    <release version="1.1" date="2014-11-16" description="Feature and bug fix release (Java 6)">
       <action issue="CSV-140" type="fix" dev="ggregory" due-to="Damjan Jovanovic">QuoteMode.NON_NUMERIC doesn't work with CSVPrinter.printRecords(ResultSet)</action>
       <action issue="CSV-130" type="fix" dev="ggregory" due-to="Sergei Lebedev">CSVFormat#withHeader doesn't work well with #printComment, add withHeaderComments(String...)</action>
       <action issue="CSV-128" type="fix" dev="ggregory">CSVFormat.EXCEL should ignore empty header names</action>
@@ -97,7 +108,7 @@
       <action issue="CSV-131" type="add" dev="ggregory" due-to="Holger Stratmann">Save positions of records to enable random access</action>
       <action issue="CSV-139" type="add" dev="ggregory">CSVPrinter.printRecord(ResultSet) with metadata</action>
     </release>
-    <release version="1.0" date="2014-08-14" description="First release">
+    <release version="1.0" date="2014-08-14" description="First release (Java 6)">
       <action issue="CSV-125" type="fix" dev="britter">No longer works with Java 6</action>
       <action issue="CSV-122" type="fix" dev="britter" due-to="Mike Lewis">NullPointerException when empty header string and and null string of ""</action>
       <action issue="CSV-117" type="update" dev="sebb">Validate format parameters in constructor</action>

src/main/java/org/apache/commons/csv/Assertions.java

@@ -30,7 +30,7 @@ private Assertions() {
         // can not be instantiated
     }
 
-    public static void notNull(final Object parameter, final String parameterName) {
+    static void notNull(final Object parameter, final String parameterName) {
         if (parameter == null) {
             throw new IllegalArgumentException("Parameter '" + parameterName + "' must not be null!");
         }