Migrated to jakarta namespace and bumped version number to 2.0.0

diff --git a/pom.xml b/pom.xml
index 56fe40d..9734179 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <groupId>jp.sourceforge.spring-ext</groupId>
        <artifactId>ozacc-mail</artifactId>
        <packaging>jar</packaging>
-       <version>1.3.0</version>
+       <version>2.0.0</version>
        <name>ozacc-mail library</name>
        <description>Library to send and receive emails.</description>
        <url>http://spring-ext.sourceforge.jp/oml/</url>
@@ -56,14 +56,8 @@
                </dependency>
                <dependency>
                        <groupId>com.sun.mail</groupId>
-                       <artifactId>mailapi</artifactId>
-                       <version>1.6.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>activation</artifactId>
-                       <version>1.1.1</version>
-                       <scope>provided</scope>
+                       <artifactId>jakarta.mail</artifactId>
+                       <version>2.0.1</version>
                </dependency>
                <dependency>
                        <groupId>commons-logging</groupId>
@@ -122,7 +116,7 @@
                <dependency>
                        <groupId>org.jvnet.mock-javamail</groupId>
                        <artifactId>mock-javamail</artifactId>
-                       <version>1.12</version>
+                       <version>2.2-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -157,19 +151,32 @@
                        <plugins>
                                <plugin>
                                        <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>3.3</version>
+                                       <version>3.11.0</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-enforcer-plugin</artifactId>
+                               <version>3.4.1</version>
+                               <configuration>
+                                       <rules>
+                                               <requireMavenVersion>
+                                                       <version>[3.5.0,)</version>
+                                               </requireMavenVersion>
+                                       </rules>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>
+                               <version>3.0.1</version>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                               <version>1.14</version>
+                               <version>1.23</version>
                                <executions>
                                        <execution>
                                                <id>check-java-version</id>
@@ -189,8 +196,13 @@
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>3.3.1</version>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
-                               <version>3.0.0</version>
+                               <version>3.3.0</version>
                                <executions>
                                        <execution>
                                                <id>attach-sources</id>
@@ -203,7 +215,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.0.1</version>
+                               <version>3.6.3</version>
                                <executions>
                                        <execution>
                                                <id>attach-javadocs</id>
@@ -221,7 +233,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-gpg-plugin</artifactId>
-                               <version>1.6</version>
+                               <version>3.1.0</version>
                                <executions>
                                        <execution>
                                                <id>sign-artifacts</id>
@@ -241,7 +253,7 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.8</version>
+                               <version>1.6.13</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <serverId>ossrh</serverId>

diff --git a/sandbox/src/com/ozacc/mail/util/MXCheck.java b/sandbox/src/com/ozacc/mail/util/MXCheck.java
index 389c739..c5d1a73 100644 (file)
--- a/sandbox/src/com/ozacc/mail/util/MXCheck.java
+++ b/sandbox/src/com/ozacc/mail/util/MXCheck.java
@@ -1,7 +1,7 @@
 package com.ozacc.mail.util;
 
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;

diff --git a/src/main/java/com/ozacc/mail/Mail.java b/src/main/java/com/ozacc/mail/Mail.java
index b6ff2a5..f62eeee 100644 (file)
--- a/src/main/java/com/ozacc/mail/Mail.java
+++ b/src/main/java/com/ozacc/mail/Mail.java
@@ -11,12 +11,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.activation.FileTypeMap;
-import javax.activation.URLDataSource;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.FileTypeMap;
+import jakarta.activation.URLDataSource;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 import com.ozacc.mail.impl.ByteArrayDataSource;
 

diff --git a/src/main/java/com/ozacc/mail/SendMail.java b/src/main/java/com/ozacc/mail/SendMail.java
index e5da52e..cf4f85e 100644 (file)
--- a/src/main/java/com/ozacc/mail/SendMail.java
+++ b/src/main/java/com/ozacc/mail/SendMail.java
@@ -1,6 +1,6 @@
 package com.ozacc.mail;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * SendMailインターフェース。

diff --git a/src/main/java/com/ozacc/mail/SendMailPro.java b/src/main/java/com/ozacc/mail/SendMailPro.java
index 94c8685..cc19ce5 100644 (file)
--- a/src/main/java/com/ozacc/mail/SendMailPro.java
+++ b/src/main/java/com/ozacc/mail/SendMailPro.java
@@ -1,6 +1,6 @@
 package com.ozacc.mail;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * SMTPサーバとの接続、切断を任意のタイミングで行いたい場合に使用するSendMailインターフェース。

