Merge branch 'master' into release

apache · Jan 28, 2023 · ba8ba60 · ba8ba60
2 parents 540c778 + 4ee216c
commit ba8ba60
Show file tree

Hide file tree

Showing 26 changed files with 950 additions and 300 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+github:
+  description: "Apache Commons CSV"
+  homepage: https://commons.apache.org/csv/
+
+notifications:
+    commits:      [email protected]
+    issues:       [email protected]
+    pullrequests: [email protected]
+    jira_options: link label
+    jobs:         [email protected]
+    issues_bot_dependabot: [email protected]
+    pullrequests_bot_dependabot: [email protected]
diff --git a/.github/GH-ROBOTS.txt b/.github/GH-ROBOTS.txt
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Keeps on creating FUD PRs in test code
+# Does not follow Apache disclosure policies
+User-agent: JLLeitschuh/security-research
+Disallow: *
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -45,10 +45,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.0.11
+    - uses: actions/cache@v3.2.3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -29,17 +29,17 @@ jobs:
         java: [ 8 ]
 
     steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.0.11
+    - uses: actions/cache@v3.2.3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3.5.1
+      uses: actions/setup-java@v3.9.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -34,17 +34,17 @@ jobs:
 #            experimental: true
 
     steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.0.11
+    - uses: actions/cache@v3.2.3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3.5.1
+      uses: actions/setup-java@v3.9.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -40,12 +40,12 @@ jobs:
     steps:
 
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8   # 3.0.2
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c   # 3.3.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@ce330fde6b1a5c9c75b417e7efc510b822a35564    # 1.1.2
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86    # 2.1.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -57,7 +57,7 @@ jobs:
           publish_results: true
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8    # 3.1.0
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce    # 3.1.0
         with:
           name: SARIF file
           path: results.sarif

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons CSV
-Copyright 2005-2022 The Apache Software Foundation
+Copyright 2005-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -12,7 +12,7 @@ Commons CSV requires at least Java 8.
 
 The Apache Commons CSV library provides a simple interface for reading and writing CSV files of various types.
 
-This is a feature and bug fix release.
+Feature and bug fix release (Java 8)
 
 Changes in this version include:
 
@@ -39,23 +39,26 @@ o           CSVParser.getRecords() now throws UncheckedIOException instead of IO
 o CSV-274:  Add comments to iterator() and stream() #270. Thanks to Peter Hull, Bruno P. Kinoshita, Gary Gregory.
 o CSV-290:  Fix wrong assumptions in PostgreSQL formats #265. Thanks to angusdev, Gary Gregory.
 o           Validate input to setDelimiter(String) for empty string #266. Thanks to Mykola Faryma.
+o           Bump CSVFormat#serialVersionUID from 1 to 2. Thanks to Dependabot.
+o           CSVParser: Identify duplicates in null, empty and blank header names #279. Thanks to Alex Herbert.
 
 CHANGES
 =======
 
 o           Bump actions/cache from 2.1.6 to 3.0.10 #196, #233, #243, #267, #271. Thanks to Dependabot, Gary Gregory.
 o           Bump actions/checkout from 2.3.4 to 3.1.0 #188, #195, #220, #272. Thanks to Dependabot, Gary Gregory.
 o           Bump actions/setup-java from 2 to 3.5.1. Thanks to Gary Gregory.
-o           Bump commons-parent from 52 to 54 #264. Thanks to Gary Gregory.
+o           Bump actions/upload-artifact from 3.1.0 to 3.1.1 #280. Thanks to Dependabot.
+o           Bump commons-parent from 52 to 56 #264, #288, #298. Thanks to Gary Gregory.
 o           Bump checkstyle from 8.44 to 9.2.1 #180, #190, #194, #202, #207. Thanks to Dependabot.
 o           Bump junit-jupiter from 5.8.0-M1 to 5.9.1 #179, #186, #201, #244, #263. Thanks to Dependabot.
-o           Bump jmh-core from 1.32 to 1.35 #176, #208, #229. Thanks to Dependabot.
-o           Bump jmh-generator-annprocess from 1.32 to 1.35 #175, #206, #226. Thanks to Dependabot.
-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.
+o           Bump jmh-core from 1.32 to 1.36 #176, #208, #229, #285. Thanks to Dependabot.
+o           Bump jmh-generator-annprocess from 1.32 to 1.36 #175, #206, #226, #283. Thanks to Dependabot.
+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.
 o           Bump maven-pmd-plugin from 3.14.0 to 3.19.0 #184, #219, #238, #254, #258. Thanks to Dependabot.
-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.
-o           Bump opencsv from 5.5.1 to 5.7.0 #182, #221, #260. Thanks to Gary Gregory.
-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.
+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.
+o           Bump opencsv from 5.5.1 to 5.7.1 #182, #221, #260, #281. Thanks to Gary Gregory.
+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.
 o           Bump com.github.spotbugs:spotbugs from 4.5.3 to 4.7.2. Thanks to Gary Gregory.
 o           Bump h2 from 1.4.200 to 2.1.214 #200, #205, #213, #239. Thanks to Dependabot.
 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
 o           Bump japicmp-maven-plugin from 0.15.3 to 0.16.0. Thanks to Gary Gregory.
 o           Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 #253. Thanks to Dependabot.
 
