Skip to content

Commit ba8ba60

Browse files
garydgregorygarydgregory
committed
Merge branch 'master' into release
2 parents 540c778 + 4ee216c commit ba8ba60

26 files changed

Lines changed: 950 additions & 300 deletions

‎.asf.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
github:
17+
description: "Apache Commons CSV"
18+
homepage: https://commons.apache.org/csv/
19+
20+
notifications:
21+
commits: [email protected]
22+
issues: [email protected]
23+
pullrequests: [email protected]
24+
jira_options: link label
25+
jobs: [email protected]
26+
issues_bot_dependabot: [email protected]
27+
pullrequests_bot_dependabot: [email protected]

‎.github/GH-ROBOTS.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Keeps on creating FUD PRs in test code
17+
# Does not follow Apache disclosure policies
18+
User-agent: JLLeitschuh/security-research
19+
Disallow: *

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
48+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
4949
with:
5050
persist-credentials: false
51-
- uses: actions/cache@v3.0.11
51+
- uses: actions/cache@v3.2.3
5252
with:
5353
path: ~/.m2/repository
5454
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ jobs:
2929
java: [ 8 ]
3030

3131
steps:
32-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
32+
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
3333
with:
3434
persist-credentials: false
35-
- uses: actions/cache@v3.0.11
35+
- uses: actions/cache@v3.2.3
3636
with:
3737
path: ~/.m2/repository
3838
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3939
restore-keys: |
4040
${{ runner.os }}-maven-
4141
- name: Set up JDK ${{ matrix.java }}
42-
uses: actions/setup-java@v3.5.1
42+
uses: actions/setup-java@v3.9.0
4343
with:
4444
distribution: 'temurin'
4545
java-version: ${{ matrix.java }}

‎.github/workflows/maven.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
# experimental: true
3535

3636
steps:
37-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
37+
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
3838
with:
3939
persist-credentials: false
40-
- uses: actions/cache@v3.0.11
40+
- uses: actions/cache@v3.2.3
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4444
restore-keys: |
4545
${{ runner.os }}-maven-
4646
- name: Set up JDK ${{ matrix.java }}
47-
uses: actions/setup-java@v3.5.1
47+
uses: actions/setup-java@v3.9.0
4848
with:
4949
distribution: 'temurin'
5050
java-version: ${{ matrix.java }}

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
steps:
4141

4242
- name: "Checkout code"
43-
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.0.2
43+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # 3.3.0
4444
with:
4545
persist-credentials: false
4646

4747
- name: "Run analysis"
48-
uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564 # 1.1.2
48+
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # 2.1.2
4949
with:
5050
results_file: results.sarif
5151
results_format: sarif
@@ -57,7 +57,7 @@ jobs:
5757
publish_results: true
5858

5959
- name: "Upload artifact"
60-
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # 3.1.0
60+
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # 3.1.0
6161
with:
6262
name: SARIF file
6363
path: results.sarif

‎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-2022 The Apache Software Foundation
2+
Copyright 2005-2023 The Apache Software Foundation
33

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

‎RELEASE-NOTES.txt‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Commons CSV requires at least Java 8.
1212

1313
The Apache Commons CSV library provides a simple interface for reading and writing CSV files of various types.
1414

15-
This is a feature and bug fix release.
15+
Feature and bug fix release (Java 8)
1616

1717
Changes in this version include:
1818

@@ -39,23 +39,26 @@ o CSVParser.getRecords() now throws UncheckedIOException instead of IO
3939
o CSV-274: Add comments to iterator() and stream() #270. Thanks to Peter Hull, Bruno P. Kinoshita, Gary Gregory.
4040
o CSV-290: Fix wrong assumptions in PostgreSQL formats #265. Thanks to angusdev, Gary Gregory.
4141
o Validate input to setDelimiter(String) for empty string #266. Thanks to Mykola Faryma.
42+
o Bump CSVFormat#serialVersionUID from 1 to 2. Thanks to Dependabot.
43+
o CSVParser: Identify duplicates in null, empty and blank header names #279. Thanks to Alex Herbert.
4244

