JAMES-2341 Move testing tool on MimeMessage to a common project
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c8e705d3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c8e705d3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c8e705d3 Branch: refs/heads/master Commit: c8e705d35d4441e7ca4c32bda20725f8425b8cfc Parents: 1ed1e46 Author: Antoine Duprat <[email protected]> Authored: Fri Feb 23 14:19:19 2018 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Mar 8 10:36:33 2018 +0100 ---------------------------------------------------------------------- javax-mail-extension/pom.xml | 40 ++++++++++++++ .../org/apache/james/util/MimeMessageUtil.java | 55 ++++++++++++++++++++ mailbox/cassandra/pom.xml | 6 +++ mailet/base/pom.xml | 6 +++ .../AutomaticallySentMailDetectorImplTest.java | 2 +- .../org/apache/mailet/base/test/FakeMail.java | 1 + .../mailet/base/test/MimeMessageUtil.java | 55 -------------------- mailet/icalendar/pom.xml | 6 +++ .../transport/mailets/ICALToHeadersTest.java | 2 +- .../mailets/ICALToJsonAttributeTest.java | 2 +- mailet/standard/pom.xml | 6 +++ .../transport/mailets/ContactExtractorTest.java | 2 +- .../james/transport/mailets/LogMessageTest.java | 2 +- .../transport/mailets/ReplaceContentTest.java | 2 +- .../transport/mailets/SetMailAttributeTest.java | 2 +- .../mailets/UseHeaderRecipientsTest.java | 2 +- .../transport/matchers/HasAttachmentTest.java | 2 +- .../james/transport/matchers/HasHeaderTest.java | 2 +- .../transport/matchers/RelayLimitTest.java | 2 +- pom.xml | 12 +++++ server/container/core/pom.xml | 6 +++ .../core/MimeMessageFromSharedStreamTest.java | 2 +- .../james/server/core/MimeMessageTest.java | 2 +- server/mailet/integration-testing/pom.xml | 6 +++ .../mailets/ICSAttachmentWorkflowTest.java | 2 +- server/mailet/mailetcontainer-camel/pom.xml | 6 +++ .../impl/JamesMailetContextTest.java | 2 +- server/mailet/mailets/pom.xml | 6 +++ .../RecipientRewriteTableProcessorTest.java | 2 +- .../mailets/RecipientRewriteTableTest.java | 2 +- .../mailets/delivery/MailDispatcherTest.java | 2 +- .../mailets/delivery/SieveIntegrationTest.java | 2 +- .../redirect/NotifyMailetsMessageTest.java | 2 +- .../util/SpecialAddressesUtilsTest.java | 2 +- .../cassandra-jmap-integration-testing/pom.xml | 6 +++ .../jmap-integration-testing-common/pom.xml | 6 +++ .../integration/SetMessagesMethodTest.java | 2 +- .../memory-jmap-integration-testing/pom.xml | 6 +++ server/protocols/jmap/pom.xml | 6 +++ .../TextCalendarBodyToAttachmentTest.java | 2 +- .../james/jmap/mailet/VacationReplyTest.java | 2 +- .../utils/MimeMessageBodyGeneratorTest.java | 2 +- server/queue/queue-activemq/pom.xml | 6 +++ server/queue/queue-api/pom.xml | 6 +++ .../james/queue/api/MailQueueContract.java | 2 +- server/queue/queue-file/pom.xml | 6 +++ server/queue/queue-jms/pom.xml | 6 +++ server/queue/queue-memory/pom.xml | 6 +++ 48 files changed, 236 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/javax-mail-extension/pom.xml ---------------------------------------------------------------------- diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml new file mode 100644 index 0000000..fa9c00e --- /dev/null +++ b/javax-mail-extension/pom.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>javax-mail-extension</artifactId> + + <name>Apache James :: Java Mail Extension</name> + + <dependencies> + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/javax-mail-extension/src/test/java/org/apache/james/util/MimeMessageUtil.java ---------------------------------------------------------------------- diff --git a/javax-mail-extension/src/test/java/org/apache/james/util/MimeMessageUtil.java b/javax-mail-extension/src/test/java/org/apache/james/util/MimeMessageUtil.java new file mode 100644 index 0000000..93715f8 --- /dev/null +++ b/javax-mail-extension/src/test/java/org/apache/james/util/MimeMessageUtil.java @@ -0,0 +1,55 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ +package org.apache.james.util; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Properties; + +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; + +public class MimeMessageUtil { + + public static String asString(MimeMessage mimeMessage) throws Exception { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + mimeMessage.writeTo(byteArrayOutputStream); + return new String(byteArrayOutputStream.toByteArray(), StandardCharsets.UTF_8); + } + + public static MimeMessage defaultMimeMessage() { + return new MimeMessage(Session.getDefaultInstance(new Properties())); + } + + public static MimeMessage mimeMessageFromStream(InputStream inputStream) throws MessagingException { + return new MimeMessage(Session.getDefaultInstance(new Properties()), inputStream); + } + + public static MimeMessage mimeMessageFromBytes(byte[] bytes) throws MessagingException { + return mimeMessageFromStream(new ByteArrayInputStream(bytes)); + } + + public static MimeMessage mimeMessageFromString(String string) throws MessagingException { + return mimeMessageFromBytes(string.getBytes(StandardCharsets.UTF_8)); + } + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index 2be705b..9380413 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -87,6 +87,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/base/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml index 9bcea51..13923f1 100644 --- a/mailet/base/pom.xml +++ b/mailet/base/pom.xml @@ -47,6 +47,12 @@ <artifactId>apache-mime4j-core</artifactId> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java index 3361c39..4b2a77d 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java @@ -32,8 +32,8 @@ import javax.mail.internet.MimeMultipart; import javax.mail.util.ByteArrayDataSource; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Test; public class AutomaticallySentMailDetectorImplTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java index 150435e..6a5bf52 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java @@ -38,6 +38,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.PerRecipientHeaders.Header; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageUtil.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageUtil.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageUtil.java deleted file mode 100644 index d81424a..0000000 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ -package org.apache.mailet.base.test; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.Properties; - -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; - -public class MimeMessageUtil { - - public static String asString(MimeMessage mimeMessage) throws Exception { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - mimeMessage.writeTo(byteArrayOutputStream); - return new String(byteArrayOutputStream.toByteArray(), StandardCharsets.UTF_8); - } - - public static MimeMessage defaultMimeMessage() { - return new MimeMessage(Session.getDefaultInstance(new Properties())); - } - - public static MimeMessage mimeMessageFromStream(InputStream inputStream) throws MessagingException { - return new MimeMessage(Session.getDefaultInstance(new Properties()), inputStream); - } - - public static MimeMessage mimeMessageFromBytes(byte[] bytes) throws MessagingException { - return mimeMessageFromStream(new ByteArrayInputStream(bytes)); - } - - public static MimeMessage mimeMessageFromString(String string) throws MessagingException { - return mimeMessageFromBytes(string.getBytes(StandardCharsets.UTF_8)); - } - -} http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/icalendar/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml index edfdca2..76b0f0a 100644 --- a/mailet/icalendar/pom.xml +++ b/mailet/icalendar/pom.xml @@ -41,6 +41,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java index f9a928b..a3ce271 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java @@ -23,10 +23,10 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java index dd84581..2db08a9 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java @@ -34,11 +34,11 @@ import javax.mail.MessagingException; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.util.ClassLoaderUtils; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml index 4c52812..8aab675 100644 --- a/mailet/standard/pom.xml +++ b/mailet/standard/pom.xml @@ -57,6 +57,12 @@ <artifactId>james-server-util-java8</artifactId> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index 9d87c0d..af54793 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -29,12 +29,12 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.MailetContext; import org.apache.mailet.MailetException; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java index 88fb7e9..920b5c5 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java @@ -32,11 +32,11 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java index 28fc3f4..cb9d9db 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java @@ -26,10 +26,10 @@ import java.nio.charset.StandardCharsets; import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java index ceffcce..d5a7b98 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java @@ -24,11 +24,11 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.base.test.FakeMailetConfig; import org.apache.mailet.base.test.MailUtil; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java index daed490..f77d57a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java @@ -23,12 +23,12 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasAttachmentTest.java index 5e76266..d758b22 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasAttachmentTest.java @@ -28,9 +28,9 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java index 1b79c46..3afb961 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java @@ -26,12 +26,12 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.apache.mailet.base.test.MailUtil; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java index ad3f709..0cc1bae 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java @@ -25,11 +25,11 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.RFC2822Headers; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e220680..800c770 100644 --- a/pom.xml +++ b/pom.xml @@ -526,6 +526,7 @@ <modules> <module>backends-common</module> <module>core</module> + <module>javax-mail-extension</module> <module>mailbox</module> <module>mailet</module> <module>mdn</module> @@ -1450,6 +1451,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-api</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/container/core/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index f415824..8384f8c 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -72,6 +72,12 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java index 894db47..b19411f 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageFromSharedStreamTest.java @@ -21,7 +21,7 @@ package org.apache.james.server.core; import javax.mail.internet.MimeMessage; -import org.apache.mailet.base.test.MimeMessageUtil; +import org.apache.james.util.MimeMessageUtil; public class MimeMessageFromSharedStreamTest extends MimeMessageFromStreamTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java index 479411b..0998146 100644 --- a/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java +++ b/server/container/core/src/test/java/org/apache/james/server/core/MimeMessageTest.java @@ -38,8 +38,8 @@ import javax.mail.internet.MimeMultipart; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.lifecycle.api.LifecycleUtil; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.base.RFC2822Headers; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Test; public class MimeMessageTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 58b2f3f..2bbb9b1 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -90,6 +90,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-util-java8</artifactId> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java index d3e68e6..cc78ded 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java @@ -43,13 +43,13 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; +import org.apache.james.util.MimeMessageUtil; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.After; import org.junit.Before; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailetcontainer-camel/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 539ba09..8a921c2 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -93,6 +93,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-util-java8</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java index d6b8667..bd8a732 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java @@ -41,8 +41,8 @@ import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.server.core.MailImpl; import org.apache.james.user.memory.MemoryUsersRepository; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.assertj.core.api.JUnitSoftAssertions; import org.junit.Before; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 1abfda0..b95770f 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -153,6 +153,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java index 3d6a79c..59881a1 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java @@ -35,11 +35,11 @@ import org.apache.james.domainlist.api.DomainListException; import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.MappingsImpl; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java index 4f01b64..903a32a 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java @@ -23,12 +23,12 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.internet.MimeMessage; import org.apache.james.domainlist.api.DomainList; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.MailetContext; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java index 14cf918..663b178 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java @@ -35,13 +35,13 @@ import javax.mail.MessagingException; import org.apache.commons.io.IOUtils; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.PerRecipientHeaders.Header; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.RFC2822Headers; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java index 9b56dc3..faad032 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java @@ -36,11 +36,11 @@ import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.transport.mailets.Sieve; import org.apache.james.transport.mailets.jsieve.ResourceLocator; import org.apache.james.user.api.UsersRepository; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java index 439c3d3..3cb08d7 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java @@ -31,9 +31,9 @@ import javax.mail.internet.MimeMessage; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.joda.time.DateTime; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java index 636d729..014f446 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java @@ -33,10 +33,10 @@ import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.MailetContext; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index 630c496..b305cae 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -115,6 +115,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.jayway.restassured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 632773a..2cb925f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -83,6 +83,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 1fc4864..1bf5afa 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -78,6 +78,7 @@ import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; import org.apache.james.util.ClassLoaderUtils; +import org.apache.james.util.MimeMessageUtil; import org.apache.james.util.ZeroedInputStream; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -86,7 +87,6 @@ import org.apache.james.utils.MessageIdProbe; import org.apache.james.utils.SMTPMessageSender; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.After; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index d1dfc6d..890e138 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -85,6 +85,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index fa37e8f..546afd7 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -145,6 +145,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java index 1dc3357..2484aa9 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java @@ -29,10 +29,10 @@ import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.internet.MimeMessage; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.Mail; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailetConfig; -import org.apache.mailet.base.test.MimeMessageUtil; import org.junit.Before; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java index 6147814..de313a2 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java @@ -34,8 +34,8 @@ import javax.mail.internet.MimeMessage; import org.apache.james.core.MailAddress; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; +import org.apache.james.util.MimeMessageUtil; import org.apache.mailet.base.test.FakeMail; -import org.apache.mailet.base.test.MimeMessageUtil; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MimeMessageBodyGeneratorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MimeMessageBodyGeneratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MimeMessageBodyGeneratorTest.java index f5586f1..5c837a8 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MimeMessageBodyGeneratorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MimeMessageBodyGeneratorTest.java @@ -31,7 +31,7 @@ import java.util.Optional; import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; -import org.apache.mailet.base.test.MimeMessageUtil; +import org.apache.james.util.MimeMessageUtil; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-activemq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index 1b045be..cf24d5a 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -77,6 +77,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index 0ac09b4..7e67459 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -58,6 +58,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java index 8168406..975d8ed 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueContract.java @@ -21,10 +21,10 @@ package org.apache.james.queue.api; import static org.apache.james.queue.api.Mails.createMimeMessage; import static org.apache.james.queue.api.Mails.defaultMail; +import static org.apache.james.util.MimeMessageUtil.asString; import static org.apache.mailet.base.MailAddressFixture.RECIPIENT1; import static org.apache.mailet.base.MailAddressFixture.RECIPIENT2; import static org.apache.mailet.base.MailAddressFixture.SENDER; -import static org.apache.mailet.base.test.MimeMessageUtil.asString; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index ad3e108..2fb463d 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -73,6 +73,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-jms/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index bcc2368..59a65b8 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -73,6 +73,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/c8e705d3/server/queue/queue-memory/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml index d4b7cae..bb9df1a 100644 --- a/server/queue/queue-memory/pom.xml +++ b/server/queue/queue-memory/pom.xml @@ -42,6 +42,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>javax-mail-extension</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
