Skip to content

Commit 33bfaee

Browse files
author
Gary Gregory
committed
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.
1 parent b94e5ac commit 33bfaee

16 files changed

Lines changed: 152 additions & 113 deletions

File tree

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2626
+======================================================================+
2727
| |
28-
| 1) Re-generate using: mvn commons:contributing-md |
28+
| 1) Re-generate using: mvn commons-build:contributing-md |
2929
| |
3030
| 2) Set the following properties in the component's pom: |
3131
| - commons.jira.id (required, alphabetic, upper case) |

‎NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Commons CSV
2-
Copyright 2005-2018 The Apache Software Foundation
2+
Copyright 2005-2019 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2626
+======================================================================+
2727
| |
28-
| 1) Re-generate using: mvn commons:readme-md |
28+
| 1) Re-generate using: mvn commons-build:readme-md |
2929
| |
3030
| 2) Set the following properties in the component's pom: |
3131
| - commons.componentid (required, alphabetic, lower case) |
@@ -46,7 +46,7 @@ Apache Commons CSV
4646
[![Build Status](https://travis-ci.org/apache/commons-csv.svg)](https://travis-ci.org/apache/commons-csv)
4747
[![Coverage Status](https://coveralls.io/repos/apache/commons-csv/badge.svg)](https://coveralls.io/r/apache/commons-csv)
4848
[![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/)
49-
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.6.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.6)
49+
[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-csv/1.7.svg)](https://javadoc.io/doc/org.apache.commons/commons-csv/1.7)
5050

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

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

6161
Where can I get the latest release?
@@ -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.6</version>
71+
<version>1.7</version>
7272
</dependency>
7373
```
7474

‎RELEASE-NOTES.txt‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,59 @@
11
Apache Commons CSV
2-
Version 1.6
3-
Release Notes
2+
Version 1.7
3+
Release Notes
4+
5+
6+
INTRODUCTION:
7+
8+
This document contains the release notes for the 1.7 version of Apache Commons CSV.
9+
Commons CSV reads and writes files in variations of the Comma Separated Value (CSV) format.
10+
11+
The Apache Commons CSV library provides a simple interface for reading and writing
12+
CSV files of various types.
13+
14+
Feature and bug fix release (Java 8)
15+
16+
Changes in this version include:
17+
18+
NEW FEATURES
19+
==============
20+
21+
o CSV-233: Add predefined CSVFormats for printing MongoDB CSV and TSV. Thanks to Gary Gregory.
22+
o CSV-234: Add support for java.sql.Clob. Thanks to Roberto Benedetti, Gary Gregory.
23+
o CSV-239: Cannot get headers in column order from CSVRecord. Thanks to Gary Gregory, Dave Moten.
24+
25+
FIXED BUGS
26+
============
27+
28+
o CSV-208: Fix escape character for POSTGRESQL_TEXT and POSTGRESQL_CSV formats. Thanks to Jurrie Overgoor.
29+
o CSV-232: Site link "Source Repository" does not work. Thanks to Jurrie Overgoor, Gary Gregory.
30+
o CSV-238: Escape quotes in CLOBs #39. Thanks to Stephen Olander-Waters.
31+
32+
CHANGES
33+
=========
34+
35+
o CSV-237: Update to Java 8. Thanks to Gary Gregory.
36+
o Update tests from H2 1.4.198 to 1.4.199. Thanks to Gary Gregory.
37+
38+
39+
Historical list of changes: http://commons.apache.org/proper/commons-csv/changes-report.html
40+
41+
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
42+
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
43+
44+
http://commons.apache.org/proper/commons-csv/
45+
46+
Download it from http://commons.apache.org/proper/commons-csv/download_csv.cgi
47+
48+
Have fun!
49+
-Apache Commons CSV team
50+
51+
------------------------------------------------------------------------------
52+
53+
54+
Apache Commons CSV
55+
Version 1.6
56+
Release Notes
457

558

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

55108
Apache Commons CSV
56-
Version 1.5
57-
Release Notes
109+
Version 1.5
110+
Release Notes
58111

59112

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

112165
Apache Commons CSV
113-
Version 1.4
114-
Release Notes
166+
Version 1.4
167+
Release Notes
115168

116169

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

156209
Apache Commons CSV
157-
Version 1.3
158-
Release Notes
210+
Version 1.3
211+
Release Notes
159212

160213

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

205258
Apache Commons CSV
206-
Version 1.2
207-
Release Notes
259+
Version 1.2
260+
Release Notes
208261

209262

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

248301
Apache Commons CSV
249-
Version 1.1
250-
Release Notes
302+
Version 1.1
303+
Release Notes
251304

252305

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

294347
Apache Commons CSV
295-
Version 1.0
296-
Release Notes
348+
Version 1.0
349+
Release Notes
297350

298351

299352
INTRODUCTION:

‎pom.xml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,14 @@ CSV files of various types.
156156
<checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt</checkstyle.resourceExcludes>
157157

158158
<japicmp.skip>false</japicmp.skip>
159+
160+
<commons.release.isDistModule>true</commons.release.isDistModule>
161+
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
162+
<commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
159163
</properties>
160164

161165
<build>
162166
<defaultGoal>clean verify apache-rat:check clirr:check javadoc:javadoc</defaultGoal>
163-
<pluginManagement>
164-
<plugins>
165-
<plugin>
166-
<groupId>org.apache.maven.plugins</groupId>
167-
<artifactId>maven-scm-publish-plugin</artifactId>
168-
<version>1.1</version>
169-
<configuration>
170-
<ignorePathsToDelete>
171-
<ignorePathToDelete>archives/**</ignorePathToDelete>
172-
</ignorePathsToDelete>
173-
</configuration>
174-
</plugin>
175-
</plugins>
176-
</pluginManagement>
177167
<plugins>
178168
<plugin>
179169
<artifactId>maven-compiler-plugin</artifactId>

‎src/changes/changes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<title>Release Notes</title>
3939
</properties>
4040
<body>
41-
<release version="1.7" date="2019-MM-DD" description="Feature and bug fix release (Java 8)">
41+
<release version="1.7" date="2019-06-01" description="Feature and bug fix release (Java 8)">
4242
<action issue="CSV-233" type="add" dev="ggregory" due-to="Gary Gregory">Add predefined CSVFormats for printing MongoDB CSV and TSV.</action>
4343
<action issue="CSV-208" type="fix" dev="ggregory" due-to="Jurrie Overgoor">Fix escape character for POSTGRESQL_TEXT and POSTGRESQL_CSV formats.</action>
4444
<action issue="CSV-232" type="fix" dev="ggregory" due-to="Jurrie Overgoor, Gary Gregory">Site link "Source Repository" does not work.</action>

‎src/main/java/org/apache/commons/csv/CSVFormat.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -882,13 +882,13 @@ public String format(final Object... values) {
882882

883883
/**
884884
* Returns true if and only if duplicate names are allowed in the headers.
885-
*
885+
*
886886
* @return whether duplicate header names are allowed
887887
* @since 1.7
888888
*/
889889
public boolean getAllowDuplicateHeaderNames() {
890-
return allowDuplicateHeaderNames;
891-
}
890+
return allowDuplicateHeaderNames;
891+
}
892892

893893
/**
894894
* Specifies whether missing column names are allowed when parsing the header line.
@@ -1681,7 +1681,7 @@ private void validate() throws IllegalArgumentException {
16811681

16821682
/**
16831683
* Returns a new {@code CSVFormat} that allows duplicate header names.
1684-
*
1684+
*
16851685
* @return a new {@code CSVFormat} that allows duplicate header names
16861686
* @since 1.7
16871687
*/
@@ -1691,7 +1691,7 @@ public CSVFormat withAllowDuplicateHeaderNames() {
16911691

16921692
/**
16931693
* Returns a new {@code CSVFormat} with duplicate header names behavior set to the given value.
1694-
*
1694+
*
16951695
* @param allowDuplicateHeaderNames the duplicate header names behavior, true to allow, false to disallow.
16961696
* @return a new {@code CSVFormat} with duplicate header names behavior set to the given value.
16971697
* @since 1.7

‎src/main/java/org/apache/commons/csv/CSVParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,9 @@ private Headers createHeaders() throws IOException {
500500
if (containsHeader) {
501501
if (!emptyHeader && !this.format.getAllowDuplicateHeaderNames()) {
502502
throw new IllegalArgumentException(
503-
String.format("The header contains a duplicate name: \"%s\" in %s."
504-
+ " If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
505-
header, Arrays.toString(headerRecord)));
503+
String.format(
504+
"The header contains a duplicate name: \"%s\" in %s. If this is valid then use CSVFormat.withAllowDuplicateHeaderNames().",
505+
header, Arrays.toString(headerRecord)));
506506
}
507507
if (emptyHeader && !this.format.getAllowMissingColumnNames()) {
508508
throw new IllegalArgumentException(
@@ -512,7 +512,7 @@ private Headers createHeaders() throws IOException {
512512
if (header != null) {
513513
hdrMap.put(header, Integer.valueOf(i));
514514
if (headerNames == null) {
515-
headerNames = new ArrayList<>(headerRecord.length);
515+
headerNames = new ArrayList<>(headerRecord.length);
516516
}
517517
headerNames.add(header);
518518
}

‎src/main/java/org/apache/commons/csv/CSVRecord.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ public Map<String, String> toMap() {
281281
*/
282282
@Override
283283
public String toString() {
284-
return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values="
285-
+ Arrays.toString(values) + "]";
284+
return "CSVRecord [comment='" + comment + "', recordNumber=" + recordNumber + ", values=" +
285+
Arrays.toString(values) + "]";
286286
}
287287

288288
String[] values() {

‎src/site/site.xml‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,19 @@
3434
</menu>
3535

3636
<menu name="Development">
37-
<item name="History" href="/changes-report.html"/>
38-
<item name="Mailing Lists" href="/mail-lists.html"/>
39-
<item name="Issue Tracking" href="/issue-tracking.html"/>
40-
<item name="Team" href="/team.html"/>
41-
<item name="Javadoc trunk" href="/apidocs/index.html"/>
42-
<item name="Javadoc 1.7" href="/archives/1.7/apidocs/index.html"/>
43-
<item name="Javadoc 1.6" href="/archives/1.6/apidocs/index.html"/>
44-
<item name="Javadoc 1.5" href="/archives/1.5/apidocs/index.html"/>
45-
<item name="Javadoc 1.4" href="/archives/1.4/apidocs/index.html"/>
46-
<item name="Javadoc 1.3" href="/archives/1.3/apidocs/index.html"/>
47-
<item name="Javadoc 1.2" href="/archives/1.2/apidocs/index.html"/>
48-
<item name="Javadoc 1.1" href="/archives/1.1/apidocs/index.html"/>
49-
<item name="Javadoc 1.0" href="/archives/1.0/apidocs/index.html"/>
50-
</menu>
51-
52-
<menu name="Site Archives">
53-
<item name="CSV 1.5" href="/archives/1.5/index.html"/>
54-
<item name="CSV 1.4" href="/archives/1.4/index.html"/>
55-
<item name="CSV 1.3" href="/archives/1.3/index.html"/>
56-
<item name="CSV 1.2" href="/archives/1.2/index.html"/>
57-
<item name="CSV 1.1" href="/archives/1.1/index.html"/>
58-
<item name="CSV 1.0" href="/archives/1.0/index.html"/>
37+
<item name="History" href="/changes-report.html"/>
38+
<item name="Mailing Lists" href="/mail-lists.html"/>
39+
<item name="Issue Tracking" href="/issue-tracking.html"/>
40+
<item name="Team" href="/team.html"/>
41+
<item name="Javadoc" href="/apidocs/index.html"/>
42+
<item name="Javadoc 1.7" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.7"/>
43+
<item name="Javadoc 1.6" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.6"/>
44+
<item name="Javadoc 1.5" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.5"/>
45+
<item name="Javadoc 1.4" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.4"/>
46+
<item name="Javadoc 1.3" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.3"/>
47+
<item name="Javadoc 1.2" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.2"/>
48+
<item name="Javadoc 1.1" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.1"/>
49+
<item name="Javadoc 1.0" href="https://javadoc.io/doc/org.apache.commons/commons-csv/1.0"/>
5950
</menu>
6051

6152
</body>

0 commit comments

Comments
 (0)