Skip to content

Commit 42f9de5

Browse files
committed
Prepare for the next release candidate
1 parent da62d92 commit 42f9de5

File tree

6 files changed

+102
-35
lines changed

6 files changed

+102
-35
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(the "License"); you may not use this file except in compliance with
77
the License. You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
https://www.apache.org/licenses/LICENSE-2.0
1010
1111
Unless required by applicable law or agreed to in writing, software
1212
distributed under the License is distributed on an "AS IS" BASIS,
@@ -61,11 +61,11 @@ Making Changes
6161

6262
+ Create a _topic branch_ for your isolated work.
6363
* Usually you should base your branch from the `master` branch.
64-
* A good topic branch name can be the JIRA bug ID plus a keyword, for example, `CSV-123-InputStream`.
64+
* A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `CSV-123-InputStream`.
6565
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
6666
+ Make commits of logical units.
6767
* Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
68-
* For example, `[CSV-123] Close input stream earlier`
68+
* For example, `[CSV-123] Close input stream sooner`
6969
+ Respect the original code style:
7070
+ Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing.
7171
+ Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(the "License"); you may not use this file except in compliance with
77
the License. You may obtain a copy of the License at
88
9-
http://www.apache.org/licenses/LICENSE-2.0
9+
https://www.apache.org/licenses/LICENSE-2.0
1010
1111
Unless required by applicable law or agreed to in writing, software
1212
distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,7 +45,7 @@ Apache Commons CSV
4545

