oap-mail -> oap-mail + oap-mail-test

oaplatform · Jan 10, 2024 · ad3f931 · ad3f931
1 parent a0ca04a
commit ad3f931
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 7 deletions.
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/oap-mail-test/pom.xml b/oap-mail-test/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The MIT License (MIT)
+  ~
+  ~ Copyright (c) Open Application Platform Authors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <name>oap-mail-test</name>
+    <artifactId>oap-mail-test</artifactId>
+
+    <parent>
+        <groupId>oap</groupId>
+        <artifactId>oap-mail-parent</artifactId>
+        <version>${oap-mail.project.version}</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-mail</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-stdlib-test</artifactId>
+            <version>${oap.deps.oap.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${oap.deps.lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../src/main/java/oap/mail/test/MailBox.java → .../src/main/java/oap/mail/test/MailBox.java b/.../src/main/java/oap/mail/test/MailBox.java → .../src/main/java/oap/mail/test/MailBox.java
diff --git a/.../java/oap/mail/test/MessageAssertion.java → .../java/oap/mail/test/MessageAssertion.java b/.../java/oap/mail/test/MessageAssertion.java → .../java/oap/mail/test/MessageAssertion.java
diff --git a/...java/oap/mail/test/MessagesAssertion.java → ...java/oap/mail/test/MessagesAssertion.java b/...java/oap/mail/test/MessagesAssertion.java → ...java/oap/mail/test/MessagesAssertion.java
diff --git a/...src/test/java/oap/mail/MailQueueTest.java → ...src/test/java/oap/mail/MailQueueTest.java b/...src/test/java/oap/mail/MailQueueTest.java → ...src/test/java/oap/mail/MailQueueTest.java
diff --git a/.../src/test/java/oap/mail/TemplateTest.java → .../src/test/java/oap/mail/TemplateTest.java b/.../src/test/java/oap/mail/TemplateTest.java → .../src/test/java/oap/mail/TemplateTest.java
diff --git a/...ail/src/test/java/oap/mail/TestGMail.java → ...est/src/test/java/oap/mail/TestGMail.java b/...ail/src/test/java/oap/mail/TestGMail.java → ...est/src/test/java/oap/mail/TestGMail.java
diff --git a/...p/mail/message/TextMessageParserTest.java → ...p/mail/message/TextMessageParserTest.java b/...p/mail/message/TextMessageParserTest.java → ...p/mail/message/TextMessageParserTest.java
diff --git a/...ail/message/xml/XmlMessageParserTest.java → ...ail/message/xml/XmlMessageParserTest.java b/...ail/message/xml/XmlMessageParserTest.java → ...ail/message/xml/XmlMessageParserTest.java
diff --git a/...ail/velocity/FormatDateDirectiveTest.java → ...ail/velocity/FormatDateDirectiveTest.java b/...ail/velocity/FormatDateDirectiveTest.java → ...ail/velocity/FormatDateDirectiveTest.java
diff --git a/...oap/mail/velocity/XPathDirectiveTest.java → ...oap/mail/velocity/XPathDirectiveTest.java b/...oap/mail/velocity/XPathDirectiveTest.java → ...oap/mail/velocity/XPathDirectiveTest.java
diff --git a/oap-mail/src/test/resources/logback-test.xml → ...-test/src/test/resources/logback-test.xml b/oap-mail/src/test/resources/logback-test.xml → ...-test/src/test/resources/logback-test.xml
diff --git a/...sources/oap/mail/TemplateTest/include.txt → ...sources/oap/mail/TemplateTest/include.txt b/...sources/oap/mail/TemplateTest/include.txt → ...sources/oap/mail/TemplateTest/include.txt
diff --git a/...l/message/TextMessageParserTest/att1.mail → ...l/message/TextMessageParserTest/att1.mail b/...l/message/TextMessageParserTest/att1.mail → ...l/message/TextMessageParserTest/att1.mail
diff --git a/...l/message/TextMessageParserTest/att2.mail → ...l/message/TextMessageParserTest/att2.mail b/...l/message/TextMessageParserTest/att2.mail → ...l/message/TextMessageParserTest/att2.mail
diff --git a/...essage/TextMessageParserTest/subject.mail → ...essage/TextMessageParserTest/subject.mail b/...essage/TextMessageParserTest/subject.mail → ...essage/TextMessageParserTest/subject.mail
diff --git a/...ssage/xml/XmlMessageParserTest/mail.xmail → ...ssage/xml/XmlMessageParserTest/mail.xmail b/...ssage/xml/XmlMessageParserTest/mail.xmail → ...ssage/xml/XmlMessageParserTest/mail.xmail
diff --git a/...age/xml/XmlMessageParserTest/simple.xmail → ...age/xml/XmlMessageParserTest/simple.xmail b/...age/xml/XmlMessageParserTest/simple.xmail → ...age/xml/XmlMessageParserTest/simple.xmail
diff --git a/...mlMessageParserTest/text-attachment.xmail → ...mlMessageParserTest/text-attachment.xmail b/...mlMessageParserTest/text-attachment.xmail → ...mlMessageParserTest/text-attachment.xmail
diff --git a/...mail/velocity/XPathDirectiveTest/test.xml → ...mail/velocity/XPathDirectiveTest/test.xml b/...mail/velocity/XPathDirectiveTest/test.xml → ...mail/velocity/XPathDirectiveTest/test.xml
diff --git a/oap-mail/src/test/resources/tux.jpeg → oap-mail-test/src/test/resources/tux.jpeg b/oap-mail/src/test/resources/tux.jpeg → oap-mail-test/src/test/resources/tux.jpeg
diff --git a/oap-mail/src/test/resources/xjapanese.xmail → ...l-test/src/test/resources/xjapanese.xmail b/oap-mail/src/test/resources/xjapanese.xmail → ...l-test/src/test/resources/xjapanese.xmail
diff --git a/pom.xml b/pom.xml
@@ -44,13 +44,14 @@
 
     <modules>
         <module>oap-mail</module>
+        <module>oap-mail-test</module>
         <module>oap-mail-sendgrid</module>
     </modules>
 
     <properties>
-        <oap-mail.project.version>21.0.1</oap-mail.project.version>
+        <oap-mail.project.version>21.1.0</oap-mail.project.version>
 
-        <oap.deps.oap.version>21.1.2</oap.deps.oap.version>
+        <oap.deps.oap.version>21.2.0</oap.deps.oap.version>
 
         <oap.deps.sendgrid.version>4.9.3</oap.deps.sendgrid.version>
         <oap.deps.lombok.version>1.18.30</oap.deps.lombok.version>