Merge remote-tracking branch 'upstream/master' into commons-email2

.asf.yaml

@@ -25,3 +25,5 @@ notifications:
     jobs:         [email protected]
     issues_bot_dependabot: [email protected]
     pullrequests_bot_dependabot: [email protected]
+    issues_bot_codecov-commenter: [email protected]
+    pullrequests_bot_codecov-commenter: [email protected]

.github/workflows/codeql-analysis.yml

@@ -45,10 +45,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v3.5.3
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.2.3
+    - uses: actions/cache@v3.3.1
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/coverage.yml

@@ -29,17 +29,17 @@ jobs:
         java: [ 8 ]
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.2.3
+    - uses: actions/cache@v3.3.1
       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.9.0
+      uses: actions/setup-java@v3.11.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

.github/workflows/maven.yml

@@ -34,17 +34,17 @@ jobs:
 #            experimental: true
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
       with:
         persist-credentials: false
-    - uses: actions/cache@v3.2.3
+    - uses: actions/cache@v3.3.1
       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.9.0
+      uses: actions/setup-java@v3.11.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

.github/workflows/scorecards-analysis.yml

@@ -40,12 +40,12 @@ jobs:
     steps:
 
       - name: "Checkout code"
-        uses: actions/checkout@v3.3.0   # 3.1.0
+        uses: actions/checkout@v3.5.3   # 3.1.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86    # 2.1.2
+        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af    # 2.1.3
         with:
           results_file: results.sarif
           results_format: sarif

README.md

@@ -62,7 +62,7 @@ Where can I get the latest release?
 -----------------------------------
 You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-email/download_email.cgi).
 
-Alternatively you can pull it from the central Maven repositories:
+Alternatively, you can pull it from the central Maven repositories:
 
 ```xml
 <dependency>

pom.xml

@@ -19,7 +19,7 @@
     <parent>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-parent</artifactId>
-      <version>56</version>
+      <version>58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>commons-email2</artifactId>
@@ -271,7 +271,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.13.0</version>
             <scope>test</scope>
         </dependency>
     	<dependency>

src/changes/changes.xml

@@ -15,7 +15,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<document>
+<document xmlns="http://maven.apache.org/changes/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
   <properties>
     <title>Apache Commons Email Release Notes</title>
     <author email="[email protected]">Eric Pugh</author>
@@ -63,7 +65,7 @@
         Bump javax.mail dependency to 1.6.1, so that i18n is supported for email addresses.
       </action>
       <action type="update" due-to="Gary Gregory, Dependabot" dev="ggregory">
-        Bump commons-parent from 50 to 56, #118, #128.
+        Bump commons-parent from 50 to 58, #118, #128.
       </action>
       <action type="update" due-to="Dependabot, Gary Gregory" dev="ggregory">
         Bump spotbugs-maven-plugin from 4.0.0 to 4.7.2 #18.
@@ -81,7 +83,7 @@
         Bump maven-pmd-plugin from 3.13.0 to 3.19.0 #34, #72, #79, #94.
       </action>
       <action type="update" due-to="Gary Gregory">
-        Bump tests commons-io:commons-io 2.6 to 2.11.0.
+        Bump tests commons-io:commons-io 2.6 to 2.13.0.
       </action>
       <action type="update" due-to="Gary Gregory" dev="ggregory">
         Bump jacoco from 0.8.6 to 0.8.8; fixes jacoco on Java 17.

src/test/java/org/apache/commons/mail2/AbstractEmailTest.java

@@ -254,7 +254,7 @@ protected WiserMessage validateSend(
             {
                 this.saveEmailToFile(emailMessage);
             }
-            catch(final MessagingException me)
+            catch (final MessagingException me)
             {
                 final IllegalStateException ise =
                     new IllegalStateException("caught MessagingException during saving the email");

src/test/java/org/apache/commons/mail2/HtmlEmailTest.java

@@ -639,7 +639,7 @@ public void testCallingBuildMimeMessageBeforeSent() throws Exception {
         {
             this.email.send();
         }
-        catch(final IllegalStateException e)
+        catch (final IllegalStateException e)
         {
             return;
         }