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 09:19:00 UTC
[sling-org-apache-sling-commons-messaging-mail] 01/02: 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
commit 40569d5332e82ab6f35b0f996336c1529f45cbf2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed May 19 10:53:52 2021 +0200
SLING-10389 Remove Commons Lang3 dependency
---
pom.xml | 6 ------
.../sling/commons/messaging/mail/internal/SimpleMailService.java | 5 ++---
.../sling/commons/messaging/mail/it/tests/MailTestSupport.java | 3 +--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 08057c4..0d1eff7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,12 +173,6 @@
<version>2.8.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- <scope>provided</scope>
- </dependency>
<!-- Apache Felix -->
<dependency>
<groupId>org.apache.felix</groupId>
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 348e9e4..7dc2ed1 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
@@ -30,7 +30,6 @@ import jakarta.mail.event.ConnectionListener;
import jakarta.mail.event.TransportListener;
import jakarta.mail.internet.MimeMessage;
-import org.apache.commons.lang3.StringUtils;
import org.apache.sling.commons.crypto.CryptoService;
import org.apache.sling.commons.messaging.MessageService;
import org.apache.sling.commons.messaging.mail.MailService;
@@ -151,8 +150,8 @@ public class SimpleMailService implements MailService {
threadPool = threadPoolManager.get(configuration.threadpool_name());
final Properties properties = new Properties();
- final String from = configuration.mail_smtps_from();
- if (StringUtils.isNotBlank(from)) {
+ final String from = configuration.mail_smtps_from().trim();
+ if (!from.isEmpty()) {
properties.setProperty(MAIL_SMTPS_FROM, from);
}
diff --git a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
index b97fbe5..002c589 100644
--- a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
@@ -67,7 +67,6 @@ public abstract class MailTestSupport extends TestSupport {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging").versionAsInProject(),
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-2.0.1").versionAsInProject(),
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").versionAsInProject(),
- mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(),
scr(),
slingCommonsCrypto(),
slingCommonsThreads(),
@@ -110,7 +109,7 @@ public abstract class MailTestSupport extends TestSupport {
private static ModifiableCompositeOption slingCommonsCrypto() {
return composite(
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.crypto").versionAsInProject(),
- mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(),
+ mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(SlingOptions.versionResolver),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.jasypt").versionAsInProject()
);
}