Merge branch 'refs/heads/master' into develop

# Conflicts: # modules/authenticated-socks-module/pom.xml # modules/batch-module/pom.xml # modules/cli-module/pom.xml # modules/core-module/pom.xml # modules/core-test-module/pom.xml # modules/dkim-module/pom.xml # modules/jacoco-aggregator-module/pom.xml # modules/karaf-module/pom.xml # modules/outlook-module/pom.xml # modules/simple-java-mail/pom.xml # modules/smime-module/pom.xml # modules/spring-module/pom.xml
bbottema · Apr 23, 2024 · 728eff9 · 728eff9
2 parents be3e647 + 15532bb
commit 728eff9
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](modules/simple-java-mail/LICENSE-2.0.txt) 
-[![Latest Release](https://img.shields.io/maven-central/v/org.simplejavamail/simple-java-mail.svg?style=flat)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.simplejavamail%22%20AND%20v%3A%228.8.3%22) 
-[![Javadocs](https://img.shields.io/badge/javadoc-8.8.3-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project) 
+[![Latest Release](https://img.shields.io/maven-central/v/org.simplejavamail/simple-java-mail.svg?style=flat)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.simplejavamail%22%20AND%20v%3A%228.8.4%22) 
+[![Javadocs](https://img.shields.io/badge/javadoc-8.8.4-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project) 
 [![Codacy](https://img.shields.io/codacy/grade/c7506663a4ab41e49b9675d87cd900b7.svg?style=flat)](https://app.codacy.com/gh/bbottema/simple-java-mail)
 ![Java 8+](https://img.shields.io/badge/java-8+-lightgray.svg)
 
@@ -20,16 +20,17 @@ Simple Java Mail is available in [Maven Central](https://search.maven.org/search
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>8.8.3</version>
+    <version>8.8.4</version>
 </dependency>
 ```
 
 Read about additional modules you can add here: [simplejavamail.org/modules](https://www.simplejavamail.org/modules.html). 
 
 ### Latest Progress ###
 
-v8.8.0 - [v8.8.3](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.8.3/)
+v8.8.0 - [v8.8.4](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.8.4/)
 
+- v8.8.4 (23-April-2024): [#506](https://github.com/bbottema/simple-java-mail/pull/506): [CVE] Upgrade utils-mail-smime dependency to 2.3.2, to resolve CVE issue in bouncycastle
 - v8.8.3 (13-April-2024): [#502](https://github.com/bbottema/simple-java-mail/issues/502): [Bug] Message headers not treated with case insensitivity as per RFC, causing deviating headers to slip through the filters
 - v8.8.2 (05-April-2024): [#495](https://github.com/bbottema/simple-java-mail/issues/495): Add config support for 'verifyingServerIdentity' with SMTP, also: since Angus 1.1.0 (8.6.0) server identity checks are on by default and can be countered by mailerBuilder.verifyingServerIdentity(false)
 - v8.8.2 (05-April-2024): [#501](https://github.com/bbottema/simple-java-mail/issues/501): [dependency] Update outlook-message-parser dependency, which has improved support for X500 addresses

diff --git a/RELEASE.txt b/RELEASE.txt
@@ -3,12 +3,13 @@ https://www.simplejavamail.org
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>8.8.3</version>
+    <version>8.8.4</version>
 </dependency>
 
-v8.8.0 - v8.8.3
+v8.8.0 - v8.8.4
 
-- v8.8.3 (13-April-2024): #502 : [Bug] Message headers not treated with case insensitivity as per RFC, causing deviating headers to slip through the filters
+- v8.8.4 (23-April-2024): #506: Upgrade utils-mail-smime dependency to 2.3.2, to resolve CVE issue in bouncycastle
+- v8.8.3 (13-April-2024): #502: [Bug] Message headers not treated with case insensitivity as per RFC, causing deviating headers to slip through the filters
 - v8.8.2 (05-April-2024): #495: Add config support for 'verifyingServerIdentity' with SMTP, also: since Angus 1.1.0 server identity checks are on by default and can be countered by mailerBuilder.verifyingServerIdentity(false)
 - v8.8.2 (05-April-2024): #501: [dependency] Update outlook-message-parser dependency, which has improved support for X500 addresses
 - v8.8.1 (04-April-2024): #500: [bug] Fix parsing addresses from headers in EML files, like a Disposition-Notification-To with umlaut

diff --git a/modules/authenticated-socks-module/pom.xml b/modules/authenticated-socks-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/batch-module/pom.xml b/modules/batch-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...i-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java b/...i-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java
@@ -38,7 +38,7 @@ static CommandLine configurePicoCli(List<CliDeclaredOptionSpec> declaredOptions,
                         "%n" +
                         "Note: All the regular functionality regarding properties and config files work with the CLI so you can provide defaults in a " +
                         "property file as long as it is visible (on class path) or as system environment variables.")
-                .version("Simple Java Mail 8.8.3");
+                .version("Simple Java Mail 8.8.4");
 
         rootCommandsHolder.usageMessage()
                 .customSynopsis("",

diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/jacoco-aggregator-module/pom.xml b/modules/jacoco-aggregator-module/pom.xml
@@ -8,7 +8,7 @@
 		<groupId>org.simplejavamail</groupId>
 		<artifactId>maven-master-project</artifactId>
 		<!--suppress MavenPropertyInParent -->
-		<version>8.8.3</version>
+		<version>8.8.4</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/karaf-module/pom.xml b/modules/karaf-module/pom.xml
@@ -8,7 +8,7 @@
 		<groupId>org.simplejavamail</groupId>
 		<artifactId>maven-master-project</artifactId>
 		<!--suppress MavenPropertyInParent -->
-		<version>8.8.3</version>
+		<version>8.8.4</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/spring-module/pom.xml b/modules/spring-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.8.3</version>
+        <version>8.8.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.simplejavamail</groupId>
     <artifactId>maven-master-project</artifactId>
     <packaging>pom</packaging>
-    <version>8.8.3</version>
+    <version>8.8.4</version>
     <inceptionYear>2009</inceptionYear>
 
     <name>Simple Java Mail - Maven master project</name>