+Removed:
+o           Serialization in CSVFormat is not supported from one version to the next.
 
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -175,7 +180,7 @@ o           Bump biz.aQute.bnd:biz.aQute.bndlib from 5.1.2 to 5.3.0. Thanks to D
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -235,7 +240,7 @@ o           Fix typo performance test #55. Thanks to Chen.
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -287,7 +292,7 @@ o           Update tests from H2 1.4.198 to 1.4.199. Thanks to Gary Gregory.
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -400,7 +405,7 @@ o CSV-201: Do not use RuntimeException in CSVParser.iterator().new Iterator() {.
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -444,7 +449,7 @@ o CSV-183:  Drop ferc.gov tests.
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -536,7 +541,7 @@ o CSV-156:  Incorrect Javadoc on QuoteMode.NONE. Thanks to Jason Steenstra-Picke
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -582,7 +587,7 @@ o [CSV-134] Unified parameter validation. Thanks to wu wen.
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 
@@ -628,7 +633,7 @@ FIXED BUGS
 ==========
 
 o CSV-125:  No longer works with Java 6
-o CSV-122:  NullPointerException when empty header string and and null string of "".
+o CSV-122:  NullPointerException when empty header string and null string of "".
             Thanks to Mike Lewis.
 o CSV-118:  CSVRecord.toMap() throws NPE on formats with no
             headers. Thanks to Enrique Lara.
@@ -677,7 +682,7 @@ o CSV-27:   Decide whether to keep the csv.writer subpackage
 Historical list of changes: https://commons.apache.org/proper/commons-csv/changes-report.html
 
 For complete information on Apache Commons CSV, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons CSV website:
+patches, or suggestions for improvement, see the Apache Commons CSV website:
 
 https://commons.apache.org/proper/commons-csv/
 

diff --git a/pom.xml b/pom.xml
@@ -20,10 +20,10 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>54</version>
+    <version>56</version>
   </parent>
   <artifactId>commons-csv</artifactId>
-  <version>1.10.0</version>
+  <version>1.10.0-SNAPSHOT</version>
   <name>Apache Commons CSV</name>
   <url>https://commons.apache.org/proper/commons-csv/</url>
   <inceptionYear>2005</inceptionYear>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.8.0</version>
+      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -154,7 +154,7 @@
     <commons.release.version>1.10.0</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.rc.version>RC2</commons.rc.version>
     <commons.bc.version>1.9.0</commons.bc.version>
     <commons.componentid>csv</commons.componentid>
     <commons.module.name>org.apache.commons.csv</commons.module.name>
@@ -168,22 +168,11 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <commons.encoding>UTF-8</commons.encoding>
 
-    <commons.checkstyle-plugin.version>3.2.0</commons.checkstyle-plugin.version>
-    <commons.checkstyle.version>9.3</commons.checkstyle.version>
     <checkstyle.header.file>${basedir}/src/site/resources/checkstyle/checkstyle-header.txt</checkstyle.header.file>
     <checkstyle.config.file>${basedir}/src/site/resources/checkstyle/checkstyle.xml</checkstyle.config.file>
     <checkstyle.suppress.file>${basedir}/src/site/resources/checkstyle/checkstyle-suppressions.xml</checkstyle.suppress.file>
     <checkstyle.resourceExcludes>LICENSE.txt, NOTICE.txt, **/maven-archiver/pom.properties</checkstyle.resourceExcludes>
 
-    <commons.junit.version>5.9.1</commons.junit.version>
-    <commons.pmd.version>3.19.0</commons.pmd.version>
-    <commons.pmd-impl.version>6.50.0</commons.pmd-impl.version>
-    <commons.jacoco.version>0.8.8</commons.jacoco.version>
-    <commons.spotbugs.version>4.7.2.1</commons.spotbugs.version>
-    <commons.spotbugs.impl.version>4.7.2</commons.spotbugs.impl.version>
-    <commons.japicmp.version>0.16.0</commons.japicmp.version>
-    <commons.javadoc.version>3.4.1</commons.javadoc.version>
-    <commons.biz.aQute.bndlib.version>6.3.1</commons.biz.aQute.bndlib.version>
     <japicmp.skip>false</japicmp.skip>
 
     <commons.release.isDistModule>true</commons.release.isDistModule>
@@ -227,6 +216,7 @@
             <excludes>
               <!-- These files are used as test data and test result specifications. -->
               <exclude>src/test/resources/org/apache/commons/csv/empty.txt</exclude>
+              <exclude>src/test/resources/org/apache/commons/csv/CSV-141/csv-141.csv</exclude>
               <exclude>src/test/resources/org/apache/commons/csv/csv-167/sample1.csv</exclude>
               <exclude>src/test/resources/org/apache/commons/csv/CSV-198/optd_por_public.csv</exclude>
               <exclude>src/test/resources/org/apache/commons/csv/CSV-213/999751170.patch.csv</exclude>
@@ -307,7 +297,6 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${commons.spotbugs.version}</version>
         <configuration>
           <excludeFilterFile>${basedir}/src/site/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
@@ -414,14 +403,14 @@
         <dependency>
           <groupId>org.openjdk.jmh</groupId>
           <artifactId>jmh-core</artifactId>
-          <version>1.35</version>
+          <version>1.36</version>
           <scope>test</scope>
         </dependency>
 
         <dependency>
           <groupId>org.openjdk.jmh</groupId>
           <artifactId>jmh-generator-annprocess</artifactId>
-          <version>1.35</version>
+          <version>1.36</version>
           <scope>test</scope>
         </dependency>
 
@@ -442,7 +431,7 @@
         <dependency>
           <groupId>com.opencsv</groupId>
           <artifactId>opencsv</artifactId>
-          <version>5.7.0</version>
+          <version>5.7.1</version>
           <scope>test</scope>
         </dependency>