You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2022/12/31 11:46:07 UTC
[streampipes] branch dev updated: Bump jakarta.mail from 1.6.7 to 2.0.1 & simple-java-mail from 6.7.5 to 7.1.0 (#946)
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 4980cb8e1 Bump jakarta.mail from 1.6.7 to 2.0.1 & simple-java-mail from 6.7.5 to 7.1.0 (#946)
4980cb8e1 is described below
commit 4980cb8e17857525e65801c6bdc3f55ed5f90e32
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat Dec 31 12:46:02 2022 +0100
Bump jakarta.mail from 1.6.7 to 2.0.1 & simple-java-mail from 6.7.5 to 7.1.0 (#946)
---
pom.xml | 4 ++--
.../src/main/java/org/apache/streampipes/mail/AbstractMailer.java | 3 +--
streampipes-mail/src/main/resources/mail-template-inner-button.html | 3 ++-
streampipes-mail/src/main/resources/mail-template-outer.html | 4 +++-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 88dd3beb4..ed83df482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<jackson.databind.version>2.13.4.1</jackson.databind.version>
<jakarta-annotation.version>1.3.5</jakarta-annotation.version>
<jakarta-activation-api.version>1.2.2</jakarta-activation-api.version>
- <jakarta-mail.version>1.6.7</jakarta-mail.version>
+ <jakarta-mail.version>2.0.1</jakarta-mail.version>
<jakarta-servlet-api.version>4.0.4</jakarta-servlet-api.version>
<jakarta-validation.version>2.0.2</jakarta-validation.version>
<jakarta-xml-bind-api.version>2.3.3</jakarta-xml-bind-api.version>
@@ -105,7 +105,7 @@
<rendersnake.version>1.9.0</rendersnake.version>
<retrofit.version>2.5.0</retrofit.version>
<siddhi.version>5.1.21</siddhi.version>
- <simple-java-mail.version>6.7.5</simple-java-mail.version>
+ <simple-java-mail.version>7.1.0</simple-java-mail.version>
<slf4j.version>1.7.30</slf4j.version>
<snakeyaml.version>1.26</snakeyaml.version>
<snappy-java.version>1.1.7.7</snappy-java.version>
diff --git a/streampipes-mail/src/main/java/org/apache/streampipes/mail/AbstractMailer.java b/streampipes-mail/src/main/java/org/apache/streampipes/mail/AbstractMailer.java
index 49542edec..6e2bba47b 100644
--- a/streampipes-mail/src/main/java/org/apache/streampipes/mail/AbstractMailer.java
+++ b/streampipes-mail/src/main/java/org/apache/streampipes/mail/AbstractMailer.java
@@ -22,14 +22,13 @@ import org.apache.streampipes.config.backend.model.EmailConfig;
import org.apache.streampipes.mail.config.MailConfigurationBuilder;
import org.apache.streampipes.user.management.encryption.SecretEncryptionManager;
+import jakarta.mail.Message;
import org.simplejavamail.api.email.Email;
import org.simplejavamail.api.email.EmailPopulatingBuilder;
import org.simplejavamail.api.email.Recipient;
import org.simplejavamail.api.mailer.Mailer;
import org.simplejavamail.email.EmailBuilder;
-import javax.mail.Message;
-
import java.util.List;
import java.util.stream.Collectors;
diff --git a/streampipes-mail/src/main/resources/mail-template-inner-button.html b/streampipes-mail/src/main/resources/mail-template-inner-button.html
index afab4279a..f9bc7aecd 100644
--- a/streampipes-mail/src/main/resources/mail-template-inner-button.html
+++ b/streampipes-mail/src/main/resources/mail-template-inner-button.html
@@ -39,7 +39,8 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="center" bgcolor="#1b1464" style="border-radius: 6px;">
- <a href="###LINK###" style="display: inline-block; padding: 16px 36px; font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;"
+ <a href="###LINK###"
+ style="display: inline-block; padding: 16px 36px; font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;"
target="_blank">###BUTTON_TEXT###</a>
</td>
</tr>
diff --git a/streampipes-mail/src/main/resources/mail-template-outer.html b/streampipes-mail/src/main/resources/mail-template-outer.html
index 2333dd61a..30eceded5 100644
--- a/streampipes-mail/src/main/resources/mail-template-outer.html
+++ b/streampipes-mail/src/main/resources/mail-template-outer.html
@@ -103,6 +103,7 @@
border: 0;
outline: none;
}
+
</style>
</head>
@@ -121,7 +122,8 @@
<tr>
<td align="center" style="padding: 36px 24px;" valign="top">
<a href="###BASE_URL###" style="display: inline-block;" target="_blank">
- <img alt="Logo" border="0" src="###LOGO###" style="display: block; width: 150px; max-width: 150px; min-width: 150px;"
+ <img alt="Logo" border="0" src="###LOGO###"
+ style="display: block; width: 150px; max-width: 150px; min-width: 150px;"
width="150">
</a>
</td>