Preparing release 6.4.1

Author: bbottema

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%226.4.0%22) 
-[![Javadocs](https://img.shields.io/badge/javadoc-6.4.0-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%226.4.1%22) 
+[![Javadocs](https://img.shields.io/badge/javadoc-6.4.1-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://www.codacy.com/app/b-bottema/simple-java-mail)
 ![Java 1.7+](https://img.shields.io/badge/java-1.7+-lightgray.svg)
 
@@ -18,17 +18,17 @@ Simple Java Mail is also available in [Maven Central](https://search.maven.org/#
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>6.4.0</version>
+    <version>6.4.1</version>
 </dependency>
 ```
 
 ### Latest Progress ###
 
-[v6.4.0](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.4.0%7Cjar) (19-July-2020)
+v6.4.0 - [v6.4.1](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.4.1%7Cjar) (19-July-2020 - 26-July-2020)
 
+- [#252](https://github.com/bbottema/simple-java-mail/issues/252) Bugfix: Added missing support for S/MIME envloped signing
 - [#268](https://github.com/bbottema/simple-java-mail/issues/268) Immediately resolve InputStreams when building emails, don't reuse
-
-This primarily affects the builder api for S/MIME and DKIM signing / encryption.
+    * This primarily affects the builder api for S/MIME and DKIM signing / encryption.
 
 
 v6.3.0 - [v6.3.2](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.3.2%7Cjar) (11-July-2020 - 12-July-2020)
@@ -57,24 +57,12 @@ This release adds the following major new feature:
 - Bumped log4j-core from 2.6.1 to 2.13.2
 
 
-[v6.0.5](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.0.5%7Cjar) (13-June-2020)
+v6.0.2 - [v6.0.5](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.0.5%7Cjar) (21-Januari-2020 - 13-June-2020)
 
 - [#270](https://github.com/bbottema/simple-java-mail/issues/270) Bug: CLI module missing Jetbrains @Nullable annotation dependency needed in runtime
-
-
-[v6.0.4](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.0.4%7Cjar) (3-May-2020)
-
 - [#262](https://github.com/bbottema/simple-java-mail/issues/262) Bug: Executor settings passed to the builder are ignored
 - [#249](https://github.com/bbottema/simple-java-mail/issues/249) Bug: MimeMessageParser doesn't handle multiple attachments with the same name correctly
-
-
-[v6.0.3](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.0.3%7Cjar) (5-Februari-2020)
-
 - [#245](https://github.com/bbottema/simple-java-mail/issues/245) Bug: JDK9+ Incorrect JPMS Automatic-Module-Name
-
-
-[v6.0.2](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.0.2%7Cjar) (21-Januari-2020)
-
 - [#246](https://github.com/bbottema/simple-java-mail/issues/246) Bug: Sending async emails with and without the Batch module cause lingering threads
 
 

RELEASE.txt

@@ -3,14 +3,14 @@ http://www.simplejavamail.org
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>6.4.0</version>
+    <version>6.4.1</version>
 </dependency>
 
-v6.4.0 (19-July-2020)
+v6.4.0 - v6.4.1 (19-July-2020 - 26-July-2020)
 
-- #268: Immediately resolve InputStreams when building emails, don't reuse
-
-This primarily affects the builder api for S/MIME and DKIM signing / encryption.
+- #252: Bugfix: Added missing support for S/MIME envloped signing
+- #268: Bugfix: Immediately resolve InputStreams when building emails, don't reuse (which resulted in errors)
+        * This primarily affects the builder api for S/MIME and DKIM signing / encryption.
 
 
 v6.3.0 - v6.3.2 (11-July-2020 - 12-July-2020)
@@ -39,24 +39,12 @@ v6.1.0 (5-July-2020)
 - Bumped log4j-core from 2.6.1 to 2.13.2
 
 
-v6.0.5 (13-June-2020)
+v6.0.2 - v6.0.5 (21-Januari-2020 - 13-June-2020)
 
 - #270: Bug: CLI module missing Jetbrains @Nullable annotation dependency needed in runtime
-
-
-v6.0.4 (3-May-2020)
-
 - #262: Bug: Executor settings passed to the builder are ignored
 - #249: Bug: MimeMessageParser doesn't handle multiple attachments with the same name correctly
-
-
-v6.0.3 (5-Februari-2020)
-
 - #245: Bug: JDK9+ Incorrect JPMS Automatic-Module-Name
-
-
-v6.0.2 (21-Januari-2020)
-
 - #246: Bug: Sending async emails with and without the Batch module cause lingering threads
 
 

modules/cli-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 6.4.0");
+                .version("Simple Java Mail 6.4.1");
 
         rootCommandsHolder.usageMessage()
                 .customSynopsis("",