Merge remote-tracking branch 'origin/develop' into develop

bbottema · bbottema · commit 502f3321f81b · 2025-04-13T16:01:04.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,11 @@ updates:
       interval: "weekly"
     target-branch: "develop"
     ignore:
+      - dependency-name: "org.mnode.ical4j:ical4j-vcard"
+        update-types:
+          - "version-update:semver-patch"
+          - "version-update:semver-minor"
+          - "version-update:semver-major"
       - dependency-name: "info.picocli:picocli"
         update-types:
           - "version-update:semver-minor"
diff --git a/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java b/modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java
@@ -131,11 +131,11 @@ private void checkConfigureOAuth2Token(Session session) {
 	 */
 	@NotNull
 	@Override
-	public Future<?> shutdownConnectionPools(@NotNull Session session) {
+	public Future<Void> shutdownConnectionPools(@NotNull Session session) {
 		if (smtpConnectionPool == null) {
 			LOGGER.warn("user requested connection pool shutdown, but there is no connection pool to shut down (yet)");
 			return completedFuture(null);
 		}
 		return smtpConnectionPool.shutdownPool(session);
 	}
-}
+}
diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.github.bbottema</groupId>
             <artifactId>java-reflection</artifactId>
-            <version>4.0.2</version>
+            <version>4.1.1</version>
         </dependency>
 
         <!-- needed for cli support -->
@@ -147,7 +147,7 @@
                         <!-- always trigger CliListAllSupportedOptionsDemoApp when packaging CLI artifacts, generating cli data files -->
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <id>generateCliData</id>
@@ -165,7 +165,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>appassembler-maven-plugin</artifactId>
-                        <version>1.8.1</version>
+                        <version>2.1.0</version>
                         <configuration>
                             <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
                             <copyConfigurationDirectory>true</copyConfigurationDirectory>
diff --git a/modules/core-module/src/main/java/org/simplejavamail/api/mailer/Mailer.java b/modules/core-module/src/main/java/org/simplejavamail/api/mailer/Mailer.java
@@ -120,7 +120,7 @@ public interface Mailer extends AutoCloseable {
 	 * <p>
 	 * <strong>Note:</strong> this is only works in combination with the {@value org.simplejavamail.internal.modules.BatchModule#NAME}.
 	 */
-	Future<?> shutdownConnectionPool();
+	Future<Void> shutdownConnectionPool();
 
 	/**
 	 * @return The server connection details. Will be {@code null} in case a custom fixed {@link Session} instance is used.
diff --git a/modules/core-module/src/main/java/org/simplejavamail/internal/modules/BatchModule.java b/modules/core-module/src/main/java/org/simplejavamail/internal/modules/BatchModule.java
@@ -57,5 +57,5 @@ public interface BatchModule {
 	 * Shuts down connection pool(s) and closes remaining open connections. Waits until all connections still in use become available again to deallocate them as well.
 	 */
 	@NotNull
-	Future<?> shutdownConnectionPools(@NotNull Session session);
-}
+	Future<Void> shutdownConnectionPools(@NotNull Session session);
+}
diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -93,7 +93,7 @@
         <dependency><!-- used to test loading of Environment properties in ConfigLoaderTest -->
             <groupId>org.junit-pioneer</groupId>
             <artifactId>junit-pioneer</artifactId>
-            <version>1.9.1</version>
+            <version>2.3.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -113,7 +113,7 @@
             <plugin>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-assertions-generator-maven-plugin</artifactId>
-                <version>2.1.0</version>
+                <version>2.2.0</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/MailerImpl.java b/modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/MailerImpl.java
@@ -373,11 +373,14 @@ public boolean validate(@NotNull final Email email)
 	 * @see Mailer#shutdownConnectionPool()
 	 */
 	@Override
-	public Future<?> shutdownConnectionPool() {
+	public Future<Void> shutdownConnectionPool() {
 		if (!operationalConfig.isExecutorServiceIsUserProvided()) {
 			operationalConfig.getExecutorService().shutdown();
 		}
-		return ModuleLoader.loadBatchModule().shutdownConnectionPools(session);
+		if (ModuleLoader.batchModuleAvailable()) {
+			return ModuleLoader.loadBatchModule().shutdownConnectionPools(session);
+		}
+		return CompletableFuture.completedFuture(null);
 	}
 
 	@Override
@@ -458,4 +461,4 @@ public EmailGovernance getEmailGovernance() {
 	public void close() throws ExecutionException, InterruptedException {
 		shutdownConnectionPool().get();
 	}
-}
+}
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>utils-mail-smime</artifactId>
-			<version>2.3.11</version>
+			<version>2.3.12</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -64,13 +64,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.36</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.pivovarit</groupId>
             <artifactId>throwing-function</artifactId>
-            <version>1.5.1</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -89,7 +89,7 @@
             <dependency>
                 <groupId>org.objenesis</groupId>
                 <artifactId>objenesis</artifactId>
-                <version>2.6</version>
+                <version>3.4</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -109,7 +109,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.16.1</version>
+                <version>2.18.0</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.angus</groupId>

Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,11 @@ private void checkConfigureOAuth2Token(Session session) {`
`131`	`131`	`*/`
`132`	`132`	`@NotNull`
`133`	`133`	`@Override`
`134`		`- public Future<?> shutdownConnectionPools(@NotNull Session session) {`
	`134`	`+ public Future<Void> shutdownConnectionPools(@NotNull Session session) {`
`135`	`135`	`if (smtpConnectionPool == null) {`
`136`	`136`	`LOGGER.warn("user requested connection pool shutdown, but there is no connection pool to shut down (yet)");`
`137`	`137`	`return completedFuture(null);`
`138`	`138`	`}`
`139`	`139`	`return smtpConnectionPool.shutdownPool(session);`
`140`	`140`	`}`
`141`		`-}`
	`141`	`+}`