You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/05/19 19:52:47 UTC
[sling-org-apache-sling-commons-messaging-mail] branch master
updated: SLING-10389 Remove Commons Lang3 dependency
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git
The following commit(s) were added to refs/heads/master by this push:
new a48520e SLING-10389 Remove Commons Lang3 dependency
a48520e is described below
commit a48520ee0c1d2209166d2a33a941f4784e4d5d18
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed May 19 21:52:29 2021 +0200
SLING-10389 Remove Commons Lang3 dependency
---
.sling-module.json | 3 +--
pom.xml | 2 +-
.../sling/commons/messaging/mail/internal/SimpleMailService.java | 7 ++++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
index d03a0b2..0e603c0 100644
--- a/.sling-module.json
+++ b/.sling-module.json
@@ -2,8 +2,7 @@
"jenkins": {
"jdks": [
14,
- 11,
- 8
+ 11
]
}
}
diff --git a/pom.xml b/pom.xml
index 0d1eff7..d3df312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <sling.java.version>8</sling.java.version>
+ <sling.java.version>11</sling.java.version>
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
index 7dc2ed1..8717721 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
@@ -19,6 +19,7 @@
package org.apache.sling.commons.messaging.mail.internal;
import java.util.List;
+import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
@@ -150,9 +151,9 @@ public class SimpleMailService implements MailService {
threadPool = threadPoolManager.get(configuration.threadpool_name());
final Properties properties = new Properties();
- final String from = configuration.mail_smtps_from().trim();
- if (!from.isEmpty()) {
- properties.setProperty(MAIL_SMTPS_FROM, from);
+ final String from = configuration.mail_smtps_from();
+ if (Objects.nonNull(from) && !from.isBlank()) {
+ properties.setProperty(MAIL_SMTPS_FROM, from.trim());
}
session = Session.getInstance(properties);