4345
CHANGES
4446
=======
4547

4648
o Bump actions/cache from 2.1.6 to 3.0.10 #196, #233, #243, #267, #271. Thanks to Dependabot, Gary Gregory.
4749
o Bump actions/checkout from 2.3.4 to 3.1.0 #188, #195, #220, #272. Thanks to Dependabot, Gary Gregory.
4850
o Bump actions/setup-java from 2 to 3.5.1. Thanks to Gary Gregory.
49-
o Bump commons-parent from 52 to 54 #264. Thanks to Gary Gregory.
51+
o Bump actions/upload-artifact from 3.1.0 to 3.1.1 #280. Thanks to Dependabot.
52+
o Bump commons-parent from 52 to 56 #264, #288, #298. Thanks to Gary Gregory.
5053
o Bump checkstyle from 8.44 to 9.2.1 #180, #190, #194, #202, #207. Thanks to Dependabot.
5154
o Bump junit-jupiter from 5.8.0-M1 to 5.9.1 #179, #186, #201, #244, #263. Thanks to Dependabot.
52-
o Bump jmh-core from 1.32 to 1.35 #176, #208, #229. Thanks to Dependabot.
53-
o Bump jmh-generator-annprocess from 1.32 to 1.35 #175, #206, #226. Thanks to Dependabot.
54-
o Bump mockito-core from 3.11.2 to 4.8.0 #187, #197, #204, #212, #230, #237, #251, #259. Thanks to Dependabot, Gary Gregory.
55+
o Bump jmh-core from 1.32 to 1.36 #176, #208, #229, #285. Thanks to Dependabot.
56+
o Bump jmh-generator-annprocess from 1.32 to 1.36 #175, #206, #226, #283. Thanks to Dependabot.
57+
o Bump mockito-core from 3.11.2 to 4.11.0 #187, #197, #204, #212, #230, #237, #251, #259, #284, #292, #297. Thanks to Dependabot, Gary Gregory.
5558
o Bump maven-pmd-plugin from 3.14.0 to 3.19.0 #184, #219, #238, #254, #258. Thanks to Dependabot.
56-
o Bump pmd from 6.36.0 to 6.50.0 #173, #189, #193, #199, #227, #233, #214, #236, #240, #247, #255, #273. Thanks to Dependabot, Gary Gregory.
57-
o Bump opencsv from 5.5.1 to 5.7.0 #182, #221, #260. Thanks to Gary Gregory.
58-
o Bump spotbugs-maven-plugin from 4.3.0 to 4.7.2.1 #192, #198, #203, #211, #225, #234, #242, #245, #261, #275. Thanks to Dependabot.
59+
o Bump pmd from 6.36.0 to 6.52.0 #173, #189, #193, #199, #227, #233, #214, #236, #240, #247, #255, #273. Thanks to Dependabot, Gary Gregory.
60+
o Bump opencsv from 5.5.1 to 5.7.1 #182, #221, #260, #281. Thanks to Gary Gregory.
61+
o Bump spotbugs-maven-plugin from 4.3.0 to 4.7.3.0 #192, #198, #203, #211, #225, #234, #242, #245, #261, #275, #282. Thanks to Dependabot.
5962
o Bump com.github.spotbugs:spotbugs from 4.5.3 to 4.7.2. Thanks to Gary Gregory.
6063
o Bump h2 from 1.4.200 to 2.1.214 #200, #205, #213, #239. Thanks to Dependabot.
6164
o Bump maven-javadoc-plugin from 3.3.0 to 3.4.1. Thanks to Gary Gregory.
@@ -64,11 +67,13 @@ o Bump jacoco-maven-plugin from 0.8.7 to 0.8.8. Thanks to Gary Gregory
6467
o Bump japicmp-maven-plugin from 0.15.3 to 0.16.0. Thanks to Gary Gregory.
6568
o Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 #253. Thanks to Dependabot.
6669

70+
Removed:
71+
o Serialization in CSVFormat is not supported from one version to the next.
6772

6873
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
6974

7075
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
71-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
76+
patches, or suggestions for improvement, see the Apache Commons CSV website:
7277