4646
[![Java CI](https://github.com/apache/commons-csv/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-csv/actions/workflows/maven.yml)
4747
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.commons/commons-csv?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.commons/commons-csv)
48-
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.13.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.13.0)
48+
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.14.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.14.0)
4949
[![CodeQL](https://github.com/apache/commons-csv/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-csv/actions/workflows/codeql-analysis.yml)
5050
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-csv/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-csv)
5151

@@ -68,7 +68,7 @@ Alternatively, you can pull it from the central Maven repositories:
6868
<dependency>
6969
<groupId>org.apache.commons</groupId>
7070
<artifactId>commons-csv</artifactId>
71-
<version>1.13.0</version>
71+
<version>1.14.0</version>
7272
</dependency>
7373
```
7474

RELEASE-NOTES.txt

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,64 @@
1+
Apache Commons CSV 1.14.0 Release Notes
2+
3+
This document contains the release notes for the 1.14.0 version of Apache Commons CSV.
4+
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
5+
6+
Commons CSV requires at least Java 8.
7+
8+
The Apache Commons CSV library provides a simple interface for reading and writing CSV files of various types.
9+
10+
This is a feature and maintenance release. Java 8 or later is required.
11+
12+
Changes in this version include:
13+
14+
New Features
15+
------------
16+
17+
* Define and use Maven property commons.jmh.version. Thanks to Gary Gregory.
18+
* Add CSVFormat.Builder.setMaxRows(long). Thanks to Gary Gregory.
19+
* Add CSVFormat.getMaxRows(). Thanks to Gary Gregory.
20+
* CSVPrinter.printRecords(ResultSet) knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
21+
* CSVPrinter.printRecords(Iterable) knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
22+
* CSVPrinter.printRecords(Stream) knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
23+
* CSVParser.stream() knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
24+
* CSVParser.getRecords() knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
25+
* CSVParser.iterator() knows how to use CSVFormat's maxRows. Thanks to Gary Gregory.
26+
27+
Fixed Bugs
28+
----------
29+
30+
* CSV-317: Release history link changed from changes-report.html to changes.html #516. Thanks to Filipe Roque.
31+
* Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80). Thanks to Gary Gregory.
32+
* CSVParser.parse(URL, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)). Thanks to Gary Gregory.
33+
* CSVParser.parse(String, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)). Thanks to Gary Gregory.
34+
* CSVParser.parse(File, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)). Thanks to Gary Gregory.
35+
* CSVParser.parse(Path, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)). Thanks to Gary Gregory.
36+
* CSVParser.parse(InputStream, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)). Thanks to Gary Gregory.
37+
* CSVParser.parse(*) methods with a null Charset maps to Charset.defaultCharset(). Thanks to Gary Gregory.
38+
* Fix possible NullPointerException in Token.toString(). Thanks to Gary Gregory.
39+
40+
Changes
41+
-------
42+
43+
* Bump com.opencsv:opencsv from 5.9 to 5.10. Thanks to Gary Gregory.
44+
* Bump commons-codec:commons-codec from 1.17.2 to 1.18.0 #522. Thanks to Gary Gregory.
45+
* Bump org.apache.commons:commons-parent from 79 to 81. Thanks to Gary Gregory.
46+
47+
48+
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes.html
49+
50+
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
51+
patches, or suggestions for improvement, see the Apache Commons CSV website:
52+
53+
https://commons.apache.org/proper/commons-csv/
54+
55+
Download page: https://commons.apache.org/proper/commons-csv/download_csv.cgi
56+
57+
Have fun!
58+
-Apache Commons CSV team
59+
60+
------------------------------------------------------------------------------
61+
162
Apache Commons CSV Version 1.13.0 Release Notes
263

364
This document contains the release notes for the 1.13.0 version of Apache Commons CSV.

src/site/xdoc/download_csv.xml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -56,10 +56,12 @@ limitations under the License.
5656
| |
5757
+======================================================================+
5858
-->
59-
<document>
59+
<document xmlns="http://maven.apache.org/XDOC/2.0"
60+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
61+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
6062
<properties>
6163
<title>Download Apache Commons CSV</title>
62-
<author email="[email protected]">Apache Commons Documentation Team</author>
64+
<author email="[email protected]">Apache Commons Team</author>
6365
</properties>
6466
<body>
6567
<section name="Download Apache Commons CSV">
@@ -79,7 +81,7 @@ limitations under the License.
7981
mirrors (at the end of the mirrors list) that should be
8082
available.
8183
<br></br>
82-
[if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
84+
[if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" alt="Logo"></img></a>[end]
8385
</p>
8486

8587
<form action="[location]" method="get" id="SelectMirror">
@@ -113,32 +115,32 @@ limitations under the License.
113115
</p>
114116
</subsection>
115117
</section>
116-
<section name="Apache Commons CSV 1.13.0 (Java 8 or above)">
118+
<section name="Apache Commons CSV 1.14.0 (Java 8 or above)">
117119
<subsection name="Binaries">
118120
<table>
119121
<tr>
120-
<td><a href="[preferred]/commons/csv/binaries/commons-csv-1.13.0-bin.tar.gz">commons-csv-1.13.0-bin.tar.gz</a></td>
121-
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.13.0-bin.tar.gz.sha512">sha512</a></td>
122-
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.13.0-bin.tar.gz.asc">pgp</a></td>
122+
<td><a href="[preferred]/commons/csv/binaries/commons-csv-1.14.0-bin.tar.gz">commons-csv-1.14.0-bin.tar.gz</a></td>
123+
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.14.0-bin.tar.gz.sha512">sha512</a></td>
124+
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.14.0-bin.tar.gz.asc">pgp</a></td>
123125
</tr>
124126
<tr>
125-
<td><a href="[preferred]/commons/csv/binaries/commons-csv-1.13.0-bin.zip">commons-csv-1.13.0-bin.zip</a></td>
126-
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.13.0-bin.zip.sha512">sha512</a></td>
127-
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.13.0-bin.zip.asc">pgp</a></td>
127+
<td><a href="[preferred]/commons/csv/binaries/commons-csv-1.14.0-bin.zip">commons-csv-1.14.0-bin.zip</a></td>
128+
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.14.0-bin.zip.sha512">sha512</a></td>
129+
<td><a href="https://downloads.apache.org/commons/csv/binaries/commons-csv-1.14.0-bin.zip.asc">pgp</a></td>
128130
</tr>
129131
</table>
130132
</subsection>
131133
<subsection name="Source">
132134
<table>
133135
<tr>
134-
<td><a href="[preferred]/commons/csv/source/commons-csv-1.13.0-src.tar.gz">commons-csv-1.13.0-src.tar.gz</a></td>
135-
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.13.0-src.tar.gz.sha512">sha512</a></td>
136-
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.13.0-src.tar.gz.asc">pgp</a></td>
136+
<td><a href="[preferred]/commons/csv/source/commons-csv-1.14.0-src.tar.gz">commons-csv-1.14.0-src.tar.gz</a></td>
137+
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.14.0-src.tar.gz.sha512">sha512</a></td>
138+
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.14.0-src.tar.gz.asc">pgp</a></td>
137139
</tr>
138140
<tr>
139-
<td><a href="[preferred]/commons/csv/source/commons-csv-1.13.0-src.zip">commons-csv-1.13.0-src.zip</a></td>
140-
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.13.0-src.zip.sha512">sha512</a></td>
141-
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.13.0-src.zip.asc">pgp</a></td>
141+
<td><a href="[preferred]/commons/csv/source/commons-csv-1.14.0-src.zip">commons-csv-1.14.0-src.zip</a></td>
142+
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.14.0-src.zip.sha512">sha512</a></td>
143+
<td><a href="https://downloads.apache.org/commons/csv/source/commons-csv-1.14.0-src.zip.asc">pgp</a></td>
142144
</tr>
143145
</table>
144146
</subsection>

src/site/xdoc/issue-tracking.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,10 +41,12 @@ limitations under the License.
4141
| |
4242
+======================================================================+
4343
-->
44-
<document>
44+
<document xmlns="http://maven.apache.org/XDOC/2.0"
45+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
46+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
4547
<properties>
4648
<title>Apache Commons CSV Issue tracking</title>
47-
<author email="[email protected]">Apache Commons Documentation Team</author>
49+
<author email="[email protected]">Apache Commons Team</author>
4850
</properties>
4951
<body>
5052

@@ -64,6 +66,7 @@ limitations under the License.
6466
<p>
6567
If you would like to report a bug, or raise an enhancement request with
6668
Apache Commons CSV please do the following:
69+
</p>
6770
<ol>
6871
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313222&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
6972
If you find your issue listed then please add a comment with your details.</li>
@@ -73,16 +76,15 @@ limitations under the License.
7376
<li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313222&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
7477
or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313222&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
7578
</ol>
76-
</p>
7779

7880
<p>
7981
Please also remember these points:
82+
</p>
8083
<ul>
8184
<li>the more information you provide, the better we can help you</li>
8285
<li>test cases are vital, particularly for any proposed enhancements</li>
8386
<li>the developers of Apache Commons CSV are all unpaid volunteers</li>
8487
</ul>
85-
</p>
8688

8789
<p>
8890
For more information on creating patches see the
@@ -91,12 +93,12 @@ limitations under the License.
9193

9294
<p>
9395
You may also find these links useful:
96+
</p>
9497
<ul>
9598
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313222&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons CSV bugs</a></li>
9699
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313222&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons CSV bugs</a></li>
97100
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12313222&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons CSV bugs</a></li>
98101
</ul>
99-
</p>
100102
</section>
101103
</body>
102104
</document>

src/site/xdoc/mail-lists.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -39,10 +39,12 @@ limitations under the License.
3939
| |
4040
+======================================================================+
4141
-->
42-
<document>
42+
<document xmlns="http://maven.apache.org/XDOC/2.0"
43+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
4345
<properties>
4446
<title>Apache Commons CSV Mailing Lists</title>
45-
<author email="[email protected]">Apache Commons Documentation Team</author>
47+
<author email="[email protected]">Apache Commons Team</author>
4648
</properties>
4749
<body>
4850

@@ -53,10 +55,10 @@ limitations under the License.
5355
To make it easier for people to only read messages related to components they are interested in,
5456
the convention in Commons is to prefix the subject line of messages with the component's name,
5557
for example:
56-
<ul>
57-
<li>[csv] Problem with the ...</li>
58-
</ul>
5958
</p>
59+
<ul>
60+
<li>[csv] Problem with the ...</li>
61+
</ul>
6062
<p>
6163
Questions related to the usage of Apache Commons CSV should be posted to the
6264
<a href="https://lists.apache.org/[email protected]">User List</a>.

0 commit comments

Comments
 (0)