Merge branch 'master' into develop

bbottema · bbottema · commit b1c8b1ecbf05 · 2026-04-01T07:17:38.000+02:00
# Conflicts:
#	modules/dkim-module/pom.xml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ mvn-collect-artifacts-command: &mvn-collect-artifacts-command
 
 mvn-deploy-command: &mvn-deploy-command
   mvn-deploy-command:  |
-    mvn -s .circleci/maven-release-settings.xml clean deploy -DdeployAtEnd=true -DperformRelease=true -DskipTests -Dspotbugs.skip=true -Denforcer.skip=true -Djacoco.skip=true
+    mvn -s .circleci/maven-release-settings.xml clean deploy -DdeployAtEnd=true -DperformRelease=true -DskipTests -Dspotbugs.skip=true -Denforcer.skip=true -Djacoco.skip=true -Dossindex.skip=true
     mvn license:remove
   context: RELEASE_PROFILE_BBOTTEMA
 
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.12.3%22) 
-[![Javadocs](https://img.shields.io/badge/javadoc-8.12.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.12.6%22) 
+[![Javadocs](https://img.shields.io/badge/javadoc-8.12.6-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,19 @@ 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.12.3</version>
+    <version>8.12.6</version>
 </dependency>
 ```
 
 Read about additional modules you can add here: [simplejavamail.org/modules](https://www.simplejavamail.org/modules.html). 
 
 ### Latest Progress ###
 
-v8.12.0 - [v8.12.3](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.12.3/)
+v8.12.0 - [v8.12.6](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.12.6/)
 
+- v8.12.6 (18-April-2025): [#595](https://github.com/bbottema/simple-java-mail/issues/595): [bug] Spring configuration - fix support for simplejavamail.extraproperties
+- v8.12.5 (05-March-2025): Bumped PATCH versions of various dependencies [#553](https://github.com/bbottema/simple-java-mail/pull/553), [#554](https://github.com/bbottema/simple-java-mail/pull/554), [#555](https://github.com/bbottema/simple-java-mail/pull/555), [#562](https://github.com/bbottema/simple-java-mail/pull/562), [#567](https://github.com/bbottema/simple-java-mail/pull/567)
+- v8.12.4 (12-December-2024): [#558](https://github.com/bbottema/simple-java-mail/pull/558): [bug] Mailer.close() exception because it attempts to shutdown batch-module connection pools, even if not available on the classpath
 - v8.12.3 (25-November-2024): [#563](https://github.com/bbottema/simple-java-mail/pull/563): [enhancement] Add getter for Authenticated SOCKS server port
 - v8.12.2 (05-October-2024): [#552](https://github.com/bbottema/simple-java-mail/pull/552): [bug] support iCalendar events with METHOD defined in body instead of Content-Type
 - v8.12.1 (02-October-2024): [#533](https://github.com/bbottema/simple-java-mail/pull/533): [maintenance] Bump com.github.therapi:therapi-runtime-javadoc-scribe from 0.13.0 to 0.15.0
diff --git a/RELEASE.txt b/RELEASE.txt
@@ -3,11 +3,14 @@ https://www.simplejavamail.org
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>8.12.3</version>
+    <version>8.12.6</version>
 </dependency>
 
-v8.12.0 - v8.12.3
+v8.12.0 - v8.12.6
 
+- v8.12.6 (18-April-2025): #595: [bug] Spring configuration - fix support for simplejavamail.extraproperties
+- v8.12.5 (05-March-2025): Bumped PATCH versions of various dependencies (#553, #554, #555, #562, #567)
+- v8.12.4 (12-December-2024): #558: [bug] Mailer.close() exception because it attempts to shutdown batch-module connection pools, even if not available on the classpath
 - v8.12.3 (25-November-2024): #563: [enhancement] Add getter for Authenticated SOCKS server port
 - v8.12.2 (05-October-2024): #552: [bug] support iCalendar events with METHOD defined in body instead of Content-Type
 - v8.12.1 (02-October-2024): #533: [maintenance] Bump com.github.therapi:therapi-runtime-javadoc-scribe from 0.13.0 to 0.15.0
diff --git a/modules/authenticated-socks-module/pom.xml b/modules/authenticated-socks-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/batch-module/pom.xml b/modules/batch-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java b/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 8.12.3");
+                .version("Simple Java Mail 8.12.6");
         
         rootCommandsHolder.usageMessage()
                 .customSynopsis("",
diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java b/modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java
@@ -1,5 +1,6 @@
 package org.simplejavamail.config;
 
+import lombok.val;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.email.ContentTransferEncoding;
@@ -16,6 +17,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -396,11 +398,16 @@ private static Map<Property, Object> readProperties(final @NotNull Properties fi
 			}
 		}
 
-		final Map<String, String> extraProperties = new HashMap<>();
+		@SuppressWarnings("unchecked")
+		val extraProperties = RESOLVED_PROPERTIES.containsKey(Property.EXTRA_PROPERTIES)
+					? new HashMap<>((Map<String, String>) RESOLVED_PROPERTIES.get(Property.EXTRA_PROPERTIES))
+					: new HashMap<String, String>();
+
 		extraProperties.putAll(filterExtraJavaMailProperties(null, System.getProperties().entrySet()));
 		//noinspection unchecked,rawtypes
 		extraProperties.putAll(filterExtraJavaMailProperties(null, (Set) System.getenv().entrySet()));
 		extraProperties.putAll(filterExtraJavaMailProperties(filePropertiesLeft, fileProperties.entrySet()));
+
 		resolvedProps.put(Property.EXTRA_PROPERTIES, extraProperties);
 
 		if (!filePropertiesLeft.isEmpty()) {
diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>utils-mail-dkim</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.2</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/modules/jacoco-aggregator-module/pom.xml b/modules/jacoco-aggregator-module/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.simplejavamail</groupId>
 		<artifactId>maven-master-project</artifactId>
-		<version>8.12.3</version>
+		<version>8.12.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/karaf-module/pom.xml b/modules/karaf-module/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.simplejavamail</groupId>
 		<artifactId>maven-master-project</artifactId>
-		<version>8.12.3</version>
+		<version>8.12.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java
@@ -191,35 +191,35 @@ public void createMailSession_MinimalConstructor_WithConfig() {
 		assertThat(session.getProperty("extra-properties-property1")).isEqualTo("value1");
 		assertThat(session.getProperty("extra-properties-property2")).isEqualTo("value2");
 	}
-	
+
 	@Test
 	public void createMailSession_MinimalConstructor_WithConfig_OPPORTUNISTIC_TLS() {
 		Properties properties = new Properties();
 		properties.setProperty(OPPORTUNISTIC_TLS.key(), "false");
 		properties.setProperty("simplejavamail.extraproperties.extra-properties-property2", "override");
 		ConfigLoader.loadProperties(properties, true);
-		
+
 		Mailer mailer = MailerBuilder.withTransportStrategy(TransportStrategy.SMTP).buildMailer();
 		Session session = mailer.getSession();
-		
+
 		assertThat(session.getDebug()).isTrue();
 		assertThat(session.getProperty("mail.smtp.host")).isEqualTo("smtp.default.com");
 		assertThat(session.getProperty("mail.smtp.port")).isEqualTo("25");
 		assertThat(session.getProperty("mail.transport.protocol")).isEqualTo("smtp");
-		
+
 		assertThat(session.getProperty("mail.smtp.starttls.enable")).isNull();
 		assertThat(session.getProperty("mail.smtp.starttls.required")).isNull();
 		assertThat(session.getProperty("mail.smtp.ssl.checkserveridentity")).isEqualTo("true");
-		
+
 		assertThat(session.getProperty("mail.smtp.user")).isEqualTo("username smtp");
 		assertThat(session.getProperty("mail.smtp.auth")).isEqualTo("true");
 		// the following two are because authentication is needed, otherwise proxy would be straightworward
 		assertThat(session.getProperty("mail.smtp.socks.host")).isEqualTo("localhost");
 		assertThat(session.getProperty("mail.smtp.socks.port")).isEqualTo("1081");
-		assertThat(session.getProperty("extra-properties-property1")).isNull();
+		assertThat(session.getProperty("extra-properties-property1")).isEqualTo("value1");
 		assertThat(session.getProperty("extra-properties-property2")).isEqualTo("override");
 	}
-	
+
 	@Test
 	public void createMailSession_MinimalConstructor_WithConfig_OPPORTUNISTIC_TLS_Manually_Disabled() {
 		Properties properties = new Properties();
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <version>8.12.3</version>
+        <version>8.12.6</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.12.3</version>
+        <version>8.12.6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -37,6 +37,7 @@
             <artifactId>spring-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!--suppress VulnerableLibrariesLocal -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -68,6 +69,19 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--suppress VulnerableLibrariesLocal -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring.boot.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -94,9 +108,40 @@
                             <artifactId>spring-boot-configuration-processor</artifactId>
                             <version>${spring.boot.version}</version>
                         </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.ossindex.maven</groupId>
+                <artifactId>ossindex-maven-plugin</artifactId>
+                <configuration>
+                    <excludeVulnerabilityIds>
+                        <!-- Cannot be fixed:
+                            1. fix version is only available in a Spring commercial version
+                            2. the next OSS version requires minimum Java 17
+                            3. Spring is a 'provided' dependency anyway, so not shipped with this library -->
+                        <excludeVulnerabilityId>CVE-2024-38820</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2023-51074</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2024-31573</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-1471</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-25857</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-38749</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-38750</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-38751</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-38752</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2022-41854</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2023-1370</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2023-6378</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2024-12798</excludeVulnerabilityId>
+                        <excludeVulnerabilityId>CVE-2024-12801</excludeVulnerabilityId>
+                    </excludeVulnerabilityIds>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/modules/spring-module/src/main/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupport.java b/modules/spring-module/src/main/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupport.java
diff --git a/modules/spring-module/src/main/resources/application.properties b/modules/spring-module/src/main/resources/application.properties
diff --git a/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportBootTest.java b/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportBootTest.java
diff --git a/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportPlainTest.java b/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportPlainTest.java
diff --git a/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportTest.java b/modules/spring-module/src/test/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupportTest.java
diff --git a/modules/spring-module/src/test/resources/simplejavamail.properties b/modules/spring-module/src/test/resources/simplejavamail.properties
diff --git a/pom.xml b/pom.xml