7378
https://commons.apache.org/proper/commons-csv/
7479

@@ -175,7 +180,7 @@ o Bump biz.aQute.bnd:biz.aQute.bndlib from 5.1.2 to 5.3.0. Thanks to D
175180
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
176181

177182
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
178-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
183+
patches, or suggestions for improvement, see the Apache Commons CSV website:
179184

180185
https://commons.apache.org/proper/commons-csv/
181186

@@ -235,7 +240,7 @@ o Fix typo performance test #55. Thanks to Chen.
235240
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
236241

237242
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
238-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
243+
patches, or suggestions for improvement, see the Apache Commons CSV website:
239244

240245
https://commons.apache.org/proper/commons-csv/
241246

@@ -287,7 +292,7 @@ o Update tests from H2 1.4.198 to 1.4.199. Thanks to Gary Gregory.
287292
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
288293

289294
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
290-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
295+
patches, or suggestions for improvement, see the Apache Commons CSV website:
291296

292297
https://commons.apache.org/proper/commons-csv/
293298

@@ -400,7 +405,7 @@ o CSV-201: Do not use RuntimeException in CSVParser.iterator().new Iterator() {.
400405
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
401406

402407
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
403-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
408+
patches, or suggestions for improvement, see the Apache Commons CSV website:
404409

405410
https://commons.apache.org/proper/commons-csv/
406411

@@ -444,7 +449,7 @@ o CSV-183: Drop ferc.gov tests.
444449
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
445450

446451
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
447-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
452+
patches, or suggestions for improvement, see the Apache Commons CSV website:
448453

449454
https://commons.apache.org/proper/commons-csv/
450455

@@ -536,7 +541,7 @@ o CSV-156: Incorrect Javadoc on QuoteMode.NONE. Thanks to Jason Steenstra-Picke
536541
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
537542

538543
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
539-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
544+
patches, or suggestions for improvement, see the Apache Commons CSV website:
540545

541546
https://commons.apache.org/proper/commons-csv/
542547

@@ -582,7 +587,7 @@ o [CSV-134] Unified parameter validation. Thanks to wu wen.
582587
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
583588

584589
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
585-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
590+
patches, or suggestions for improvement, see the Apache Commons CSV website:
586591

587592
https://commons.apache.org/proper/commons-csv/
588593

@@ -628,7 +633,7 @@ FIXED BUGS
628633
==========
629634

630635
o CSV-125: No longer works with Java 6
631-
o CSV-122: NullPointerException when empty header string and and null string of "".
636+
o CSV-122: NullPointerException when empty header string and null string of "".
632637
Thanks to Mike Lewis.
633638
o CSV-118: CSVRecord.toMap() throws NPE on formats with no
634639
headers. Thanks to Enrique Lara.
@@ -677,7 +682,7 @@ o CSV-27: Decide whether to keep the csv.writer subpackage
677682
Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
678683

679684
For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
680-
patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
685+
patches, or suggestions for improvement, see the Apache Commons CSV website:
681686

682687
https://commons.apache.org/proper/commons-csv/
683688

‎pom.xml‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<parent>
2121
<groupId>org.apache.commons</groupId>
2222
<artifactId>commons-parent</artifactId>
23-
<version>54</version>
23+
<version>56</version>
2424
</parent>
2525
<artifactId>commons-csv</artifactId>
26-
<version>1.10.0</version>
26+
<version>1.10.0-SNAPSHOT</version>
2727
<name>Apache Commons CSV</name>
2828
<url>https://commons.apache.org/proper/commons-csv/</url>
2929
<inceptionYear>2005</inceptionYear>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.mockito</groupId>
4646
<artifactId>mockito-core</artifactId>
47-
<version>4.8.0</version>
47+
<version>4.11.0</version>
4848
<scope>test</scope>
4949
</dependency>
5050
<dependency>
@@ -154,7 +154,7 @@
154154
<commons.release.version>1.10.0</commons.release.version>
155155
<commons.release.desc>(Java 8)</commons.release.desc>
156156
<!-- The RC version used in the staging repository URL. -->
157-
<commons.rc.version>RC1</commons.rc.version>
157+
<commons.rc.version>RC2</commons.rc.version>
158158
<commons.bc.version>1.9.0</commons.bc.version>
159159
<commons.componentid>csv</commons.componentid>
160160
<commons.module.name>org.apache.commons.csv</commons.module.name>
@@ -168,22 +168,11 @@
168168
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
169169
<commons.encoding>UTF-8</commons.encoding>
170170

171-
<commons.checkstyle-plugin.version>3.2.0</commons.checkstyle-plugin.version>
172-
<commons.checkstyle.version>9.3</commons.checkstyle.version>
173171
<checkstyle.header.file>${basedir}/src/site/resources/checkstyle/checkstyle-header.txt</checkstyle.header.file>
174172
<checkstyle.config.file>${basedir}/src/site/resources/checkstyle/checkstyle.xml</checkstyle.config.file>
175173
<checkstyle.suppress.file>${basedir}/src/site/resources/checkstyle/checkstyle-suppressions.xml</checkstyle.suppress.file>
176174
<checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt, **/maven-archiver/pom.properties</checkstyle.resourceExcludes>
177175

178-
<commons.junit.version>5.9.1</commons.junit.version>
179-
<commons.pmd.version>3.19.0</commons.pmd.version>
180-
<commons.pmd-impl.version>6.50.0</commons.pmd-impl.version>
181-
<commons.jacoco.version>0.8.8</commons.jacoco.version>
182-
<commons.spotbugs.version>4.7.2.1</commons.spotbugs.version>
183-
<commons.spotbugs.impl.version>4.7.2</commons.spotbugs.impl.version>
184-
<commons.japicmp.version>0.16.0</commons.japicmp.version>
185-
<commons.javadoc.version>3.4.1</commons.javadoc.version>
186-
<commons.biz.aQute.bndlib.version>6.3.1</commons.biz.aQute.bndlib.version>
187176
<japicmp.skip>false</japicmp.skip>
188177

189178
<commons.release.isDistModule>true</commons.release.isDistModule>
@@ -227,6 +216,7 @@
227216
<excludes>
228217
<!-- These files are used as test data and test result specifications. -->
229218
<exclude>src/test/resources/org/apache/commons/csv/empty.txt</exclude>
219+
<exclude>src/test/resources/org/apache/commons/csv/CSV-141/csv-141.csv</exclude>
230220
<exclude>src/test/resources/org/apache/commons/csv/csv-167/sample1.csv</exclude>
231221
<exclude>src/test/resources/org/apache/commons/csv/CSV-198/optd_por_public.csv</exclude>
232222
<exclude>src/test/resources/org/apache/commons/csv/CSV-213/999751170.patch.csv</exclude>
@@ -307,7 +297,6 @@
307297
<plugin>
308298
<groupId>com.github.spotbugs</groupId>
309299
<artifactId>spotbugs-maven-plugin</artifactId>
310-
<version>${commons.spotbugs.version}</version>
311300
<configuration>
312301
<excludeFilterFile>${basedir}/src/site/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
313302
</configuration>
@@ -414,14 +403,14 @@
414403
<dependency>
415404
<groupId>org.openjdk.jmh</groupId>
416405
<artifactId>jmh-core</artifactId>
417-
<version>1.35</version>
406+
<version>1.36</version>
418407
<scope>test</scope>
419408
</dependency>
420409

421410
<dependency>
422411
<groupId>org.openjdk.jmh</groupId>
423412
<artifactId>jmh-generator-annprocess</artifactId>
424-
<version>1.35</version>
413+
<version>1.36</version>
425414
<scope>test</scope>
426415
</dependency>
427416

@@ -442,7 +431,7 @@
442431
<dependency>
443432
<groupId>com.opencsv</groupId>
444433
<artifactId>opencsv</artifactId>
445-
<version>5.7.0</version>
434+
<version>5.7.1</version>
446435
<scope>test</scope>
447436
</dependency>
448437

0 commit comments

Comments
 (0)