Author: britter
Date: Thu Jul 17 15:23:10 2014
New Revision: 1611389
URL: http://svn.apache.org/r1611389
Log:
CSV-125: No longer works with Java 6. Changing source level back to Java 6
Modified:
commons/proper/csv/trunk/pom.xml
commons/proper/csv/trunk/src/changes/changes.xml
commons/proper/csv/trunk/src/site/xdoc/index.xml
commons/proper/csv/trunk/src/site/xdoc/user-guide.xml
Modified: commons/proper/csv/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/pom.xml?rev=1611389&r1=1611388&r2=1611389&view=diff
==============================================================================
--- commons/proper/csv/trunk/pom.xml (original)
+++ commons/proper/csv/trunk/pom.xml Thu Jul 17 15:23:10 2014
@@ -49,7 +49,8 @@ CSV files of various types.
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.180</version>
+ <!-- 1.3.172 requires Java 1.6 -->
+ <version>1.3.168</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -119,8 +120,8 @@ CSV files of various types.
<commons.componentid>csv</commons.componentid>
<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>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</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>
Modified: commons/proper/csv/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/changes/changes.xml?rev=1611389&r1=1611388&r2=1611389&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/changes/changes.xml (original)
+++ commons/proper/csv/trunk/src/changes/changes.xml Thu Jul 17 15:23:10 2014
@@ -39,7 +39,8 @@
</properties>
<body>
- <release version="1.0" date="TBD" description="First release">
+ <release version="1.0" date="TBD" description="First release">
+ <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>
<action issue="CSV-121" type="add" dev="ggregory" due-to="Sebastian
Hardt">IllegalArgumentException thrown when the header contains duplicate names
when the column names are empty.</action>
Modified: commons/proper/csv/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/site/xdoc/index.xml?rev=1611389&r1=1611388&r2=1611389&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/csv/trunk/src/site/xdoc/index.xml Thu Jul 17 15:23:10 2014
@@ -41,7 +41,7 @@ limitations under the License.
and various <a href="project-reports.html">project reports</a> are
provided.
</p>
<p>
- The JavaDoc API documents for the <a
href="javadocs/api-1.0/index.html">current stable release 1.0</a> [Java 7.0+]
can be viewed in a web browser.
+ The JavaDoc API documents for the <a
href="javadocs/api-1.0/index.html">current stable release 1.0</a> [Java 6.0+]
can be viewed in a web browser.
</p>
<p>
The <a href="source-repository.html">subversion repository</a> can be
Modified: commons/proper/csv/trunk/src/site/xdoc/user-guide.xml
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/site/xdoc/user-guide.xml?rev=1611389&r1=1611388&r2=1611389&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/site/xdoc/user-guide.xml (original)
+++ commons/proper/csv/trunk/src/site/xdoc/user-guide.xml Thu Jul 17 15:23:10
2014
@@ -39,14 +39,16 @@ for (CSVRecord record : records) {
class from <a href="https://commons.apache.org/proper/commons-io/";>Apache
Commons IO</a> for example:
</p>
<source>final URL url = ...;
-try (
- final Reader reader = new InputStreamReader(new
BOMInputStream(url.openStream()), StandardCharsets.UTF_8);
- final CSVParser parser = new CSVParser(reader,
CSVFormat.EXCEL.withHeader());
-) {
+final Reader reader = new InputStreamReader(new
BOMInputStream(url.openStream()), "UTF-8");
+final CSVParser parser = new CSVParser(reader, CSVFormat.EXCEL.withHeader());
+try {
for (final CSVRecord record : parser) {
final String string = record.get("SomeColumn");
...
}
+} finally {
+ parser.close();
+ reader.close();
}</source>
</section>
<!-- ================================================== -->
