Skip to content

Commit 667d7b3

Browse files
bbottemabbottema
committed
Merge branch 'master' into develop
2 parents 20218fd + 0f100c0 commit 667d7b3

File tree

17 files changed

+45
-22
lines changed

17 files changed

+45
-22
lines changed

‎README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](modules/simple-java-mail/LICENSE-2.0.txt)
2-
[![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.11.3%22)
3-
[![Javadocs](https://img.shields.io/badge/javadoc-8.11.3-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project)
2+
[![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.0%22)
3+
[![Javadocs](https://img.shields.io/badge/javadoc-8.12.0-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project)
44
[![Codacy](https://img.shields.io/codacy/grade/c7506663a4ab41e49b9675d87cd900b7.svg?style=flat)](https://app.codacy.com/gh/bbottema/simple-java-mail)
55
![Java 8+](https://img.shields.io/badge/java-8+-lightgray.svg)
66

@@ -20,14 +20,20 @@ Simple Java Mail is available in [Maven Central](https://search.maven.org/search
2020
<dependency>
2121
<groupId>org.simplejavamail</groupId>
2222
<artifactId>simple-java-mail</artifactId>
23-
<version>8.11.3</version>
23+
<version>8.12.0</version>
2424
</dependency>
2525
```
2626

2727
Read about additional modules you can add here: [simplejavamail.org/modules](https://www.simplejavamail.org/modules.html).
2828

2929
### Latest Progress ###
3030

31+
[v8.12.0](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.12.0/) (26-September-2024)
32+
- [#550](https://github.com/bbottema/simple-java-mail/issues/550): [bug] Environment variables are not being loaded properly
33+
- [#538](https://github.com/bbottema/simple-java-mail/issues/538): [bug] System properties are only read if configuration file exists in class path
34+
- [#546](https://github.com/bbottema/simple-java-mail/pull/546): [Enhancement] Trim whitespace in encoder values for Content-Encoding
35+
36+
3137
v8.11.0 - [v8.11.3](https://repo1.maven.org/maven2/org/simplejavamail/simple-java-mail/8.11.3/)
3238

3339
- v8.11.3 (15-September-2024): [#543](https://github.com/bbottema/simple-java-mail/issues/543): [Enhancement] reduce log spam from the batch-module

‎RELEASE.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ https://www.simplejavamail.org
33
<dependency>
44
<groupId>org.simplejavamail</groupId>
55
<artifactId>simple-java-mail</artifactId>
6-
<version>8.11.3</version>
6+
<version>8.12.0</version>
77
</dependency>
88

9+
v8.12.0 (26-September-2024)
10+
- #550: [bug] Environment variables are not being loaded properly
11+
- #538: [bug] System properties are only read if configuration file exists in class path
12+
- #546: [Enhancement] Trim whitespace in encoder values for Content-Encoding
13+
14+
915
v8.11.0 - v8.11.3
1016

1117
- v8.11.3 (15-September-2024): #543: [Enhancement] reduce log spam from the batch-module

‎modules/authenticated-socks-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/batch-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/cli-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static CommandLine configurePicoCli(List<CliDeclaredOptionSpec> declaredOptions,
3838
"%n" +
3939
"Note: All the regular functionality regarding properties and config files work with the CLI so you can provide defaults in a " +
4040
"property file as long as it is visible (on class path) or as system environment variables.")
41-
.version("Simple Java Mail 8.11.3");
41+
.version("Simple Java Mail 8.12.0");
4242

4343
rootCommandsHolder.usageMessage()
4444
.customSynopsis("",

‎modules/core-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/core-module/src/main/java/org/simplejavamail/api/mailer/CustomMailer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88

99
/**
1010
* By default, Simple Java Mail handles the ultimate connection and sending of emails. However, it is possible to replace this last step
11-
* by a custom implementation. Note this is not meant to 'override' the default behavior, but to provide a custom implementation for
11+
* with a custom implementation. Note this is not meant to 'override' the default behavior, but to provide a custom implementation for
1212
* specific use cases (for example sending using MailChimp or SendGrid, or logging to your own database).
1313
* <p>
14-
* The benefit of this is that Simple Java Mail acts as an accelarator, providing thread pool, applying email content-validation, address validations,
14+
* The benefit of this is that Simple Java Mail acts as an accelerator, providing thread pool, applying email content-validation, address validations,
1515
* configuring a {@code Session} instance, producing a {@code MimeMessage}, all with full S/MIME, DKIM support and everything else.
1616
* <p>
17-
* <strong>Note:</strong> in this mode, proxy support is turned off assuming it is handled by the custom mailer as well.
17+
* <strong>Note:</strong> in this mode, proxy support is turned off assuming it is handled by the custom mailer as well.<br>
1818
* <strong>Note:</strong> in this mode, the batch-module (SMTP cluster(s) / smtp connection pooling) won't be used either.
1919
*
2020
* @see MailerGenericBuilder#withCustomMailer(CustomMailer)
21+
* @see <a href="https://simplejavamail.org/features.html#section-custom-mailer">Plug your own sending logic with a Custom Mailer</a>
2122
*/
2223
public interface CustomMailer {
2324
void testConnection(@NotNull OperationalConfig operationalConfig, @NotNull Session session);

‎modules/core-test-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/dkim-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/jacoco-aggregator-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/karaf-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/outlook-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/simple-java-mail/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

@@ -98,6 +98,16 @@
9898
</dependency>
9999
</dependencies>
100100

101+
<dependencyManagement>
102+
<dependencies>
103+
<dependency><!--solve clash from junit-pioneer -->
104+
<groupId>org.junit.platform</groupId>
105+
<artifactId>junit-platform-engine</artifactId>
106+
<version>1.10.2</version>
107+
</dependency>
108+
</dependencies>
109+
</dependencyManagement>
110+
101111
<build>
102112
<plugins>
103113
<plugin>

‎modules/smime-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎modules/spring-module/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.simplejavamail</groupId>
99
<artifactId>maven-master-project</artifactId>
10-
<version>8.11.3</version>
10+
<version>8.12.0</version>
1111
<relativePath>../../pom.xml</relativePath>
1212
</parent>
1313

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<groupId>org.simplejavamail</groupId>
1313
<artifactId>maven-master-project</artifactId>
1414
<packaging>pom</packaging>
15-
<version>8.11.3</version>
15+
<version>8.12.0</version>
1616
<inceptionYear>2009</inceptionYear>
1717

1818
<name>Simple Java Mail - Maven master project</name>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>com.github.bbottema</groupId>
8080
<artifactId>java-socks-proxy-server</artifactId>
81-
<version>4.1.0</version>
81+
<version>4.1.2</version>
8282
<scope>test</scope>
8383
</dependency>
8484
</dependencies>

0 commit comments

Comments
 (0)