From 518023c6595f02a1a54376f9b6cc745acc11d2e1 Mon Sep 17 00:00:00 2001
From: Jeremy Norris <jeremy.norris@localbackhaul.com>
Date: Mon, 31 Jan 2022 08:29:29 -0600
Subject: [PATCH 1/3] Remove unnecessary import of
 javax.activation.MimetypesFileTypeMap.

---
 .../outlookmessageparser/model/OutlookFileAttachment.java       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookFileAttachment.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookFileAttachment.java
index b0ac647..d6ae34c 100644
--- a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookFileAttachment.java
+++ b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookFileAttachment.java
@@ -1,7 +1,5 @@
 package org.simplejavamail.outlookmessageparser.model;
 
-import javax.activation.MimetypesFileTypeMap;
-
 /**
  * Implementation of the {@link OutlookAttachment} interface that represents a file attachment. It contains some useful information (as long as it is available
  * in the .msg file) like the attachment name, its size, etc.

From 2f52d0556fe59968cb2f561a767c100ec3accf4d Mon Sep 17 00:00:00 2001
From: Jeremy Norris <jeremy.norris@localbackhaul.com>
Date: Mon, 31 Jan 2022 08:31:06 -0600
Subject: [PATCH 2/3] Add jakarta.activation as dependency and switch to newer
 version in jakarta namespace.

---
 pom.xml                                                    | 7 ++++++-
 .../outlookmessageparser/model/MimeType.java               | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d87eee..c659d68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,11 @@
 			<artifactId>rtf-to-html</artifactId>
 			<version>1.0.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>jakarta.activation</artifactId>
+			<version>2.0.1</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -109,4 +114,4 @@
 		</plugins>
 	</build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/MimeType.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/MimeType.java
index 1c20d6c..bc91140 100644
--- a/src/main/java/org/simplejavamail/outlookmessageparser/model/MimeType.java
+++ b/src/main/java/org/simplejavamail/outlookmessageparser/model/MimeType.java
@@ -1,6 +1,6 @@
 package org.simplejavamail.outlookmessageparser.model;
 
-import javax.activation.MimetypesFileTypeMap;
+import jakarta.activation.MimetypesFileTypeMap;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -30,4 +30,4 @@ public static String getContentType(String fileName, String charset) {
         }
         return mimeType;
     }
-}
\ No newline at end of file
+}

From 489262f03f8a2172cc4a50b3e3034cdcd1900045 Mon Sep 17 00:00:00 2001
From: Jeremy Norris <jeremy.norris@localbackhaul.com>
Date: Mon, 31 Jan 2022 08:32:33 -0600
Subject: [PATCH 3/3] Add jakarta.annotation-api as a test dependency since it
 is required for assertj-assertions-generator-maven-plugin.

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index c659d68..d9eeba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,14 @@
 			<artifactId>jakarta.activation</artifactId>
 			<version>2.0.1</version>
 		</dependency>
+		<!-- required for java 9+ compatibility with assertj-assertions-generator-maven-plugin, which uses javax.annotation.Generated -->
+		<!-- see https://github.com/assertj/assertj-assertions-generator-maven-plugin/issues/93 -->
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>1.3.5</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>