You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2022/05/20 19:32:38 UTC
[nifi] 06/06: NIFI-10031 Downgraded Jakarta Mail from 2.0.1 to 1.6.7 (#6052)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 071fe6d965756df4d0f6a60243390c3b390e9da2
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed May 18 10:38:36 2022 -0500
NIFI-10031 Downgraded Jakarta Mail from 2.0.1 to 1.6.7 (#6052)
- Downgraded Jakarta Activation from 2.0.1 to 1.2.2 in nifi-bootstrap
- Updated assembly configurations to include Jakarta Activation in java11 directory
---
nifi-assembly/src/main/assembly/common.xml | 2 ++
nifi-bootstrap/pom.xml | 9 +++++----
.../notification/email/EmailNotificationService.java | 20 ++++++++++----------
.../email/EmailNotificationServiceTest.java | 6 +-----
.../src/main/assembly/dependencies.xml | 2 ++
.../src/main/assembly/common.xml | 2 ++
.../src/test/assembly/dependencies.xml | 2 ++
.../src/main/assembly/dependencies.xml | 2 ++
8 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/nifi-assembly/src/main/assembly/common.xml b/nifi-assembly/src/main/assembly/common.xml
index cec28e5b32..5769d66ffd 100644
--- a/nifi-assembly/src/main/assembly/common.xml
+++ b/nifi-assembly/src/main/assembly/common.xml
@@ -46,6 +46,8 @@
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.annotation:javax.annotation-api</include>
+ <include>com.sun.activation:jakarta.activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
index 4cc0164879..cd91194b02 100644
--- a/nifi-bootstrap/pom.xml
+++ b/nifi-bootstrap/pom.xml
@@ -62,26 +62,27 @@ language governing permissions and limitations under the License. -->
<version>1.16.2-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+ <!-- Jakarta Mail 1 required for compatibility with Jakarta Activation 1 used with JAXB 2 -->
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <version>1.6.7</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>2.0.1</version>
+ <version>1.6.7</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>2.0.1</version>
+ <version>1.2.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
- <version>2.0.1</version>
+ <version>1.2.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/email/EmailNotificationService.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/email/EmailNotificationService.java
index b9caf8ddd3..8679f41b47 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/email/EmailNotificationService.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/email/EmailNotificationService.java
@@ -25,16 +25,16 @@ import java.util.Map;
import java.util.Properties;
import java.util.Map.Entry;
-import jakarta.mail.Authenticator;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-import jakarta.mail.PasswordAuthentication;
-import jakarta.mail.Session;
-import jakarta.mail.Transport;
-import jakarta.mail.Message.RecipientType;
-import jakarta.mail.internet.AddressException;
-import jakarta.mail.internet.InternetAddress;
-import jakarta.mail.internet.MimeMessage;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.Message.RecipientType;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
import org.apache.nifi.bootstrap.notification.AbstractNotificationService;
import org.apache.nifi.bootstrap.notification.NotificationContext;
import org.apache.nifi.bootstrap.notification.NotificationFailedException;
diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/email/EmailNotificationServiceTest.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/email/EmailNotificationServiceTest.java
index 10e08f33fe..8243a9330f 100644
--- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/email/EmailNotificationServiceTest.java
+++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/email/EmailNotificationServiceTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.bootstrap.email;
-import jakarta.mail.MessagingException;
import org.apache.nifi.bootstrap.notification.NotificationContext;
import org.apache.nifi.bootstrap.notification.NotificationFailedException;
import org.apache.nifi.bootstrap.notification.NotificationInitializationContext;
@@ -32,7 +31,6 @@ import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
public class EmailNotificationServiceTest {
@@ -49,9 +47,7 @@ public class EmailNotificationServiceTest {
final Map<PropertyDescriptor, PropertyValue> properties = getProperties();
final EmailNotificationService service = getNotificationService(properties);
- final NotificationFailedException exception = assertThrows(NotificationFailedException.class, () -> service.notify(getNotificationContext(), NotificationType.NIFI_STARTED, SUBJECT, MESSAGE));
- final Throwable cause = exception.getCause();
- assertTrue(cause instanceof MessagingException);
+ assertThrows(NotificationFailedException.class, () -> service.notify(getNotificationContext(), NotificationType.NIFI_STARTED, SUBJECT, MESSAGE));
}
private EmailNotificationService getNotificationService(final Map<PropertyDescriptor, PropertyValue> properties) {
diff --git a/nifi-registry/nifi-registry-assembly/src/main/assembly/dependencies.xml b/nifi-registry/nifi-registry-assembly/src/main/assembly/dependencies.xml
index b4ac359364..a5acd165bf 100644
--- a/nifi-registry/nifi-registry-assembly/src/main/assembly/dependencies.xml
+++ b/nifi-registry/nifi-registry-assembly/src/main/assembly/dependencies.xml
@@ -78,6 +78,8 @@
<includes>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
+ <include>com.sun.activation:jakarta.activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
diff --git a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
index e14ad18463..3b5f247289 100644
--- a/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
+++ b/nifi-stateless/nifi-stateless-assembly/src/main/assembly/common.xml
@@ -43,6 +43,8 @@
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.annotation:javax.annotation-api</include>
+ <include>com.sun.activation:jakarta.activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml b/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml
index 5b80a55dbc..5302a1fe33 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/assembly/dependencies.xml
@@ -51,6 +51,8 @@
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>javax.annotation:javax.annotation-api</include>
+ <include>com.sun.activation:jakarta.activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml b/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml
index 4cdae09cd2..f9fa10ea64 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/assembly/dependencies.xml
@@ -51,6 +51,8 @@
<includes>
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
+ <include>com.sun.activation:jakarta.activation</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
</includes>
</dependencySet>
</dependencySets>