This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit dc182e25fea52b7207b7045d44a502d2f43399e3 Author: Tran Tien Duc <[email protected]> AuthorDate: Fri Nov 1 11:35:22 2019 +0700 JAMES-2957 Exclude geronimo java mail in the classpath --- server/mailet/dkim/pom.xml | 4 ++++ .../java/org/apache/james/transport/mailets/DlpIntegrationTest.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml index 5f3cd88..a4c2d26 100644 --- a/server/mailet/dkim/pom.xml +++ b/server/mailet/dkim/pom.xml @@ -71,6 +71,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.geronimo.javamail</groupId> + <artifactId>geronimo-javamail_1.4_mail</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java index aa49e1d..f1be200 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java @@ -48,7 +48,6 @@ import org.apache.james.webadmin.WebAdminUtils; import org.apache.mailet.base.test.FakeMail; import org.eclipse.jetty.http.HttpStatus; import org.junit.After; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -241,8 +240,6 @@ public class DlpIntegrationTest { awaitAtMostOneMinute.until(() -> containsExactlyOneMail(repositoryUrl)); } - @Ignore("Dlp got an exception of parsing email body containing attachment with a part of error message: " + - "javax.activation.UnsupportedDataTypeException: Unknown image type image/jpeg; name=\"linux.jpeg\"") @Test public void dlpShouldBeAbleToReadMailContentWithAttachments() throws Exception { createJamesServer(MailetConfiguration.builder() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
