diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
index e7c52de90..866e91b8e 100644
--- a/modules/core-module/pom.xml
+++ b/modules/core-module/pom.xml
@@ -34,17 +34,6 @@
             <artifactId>jakarta.activation</artifactId>
             <version>2.0.1</version>
         </dependency>
-        <!-- java 9+ compatibility, these modules are not shipped anymore -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
-        </dependency>
 
         <dependency><!-- email validation framework -->
             <groupId>com.sanctionco.jmail</groupId>
diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
index de6544023..3fc050f13 100644
--- a/modules/core-test-module/pom.xml
+++ b/modules/core-test-module/pom.xml
@@ -44,5 +44,11 @@
             <artifactId>assertj-core</artifactId>
             <version>3.21.0</version>
         </dependency>
+        <!-- java 9+ compatibility, these modules are not shipped anymore -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/modules/core-test-module/src/main/java/demo/DemoAppBase.java b/modules/core-test-module/src/main/java/demo/DemoAppBase.java
index c57a78cec..87c56d065 100644
--- a/modules/core-test-module/src/main/java/demo/DemoAppBase.java
+++ b/modules/core-test-module/src/main/java/demo/DemoAppBase.java
@@ -8,7 +8,7 @@
 import testutil.ImplLoader;
 import testutil.ModuleLoaderTestHelper;
 
-import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
+import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 
 public class DemoAppBase {
 
@@ -59,4 +59,4 @@ public static byte[] produceThumbsUpImage() {
 				"x1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
 		return parseBase64Binary(base64String);
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
index 1c0238aae..b03584caa 100644
--- a/modules/simple-java-mail/pom.xml
+++ b/modules/simple-java-mail/pom.xml
@@ -83,6 +83,14 @@
             <version>6.0.1</version>
             <scope>test</scope>
         </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>
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java
index da81892b6..72c6803aa 100644
--- a/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java
+++ b/modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java
@@ -16,7 +16,7 @@
 import java.util.Properties;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
-import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
+import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest {
@@ -85,4 +85,4 @@ public void testBuilderSimpleBuildWithStandardEmail_PlusOptionals()
 		
 		assertThat(EmailHelper.createDummyEmailBuilder(true, false, true, false, false, false).buildEmail()).isEqualTo(email);
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java
index 21a7f2ba2..b7b4373b4 100644
--- a/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java
+++ b/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java
@@ -30,8 +30,8 @@
 import java.util.UUID;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
+import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 import static java.util.Calendar.APRIL;
-import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -444,4 +444,4 @@ private MailerRegularBuilderImpl createFullyConfiguredMailerBuilder(final boolea
 				.withProperty("extra1", prefix + "value1")
 				.withProperty("extra2", prefix + "value2");
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/simple-java-mail/src/test/java/testutil/EmailHelper.java b/modules/simple-java-mail/src/test/java/testutil/EmailHelper.java
index 4880a20bd..9a9bc9bdc 100644
--- a/modules/simple-java-mail/src/test/java/testutil/EmailHelper.java
+++ b/modules/simple-java-mail/src/test/java/testutil/EmailHelper.java
@@ -25,11 +25,11 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
+import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 import static java.util.Calendar.SEPTEMBER;
 import static java.util.Optional.ofNullable;
 import static java.util.UUID.randomUUID;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
 import static org.simplejavamail.api.mailer.config.LoadBalancingStrategy.ROUND_ROBIN;
 import static org.simplejavamail.converter.EmailConverter.emlToEmailBuilder;
 import static org.simplejavamail.converter.EmailConverter.outlookMsgToEmailBuilder;