Merge branch 'refs/heads/develop'

# Conflicts:
#	modules/outlook-module/pom.xml

Author: bbottema

modules/batch-module/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>smtp-connection-pool</artifactId>
-            <version>2.3.1</version>
+            <version>2.3.2</version>
         </dependency>
     </dependencies>
 </project>

modules/cli-module/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.github.bbottema</groupId>
             <artifactId>java-reflection</artifactId>
-            <version>4.1.0</version>
+            <version>4.0.2</version>
         </dependency>
 
         <!-- needed for cli support -->
@@ -46,7 +46,7 @@
         <dependency><!-- Runtime library -->
             <groupId>com.github.therapi</groupId>
             <artifactId>therapi-runtime-javadoc</artifactId>
-            <version>0.13.0</version>
+            <version>0.15.0</version>
         </dependency>
 
         <!-- dependencies that should be included in the assembly for the stand-alone jar -->
@@ -90,14 +90,20 @@
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
-            <version>5.0.0-RC1</version>
+            <version>5.6.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency><!-- adds support for deserializing UnmodifiableCollection -->
             <groupId>de.javakaffee</groupId>
             <artifactId>kryo-serializers</artifactId>
             <version>0.45</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.esotericsoftware</groupId>
+                    <artifactId>kryo</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Logging -->
@@ -189,7 +195,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.7.1</version>
                         <configuration>
                             <descriptors>
                                 <descriptor>src/assembly/standalone-cli-descriptor.xml</descriptor>

modules/cli-module/src/main/resources/cli.data

@@ -25,7 +25,6 @@ public static void main(String[] args) {
 
 		demoTestConnection(serverConfig);
 		demoSend(serverConfig);
-		demoSendAsync(serverConfig);
 		demoSendUsingFileAsHTMLBody(serverConfig);
 	}
 
@@ -49,18 +48,6 @@ private static void demoSend(ServerConfig serverConfig) {
 		});
 	}
 
-	private static void demoSendAsync(ServerConfig serverConfig) {
-		CliSupport.runCLI(new String[]{
-				"send",
-				"--email:forwarding", SOURCE_FOLDER + "/test/resources/test-messages/HTML mail with replyto and attachment and embedded image.msg",
-				"--email:from", "Test sender", DemoAppBase.YOUR_GMAIL_ADDRESS,
-				"--email:to", "Test Receiver", DemoAppBase.YOUR_GMAIL_ADDRESS,
-				"--mailer:async",
-				"--mailer:withSMTPServer", "smtp.gmail.com", "587", serverConfig.getUsername(), serverConfig.getPassword(),
-				"--mailer:withTransportStrategy", "SMTP_TLS"
-		});
-	}
-	
 	private static void demoSendUsingFileAsHTMLBody(ServerConfig serverConfig) {
 		CliSupport.runCLI(new String[]{
 				"send",

modules/cli-module/src/main/resources/therapi.data

@@ -46,12 +46,10 @@
         <dependency>
             <groupId>jakarta.mail</groupId>
             <artifactId>jakarta.mail-api</artifactId>
-            <version>2.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-mail</artifactId>
-            <version>2.0.2</version>
             <scope>runtime</scope>
         </dependency>
 

modules/cli-module/src/test/java/demo/CliDemoApp.java

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>

modules/core-module/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>utils-mail-dkim</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
         </dependency>
     </dependencies>
 </project>

modules/core-test-module/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.bbottema</groupId>
         <artifactId>modular-project-parent</artifactId>
-        <version>1.0.30</version>
+        <version>1.0.33</version>
     </parent>
 
     <groupId>org.simplejavamail</groupId>
@@ -96,6 +96,31 @@
                 <artifactId>jsr305</artifactId>
                 <version>3.0.2</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>2.1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>2.1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.16.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.angus</groupId>
+                <artifactId>angus-mail</artifactId>
+                <version>2.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>2.0.9</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>