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/13 17:55:04 UTC
[sling-org-apache-sling-commons-messaging-mail] branch master
updated (dbee5a0 -> ee7328c)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git.
from dbee5a0 collect Google Truth and dependencies at the bottom
add 9e71aa3 SLING-10017 Switch to Jakarta Mail and Activation APIs
add 768172f SLING-10017 Switch to Jakarta Mail and Activation APIs
add 1b542b4 SLING-10017 Switch to Jakarta Mail and Activation APIs
new a4d88c0 update test dependencies
new 78b3bf7 style
new 0d6a2a8 SLING-10377 Fix nullability annotations for primitive array parameters
new ee7328c SLING-10378 Update to Sling Bundle Parent 41
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 43 +-
.../sling/commons/messaging/mail/MailService.java | 2 +-
.../commons/messaging/mail/MessageBuilder.java | 20 +-
.../commons/messaging/mail/MessageIdProvider.java | 4 +-
.../messaging/mail/internal/SimpleMailService.java | 12 +-
.../mail/internal/SimpleMessageBuilder.java | 56 +--
.../mail/internal/SimpleMessageIdProvider.java | 4 +-
.../sling/commons/messaging/mail/package-info.java | 2 +-
.../commons/mail/util/MimeMessageParser.java | 455 +++++++++++++++++++++
.../messaging/mail/it/tests/MailTestSupport.java | 4 +-
.../mail/it/tests/SimpleMailServiceIT.java | 16 +-
11 files changed, 529 insertions(+), 89 deletions(-)
create mode 100644 src/test/java/org/apache/commons/mail/util/MimeMessageParser.java
[sling-org-apache-sling-commons-messaging-mail] 02/04: style
Posted by ol...@apache.org.
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 78b3bf7b27a632b474053bc30cde4253b2b00334
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 13 19:52:22 2021 +0200
style
---
.../messaging/mail/internal/SimpleMessageBuilder.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
index 76bdebb..da4e6df 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
@@ -50,17 +50,17 @@ public class SimpleMessageBuilder implements MessageBuilder {
private final Session session;
- private InternetHeaders headers = new InternetHeaders();
+ private final InternetHeaders headers = new InternetHeaders();
private InternetAddress from;
- private List<InternetAddress> toRecipients = new LinkedList<>();
+ private final List<InternetAddress> toRecipients = new LinkedList<>();
- private List<InternetAddress> ccRecipients = new LinkedList<>();
+ private final List<InternetAddress> ccRecipients = new LinkedList<>();
- private List<InternetAddress> bccRecipients = new LinkedList<>();
+ private final List<InternetAddress> bccRecipients = new LinkedList<>();
- private List<InternetAddress> replyTos = new LinkedList<>();
+ private final List<InternetAddress> replyTos = new LinkedList<>();
private String subject;
@@ -68,9 +68,9 @@ public class SimpleMessageBuilder implements MessageBuilder {
private String html;
- private List<Attachment> attachments = new LinkedList<>();
+ private final List<Attachment> attachments = new LinkedList<>();
- private List<Inline> inlines = new LinkedList<>();
+ private final List<Inline> inlines = new LinkedList<>();
private static final String CONTENT_TYPE_TEXT_HTML = "text/html; charset=utf-8";
[sling-org-apache-sling-commons-messaging-mail] 01/04: update test
dependencies
Posted by ol...@apache.org.
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 a4d88c0b9f44770a75618a83869385f8270ccb25
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 13 19:49:59 2021 +0200
update test dependencies
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31723ed..d982bca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
- <version>3.0.11.RELEASE</version>
+ <version>3.0.12.RELEASE</version>
<scope>test</scope>
</dependency>
<!-- logging -->
@@ -294,26 +294,26 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.6.2</version>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-reference</artifactId>
- <version>2.6.2</version>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.6.2</version>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>
<!-- testing - truth and dependencies -->
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>1.0</version>
+ <version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -325,7 +325,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>28.1-jre</version>
+ <version>30.1.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
[sling-org-apache-sling-commons-messaging-mail] 04/04: SLING-10378
Update to Sling Bundle Parent 41
Posted by ol...@apache.org.
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 ee7328cb8735b6e81be1c3e713a662fa8d426cc6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 13 19:54:38 2021 +0200
SLING-10378 Update to Sling Bundle Parent 41
---
pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index d982bca..08057c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>38</version>
+ <version>41</version>
<relativePath />
</parent>
@@ -51,13 +51,6 @@
<build>
<plugins>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-baseline-maven-plugin</artifactId>
- <configuration>
- <failOnMissing>false</failOnMissing>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
</plugin>
[sling-org-apache-sling-commons-messaging-mail] 03/04: SLING-10377
Fix nullability annotations for primitive array parameters
Posted by ol...@apache.org.
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 0d6a2a84ab3951dba80c982bcd65a6ae50317460
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu May 13 19:53:54 2021 +0200
SLING-10377 Fix nullability annotations for primitive array parameters
---
.../apache/sling/commons/messaging/mail/MessageBuilder.java | 8 ++++----
.../messaging/mail/internal/SimpleMessageBuilder.java | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
index 13533bb..c7181d3 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/MessageBuilder.java
@@ -72,13 +72,13 @@ public interface MessageBuilder {
@NotNull MessageBuilder html(@NotNull final String html);
- @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename);
+ @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename);
- @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers);
+ @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers);
- @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid);
+ @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid);
- @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers);
+ @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers);
@NotNull MimeMessage build() throws MessagingException;
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
index da4e6df..af99121 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java
@@ -236,24 +236,24 @@ public class SimpleMessageBuilder implements MessageBuilder {
}
@Override
- public @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename) {
+ public @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename) {
return attachment(content, type, filename, null);
}
@Override
- public @NotNull MessageBuilder attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers) {
+ public @NotNull MessageBuilder attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable Header[] headers) {
final Attachment attachment = new Attachment(content, type, filename, null);
this.attachments.add(attachment);
return this;
}
@Override
- public @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid) {
+ public @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid) {
return inline(content, type, cid, null);
}
@Override
- public @NotNull MessageBuilder inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers) {
+ public @NotNull MessageBuilder inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable Header[] headers) {
final Inline inline = new Inline(content, type, cid, headers);
this.inlines.add(inline);
return this;
@@ -442,7 +442,7 @@ public class SimpleMessageBuilder implements MessageBuilder {
final Header[] headers;
- Attachment(@NotNull final byte[] content, @NotNull final String type, @NotNull final String filename, @Nullable final Header[] headers) {
+ Attachment(final byte @NotNull [] content, @NotNull final String type, @NotNull final String filename, @Nullable final Header[] headers) {
this.content = content;
this.type = type;
this.filename = filename;
@@ -461,7 +461,7 @@ public class SimpleMessageBuilder implements MessageBuilder {
final Header[] headers;
- Inline(@NotNull final byte[] content, @NotNull final String type, @NotNull final String cid, @Nullable final Header[] headers) {
+ Inline(final byte @NotNull [] content, @NotNull final String type, @NotNull final String cid, @Nullable final Header[] headers) {
this.content = content;
this.type = type;
this.cid = cid;