diff --git a/src/main/java/com/ozacc/mail/fetch/FetchMailPro.java b/src/main/java/com/ozacc/mail/fetch/FetchMailPro.java
index 532fef2..f59b76d 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/FetchMailPro.java
+++ b/src/main/java/com/ozacc/mail/fetch/FetchMailPro.java
@@ -1,6 +1,6 @@
 package com.ozacc.mail.fetch;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 import com.ozacc.mail.MailException;
 
@@ -82,7 +82,7 @@ public interface FetchMailPro {
         * 現在のフォルダにある指定されたメッセージ番号のメールを返します。
         * メッセージ番号は1始まりです。
         * 
-        * @see javax.mail.Folder#getMessage(int)
+        * @see jakarta.mail.Folder#getMessage(int)
         * @param num メッセージ番号。1始まり。
         * @return 指定された番号のMimeMessageインスタンス
         * @throws MailException メール取得に失敗した場合

diff --git a/src/main/java/com/ozacc/mail/fetch/MailConverter.java b/src/main/java/com/ozacc/mail/fetch/MailConverter.java
index 83ac972..78459b8 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/MailConverter.java
+++ b/src/main/java/com/ozacc/mail/fetch/MailConverter.java
@@ -1,6 +1,6 @@
 package com.ozacc.mail.fetch;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * <code>MimeMessage</code>から<code>ReceivedMail</code>を生成するインターフェース。

diff --git a/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java b/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
index 35005cc..0769ddb 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
+++ b/src/main/java/com/ozacc/mail/fetch/ReceivedMail.java
@@ -6,9 +6,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.mail.Flags;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Flags;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 
 import com.ozacc.mail.Mail;
 

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/FetchMailProImpl.java b/src/main/java/com/ozacc/mail/fetch/impl/FetchMailProImpl.java
index fe025d0..dff8337 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/FetchMailProImpl.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/FetchMailProImpl.java
@@ -2,15 +2,15 @@ package com.ozacc.mail.fetch.impl;
 
 import java.util.Properties;
 
-import javax.mail.AuthenticationFailedException;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.AuthenticationFailedException;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Session;
+import jakarta.mail.Store;
+import jakarta.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -394,7 +394,7 @@ public class FetchMailProImpl implements FetchMailPro {
         * 有効にすると、<code>System.out</code>のデバッグメッセージが出力されます。<br>
         * デフォルトは無効になっています。
         * 
-        * @see javax.mail.session#setDebug(boolean)
+        * @see jakarta.mail.session#setDebug(boolean)
         * @param javaMailLogEnabled The javaMailLogEnabled to set.
         */
        public void setJavaMailLogEnabled(boolean javaMailLogEnabled) {

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/MailConverterImpl.java b/src/main/java/com/ozacc/mail/fetch/impl/MailConverterImpl.java
index 34525a8..d352c3a 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/MailConverterImpl.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/MailConverterImpl.java
@@ -13,13 +13,13 @@ import java.util.Enumeration;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.mail.Address;
-import javax.mail.Header;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Address;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -59,7 +59,7 @@ public class MailConverterImpl implements MailConverter {
        private long attachmentLifetime = 3600 * 1000 * 12L;
 
        /**
-        * @see com.ozacc.mail.fetch.MailConverter#convertIntoMails(javax.mail.internet.MimeMessage[])
+        * @see com.ozacc.mail.fetch.MailConverter#convertIntoMails(jakarta.mail.internet.MimeMessage[])
         */
        public ReceivedMail[] convertIntoMails(MimeMessage[] messages) {
                log.debug("計" + messages.length + "通のMimeMessageをMailに変換します。");
@@ -459,7 +459,7 @@ public class MailConverterImpl implements MailConverter {
        }
 
        /**
-        * @see com.ozacc.mail.fetch.MailConverter#convertIntoMail(javax.mail.internet.MimeMessage)
+        * @see com.ozacc.mail.fetch.MailConverter#convertIntoMail(jakarta.mail.internet.MimeMessage)
         */
        public ReceivedMail convertIntoMail(MimeMessage mm) {
                ReceivedMail mail = createReceivedMail();

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/AttachmentsExtractor.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/AttachmentsExtractor.java
index 92d5199..e83b48b 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/AttachmentsExtractor.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/AttachmentsExtractor.java
@@ -9,9 +9,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
 
 /**
  * 添付ファイルを抽出するPartHandlerです。
@@ -155,8 +155,8 @@ public class AttachmentsExtractor implements PartHandler {
        }
 
        public static void main(String[] args) throws Exception {
-               javax.mail.internet.MimeMessage msg = new javax.mail.internet.MimeMessage(
-                               javax.mail.Session.getDefaultInstance(System.getProperties(), null), System.in);
+               jakarta.mail.internet.MimeMessage msg = new jakarta.mail.internet.MimeMessage(
+                               jakarta.mail.Session.getDefaultInstance(System.getProperties(), null), System.in);
                AttachmentsExtractor h = new AttachmentsExtractor();
                MultipartUtility.process(msg, h);
                for (int i = 0; i < h.getCount(); i++) {

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSource.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSource.java
index 65fedf4..2b2e0d4 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSource.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSource.java
@@ -8,13 +8,13 @@ package com.ozacc.mail.fetch.impl.sk_jp;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import javax.activation.DataSource;
-import javax.mail.MessageAware;
-import javax.mail.MessageContext;
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
+import jakarta.activation.DataSource;
+import jakarta.mail.MessageAware;
+import jakarta.mail.MessageContext;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.ParseException;
 
 /**
  * Content-Type:の不適合をISO-2022-JPに補正します。

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSourceUTF7Support.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSourceUTF7Support.java
index aabce53..d7c43d4 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSourceUTF7Support.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/CorrectedContentTypeDataSourceUTF7Support.java
@@ -10,14 +10,14 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.activation.DataSource;
-import javax.mail.MessageAware;
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.ParseException;
+import jakarta.activation.DataSource;
+import jakarta.mail.MessageAware;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.ParseException;
 
 import com.ozacc.mail.fetch.impl.sk_jp.io.ByteToCharUTF7;
 
@@ -156,7 +156,7 @@ class CorrectedContentTypeDataSourceUTF7Support extends CorrectedContentTypeData
                                return false;
                        }
                        Part part = ((MessageAware)source).getMessageContext().getPart();
-                       String encoding = ((javax.mail.internet.MimePart)part).getEncoding();
+                       String encoding = ((jakarta.mail.internet.MimePart)part).getEncoding();
                        if ("7bit".equalsIgnoreCase(encoding) || "8bit".equalsIgnoreCase(encoding)
                                        || "binary".equalsIgnoreCase(encoding)) {
                                return false;

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/FirstPlainPartExtractor.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/FirstPlainPartExtractor.java
index 4d53650..10f6ec5 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/FirstPlainPartExtractor.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/FirstPlainPartExtractor.java
@@ -6,9 +6,9 @@
 package com.ozacc.mail.fetch.impl.sk_jp;
 
 import java.io.IOException;
-import javax.mail.Part;
-import javax.mail.MessagingException;
-import javax.mail.internet.ContentType;
+import jakarta.mail.Part;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.ContentType;
 
 /**
  * 最初に見つけたtext/plainパートの本文を得るPartHandlerです。
@@ -38,8 +38,8 @@ public class FirstPlainPartExtractor implements PartHandler {
        }
 
        public static void main(String[] args) throws Exception {
-               javax.mail.internet.MimeMessage msg = new javax.mail.internet.MimeMessage(
-                               javax.mail.Session.getDefaultInstance(System.getProperties(), null), System.in);
+               jakarta.mail.internet.MimeMessage msg = new jakarta.mail.internet.MimeMessage(
+                               jakarta.mail.Session.getDefaultInstance(System.getProperties(), null), System.in);
                FirstPlainPartExtractor h = new FirstPlainPartExtractor();
                MultipartUtility.process(msg, h);
 

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/HtmlPartExtractor.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/HtmlPartExtractor.java
index b8cfe9c..cf6c37c 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/HtmlPartExtractor.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/HtmlPartExtractor.java
@@ -7,9 +7,9 @@ package com.ozacc.mail.fetch.impl.sk_jp;
 
 import java.io.IOException;
 
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
 
 /**
  * text/htmlを結合した文字列を得るPartHandlerです。

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/JISDataSource.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/JISDataSource.java
index b844909..81117f9 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/JISDataSource.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/JISDataSource.java
@@ -11,7 +11,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import com.ozacc.mail.fetch.impl.sk_jp.io.CharCodeConverter;
 import com.ozacc.mail.fetch.impl.sk_jp.io.UnicodeCorrector;

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MailUtility.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MailUtility.java
index e0162b8..cae79ae 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MailUtility.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MailUtility.java
@@ -10,20 +10,20 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
-import javax.activation.DataHandler;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.ContentDisposition;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.HeaderTokenizer;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MailDateFormat;
-import javax.mail.internet.MimeUtility;
-import javax.mail.internet.ParseException;
+import jakarta.activation.DataHandler;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.ContentDisposition;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.HeaderTokenizer;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MailDateFormat;
+import jakarta.mail.internet.MimeUtility;
+import jakarta.mail.internet.ParseException;
 
 import com.ozacc.mail.fetch.impl.sk_jp.io.CharCodeConverter;
 import com.ozacc.mail.fetch.impl.sk_jp.io.UnicodeCorrector;

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MultipartUtility.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MultipartUtility.java
index 7c779d5..fad6905 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MultipartUtility.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/MultipartUtility.java
@@ -8,13 +8,13 @@ package com.ozacc.mail.fetch.impl.sk_jp;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMultipart;
 
 /**
  * メッセージボディを取り出す手段を提供するstaticメソッドのセットです。

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PartHandler.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PartHandler.java
index 328d2bf..68f158f 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PartHandler.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PartHandler.java
@@ -6,9 +6,9 @@
 package com.ozacc.mail.fetch.impl.sk_jp;
 
 import java.io.IOException;
-import javax.mail.Part;
-import javax.mail.MessagingException;
-import javax.mail.internet.ContentType;
+import jakarta.mail.Part;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.ContentType;
 
 /**
  * PartHandlerです。

diff --git a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PlainPartExtractor.java b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PlainPartExtractor.java
index f251f28..e1ae4e6 100644 (file)
--- a/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PlainPartExtractor.java
+++ b/src/main/java/com/ozacc/mail/fetch/impl/sk_jp/PlainPartExtractor.java
@@ -7,10 +7,10 @@ package com.ozacc.mail.fetch.impl.sk_jp;
 
 import java.io.IOException;
 
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * text/plainを結合した文字列を得るPartHandlerです。
@@ -44,7 +44,7 @@ public class PlainPartExtractor implements PartHandler {
        }
 
        public static void main(String[] args) throws Exception {
-               MimeMessage msg = new MimeMessage(javax.mail.Session.getDefaultInstance(System
+               MimeMessage msg = new MimeMessage(jakarta.mail.Session.getDefaultInstance(System
                                .getProperties(), null), System.in);
                PlainPartExtractor h = new PlainPartExtractor();
                MultipartUtility.process(msg, h);

diff --git a/src/main/java/com/ozacc/mail/impl/ByteArrayDataSource.java b/src/main/java/com/ozacc/mail/impl/ByteArrayDataSource.java
index c766a99..e2d48e2 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/ByteArrayDataSource.java
+++ b/src/main/java/com/ozacc/mail/impl/ByteArrayDataSource.java
@@ -45,7 +45,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 /**
  * InputStream、byte array、StringからDataSourceインスタンスを生成するクラス。<br>

diff --git a/src/main/java/com/ozacc/mail/impl/MimeMessageBuilder.java b/src/main/java/com/ozacc/mail/impl/MimeMessageBuilder.java
index a3978b5..99a1b29 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/MimeMessageBuilder.java
+++ b/src/main/java/com/ozacc/mail/impl/MimeMessageBuilder.java
@@ -4,16 +4,16 @@ import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.mail.MessagingException;
-import javax.mail.Message.RecipientType;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimePart;
-import javax.mail.internet.MimeUtility;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Message.RecipientType;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.internet.MimePart;
+import jakarta.mail.internet.MimeUtility;
 
 import com.ozacc.mail.Mail;
 

diff --git a/src/main/java/com/ozacc/mail/impl/OMLMimeMessage.java b/src/main/java/com/ozacc/mail/impl/OMLMimeMessage.java
index 7575c00..8b6ac37 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/OMLMimeMessage.java
+++ b/src/main/java/com/ozacc/mail/impl/OMLMimeMessage.java
@@ -2,9 +2,9 @@ package com.ozacc.mail.impl;
 
 import java.util.Random;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * Message-Idヘッダがカスタマイズ可能なMimeMessageのサブクラス。
@@ -50,7 +50,7 @@ public class OMLMimeMessage extends MimeMessage {
         * 参考ページ<br>
         * <a href="http://java.sun.com/products/javamail/FAQ.html#msgid">http://java.sun.com/products/javamail/FAQ.html#msgid</a>
         * 
-        * @see javax.mail.internet.MimeMessage#updateHeaders()
+        * @see jakarta.mail.internet.MimeMessage#updateHeaders()
         */
        protected void updateHeaders() throws MessagingException {
                super.updateHeaders();

diff --git a/src/main/java/com/ozacc/mail/impl/SendMailImpl.java b/src/main/java/com/ozacc/mail/impl/SendMailImpl.java
index a00e4e9..4cc3686 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/SendMailImpl.java
+++ b/src/main/java/com/ozacc/mail/impl/SendMailImpl.java
@@ -4,12 +4,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.Properties;
 
-import javax.mail.AuthenticationFailedException;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.AuthenticationFailedException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -134,14 +134,14 @@ public class SendMailImpl implements SendMail {
        }
 
        /**
-        * @see com.ozacc.mail.SendMail#send(javax.mail.internet.MimeMessage)
+        * @see com.ozacc.mail.SendMail#send(jakarta.mail.internet.MimeMessage)
         */
        public void send(MimeMessage message) throws MailException {
                send(new MimeMessage[] { message });
        }
 
        /**
-        * @see com.ozacc.mail.SendMail#send(javax.mail.internet.MimeMessage[])
+        * @see com.ozacc.mail.SendMail#send(jakarta.mail.internet.MimeMessage[])
         */
        public void send(MimeMessage[] messages) throws MailException {
                MimeMessageWrapper[] mmws = new MimeMessageWrapper[messages.length];

diff --git a/src/main/java/com/ozacc/mail/impl/SendMailProImpl.java b/src/main/java/com/ozacc/mail/impl/SendMailProImpl.java
index 03c35b9..c7832eb 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/SendMailProImpl.java
+++ b/src/main/java/com/ozacc/mail/impl/SendMailProImpl.java
@@ -4,12 +4,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.Properties;
 
-import javax.mail.Address;
-import javax.mail.AuthenticationFailedException;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Address;
+import jakarta.mail.AuthenticationFailedException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -210,7 +210,7 @@ public class SendMailProImpl implements SendMailPro {
        }
 
        /**
-        * @see com.ozacc.mail.SendMailPro#send(javax.mail.internet.MimeMessage)
+        * @see com.ozacc.mail.SendMailPro#send(jakarta.mail.internet.MimeMessage)
         */
        public void send(MimeMessage mimeMessage) throws MailException {
                Address[] addresses;

diff --git a/src/main/java/com/ozacc/mail/mock/EqualityCheck.java b/src/main/java/com/ozacc/mail/mock/EqualityCheck.java
index 33491be..a48eede 100644 (file)
--- a/src/main/java/com/ozacc/mail/mock/EqualityCheck.java
+++ b/src/main/java/com/ozacc/mail/mock/EqualityCheck.java
@@ -1,6 +1,6 @@
 package com.ozacc.mail.mock;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import com.ozacc.mail.Mail;
 

diff --git a/src/main/java/com/ozacc/mail/mock/MockFetchMailPro.java b/src/main/java/com/ozacc/mail/mock/MockFetchMailPro.java
index 0117bed..ba4ef03 100644 (file)
--- a/src/main/java/com/ozacc/mail/mock/MockFetchMailPro.java
+++ b/src/main/java/com/ozacc/mail/mock/MockFetchMailPro.java
@@ -3,7 +3,7 @@ package com.ozacc.mail.mock;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/src/main/java/com/ozacc/mail/mock/MockSendMail.java b/src/main/java/com/ozacc/mail/mock/MockSendMail.java
index 4805edc..1c08b9e 100644 (file)
--- a/src/main/java/com/ozacc/mail/mock/MockSendMail.java
+++ b/src/main/java/com/ozacc/mail/mock/MockSendMail.java
@@ -5,10 +5,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import com.ozacc.mail.Mail;
 import com.ozacc.mail.MailBuildException;
@@ -400,14 +400,14 @@ public class MockSendMail implements SendMail {
        }
 
        /**
-        * @see com.ozacc.mail.SendMail#send(javax.mail.internet.MimeMessage)
+        * @see com.ozacc.mail.SendMail#send(jakarta.mail.internet.MimeMessage)
         */
        public void send(MimeMessage mimeMessage) throws MailException {
                throw new UnsupportedOperationException("申し訳ございません。MockSendMailでは、このメソッドをサポートしていません。");
        }
 
        /**
-        * @see com.ozacc.mail.SendMail#send(javax.mail.internet.MimeMessage[])
+        * @see com.ozacc.mail.SendMail#send(jakarta.mail.internet.MimeMessage[])
         */
        public void send(MimeMessage[] mimeMessages) throws MailException {
                throw new UnsupportedOperationException("申し訳ございません。MockSendMailでは、このメソッドをサポートしていません。");

diff --git a/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java b/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
index 3fe508a..cbf13bd 100644 (file)
--- a/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
+++ b/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import org.jdom2.CDATA;
 import org.jdom2.DocType;

diff --git a/src/main/java/com/ozacc/mail/xml/impl/XMLBuilderImpl.java b/src/main/java/com/ozacc/mail/xml/impl/XMLBuilderImpl.java
index 80c9edc..a0611b7 100644 (file)
--- a/src/main/java/com/ozacc/mail/xml/impl/XMLBuilderImpl.java
+++ b/src/main/java/com/ozacc/mail/xml/impl/XMLBuilderImpl.java
@@ -3,7 +3,7 @@ package com.ozacc.mail.xml.impl;
 import java.io.File;
 import java.util.Properties;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;

diff --git a/src/test/java/com/ozacc/mail/fetch/impl/FetchMailImplTest.java b/src/test/java/com/ozacc/mail/fetch/impl/FetchMailImplTest.java
index 00236fe..3440115 100644 (file)
--- a/src/test/java/com/ozacc/mail/fetch/impl/FetchMailImplTest.java
+++ b/src/test/java/com/ozacc/mail/fetch/impl/FetchMailImplTest.java
@@ -1,9 +1,9 @@
 
 package com.ozacc.mail.fetch.impl;
 
-import javax.mail.Message.RecipientType;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Message.RecipientType;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java b/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
index 70b626b..d3389fb 100644 (file)
--- a/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
+++ b/src/test/java/com/ozacc/mail/impl/JDomXMLMailBuilderTest.java
@@ -2,7 +2,7 @@ package com.ozacc.mail.impl;
 
 import java.io.File;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/impl/OMLMimeMessageTest.java b/src/test/java/com/ozacc/mail/impl/OMLMimeMessageTest.java
index f8cc665..ca84e10 100644 (file)
--- a/src/test/java/com/ozacc/mail/impl/OMLMimeMessageTest.java
+++ b/src/test/java/com/ozacc/mail/impl/OMLMimeMessageTest.java
@@ -2,7 +2,7 @@ package com.ozacc.mail.impl;
 
 import java.util.Properties;
 
-import javax.mail.Session;
+import jakarta.mail.Session;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/impl/SendMailImplTest.java b/src/test/java/com/ozacc/mail/impl/SendMailImplTest.java
index afd2e6c..811d222 100644 (file)
--- a/src/test/java/com/ozacc/mail/impl/SendMailImplTest.java
+++ b/src/test/java/com/ozacc/mail/impl/SendMailImplTest.java
@@ -2,11 +2,11 @@ package com.ozacc.mail.impl;
 
 import java.util.Properties;
 
-import javax.mail.Message;
-import javax.mail.Message.RecipientType;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Message;
+import jakarta.mail.Message.RecipientType;
+import jakarta.mail.Session;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java b/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
index 956e246..08dfa5f 100644 (file)
--- a/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
+++ b/src/test/java/com/ozacc/mail/impl/XMLMailBuilderImplTest.java
@@ -2,7 +2,7 @@ package com.ozacc.mail.impl;
 
 import java.io.File;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java b/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
index 413995d..5949851 100644 (file)
--- a/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
+++ b/src/test/java/com/ozacc/mail/impl/XMLVelocityMailBuilderImplTest.java
@@ -2,7 +2,7 @@ package com.ozacc.mail.impl;
 
 import java.io.File;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/com/ozacc/mail/mailet/MailetRunnerTest.java b/src/test/java/com/ozacc/mail/mailet/MailetRunnerTest.java
index 5ce1b82..d8da3dd 100644 (file)
--- a/src/test/java/com/ozacc/mail/mailet/MailetRunnerTest.java
+++ b/src/test/java/com/ozacc/mail/mailet/MailetRunnerTest.java
@@ -3,7 +3,7 @@ package com.ozacc.mail.mailet;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import org.apache.log4j.BasicConfigurator;