Merge branch 'master' of https://github.com/apache/commons-io.git

Author: garydgregory

.github/workflows/codeql-analysis.yml

@@ -62,7 +62,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5    # 3.29.5
+      uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047    # 3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -73,7 +73,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5    # 3.29.5
+      uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047    # 3.29.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -87,4 +87,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5    # 3.29.5
+      uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047    # 3.29.5

.github/workflows/scorecards-analysis.yml

@@ -66,6 +66,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5    # 3.29.5
+        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047    # 3.29.5
         with:
           sarif_file: results.sarif

pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>89</version>
+    <version>90</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-io</groupId>

src/changes/changes.xml

@@ -57,6 +57,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory"                due-to="Gary Gregory, Piotr P. Karwasz">Javadoc general improvements.</action>
       <action type="fix" dev="ggregory"                due-to="Piotr P. Karwasz">IOUtils.toByteArray() now throws EOFException when not enough data is available #796.</action>
       <action type="fix" dev="pkarwasz"                due-to="Piotr P. Karwasz">Fix IOUtils.skip() usage in concurrent scenarios.</action>
+      <action type="fix" dev="ggregory"                due-to="J Hawkins">[javadoc] Fix XmlStreamReader Javadoc to indicate the correct class that is built #806.</action> 
       <!-- ADD -->
       <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">FileUtils#byteCountToDisplaySize() supports Zettabyte, Yottabyte, Ronnabyte and Quettabyte #763.</action>
       <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">Add org.apache.commons.io.FileUtils.ONE_RB #763.</action>
@@ -73,7 +74,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="pkarwasz" type="add"                due-to="Piotr P. Karwasz">Add CloseShieldChannel to close-shielded NIO Channels #786.</action>
       <action dev="pkarwasz" type="add"                due-to="Piotr P. Karwasz">Added IOUtils.checkFromIndexSize as a Java 8 backport of Objects.checkFromIndexSize #790.</action>
       <!-- UPDATE -->
-      <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 85 to 89 #774, #783.</action>
+      <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 85 to 90 #774, #783, #808.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory">[test] Bump commons-codec:commons-codec from 1.18.0 to 1.19.0.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">[test] Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #769.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory">[test] Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0.</action>

src/main/java/org/apache/commons/io/input/XmlStreamReader.java

@@ -42,7 +42,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.build.AbstractStreamBuilder;
 import org.apache.commons.io.function.IOConsumer;
-import org.apache.commons.io.output.XmlStreamWriter;
 
 /**
  * Character stream that handles all the necessary Voodoo to figure out the charset encoding of the XML document within the stream.
@@ -76,7 +75,7 @@ public class XmlStreamReader extends Reader {
 
     // @formatter:off
     /**
-     * Builds a new {@link XmlStreamWriter}.
+     * Builds a new {@link XmlStreamReader}.
      *
      * Constructs a Reader using an InputStream and the associated content-type header. This constructor is lenient regarding the encoding detection.
      * <p>
@@ -131,7 +130,7 @@ public Builder() {
         }
 
         /**
-         * Builds a new {@link XmlStreamWriter}.
+         * Builds a new {@link XmlStreamReader}.
          * <p>
          * You must set an aspect that supports {@link #getInputStream()}, otherwise, this method throws an exception.
          * </p>