From 6031bffa9f4c62f6fe0baf1d29c456c3adb2740b Mon Sep 17 00:00:00 2001
From: bbottema <b.bottema@projectnibble.org>
Date: Sat, 1 Feb 2020 11:19:26 +0100
Subject: [PATCH] #245: Switched to new parent POM which defines all versions
 in dependenyManagement, updated Jakarta dependencies for JDK9+. Disabled
 notnull Maven plugin, which doesn't work with JDK11+

---
 modules/core-module/pom.xml                         | 13 +++++++++++++
 .../mailer/internal/ServerConfigTest.java           |  3 +++
 pom.xml                                             |  8 ++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
index 24fcebe7e..29a50bf5d 100644
--- a/modules/core-module/pom.xml
+++ b/modules/core-module/pom.xml
@@ -30,11 +30,24 @@
             <artifactId>jakarta.activation</artifactId>
             <version>1.2.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>
             <groupId>com.github.bbottema</groupId>
             <artifactId>emailaddress-rfc2822</artifactId>
             <version>2.1.3</version>
         </dependency>
+
         <dependency><!-- Annotation processor -->
             <groupId>com.github.therapi</groupId>
             <artifactId>therapi-runtime-javadoc-scribe</artifactId>
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/ServerConfigTest.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/ServerConfigTest.java
index b2db54edf..2ec93baf7 100644
--- a/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/ServerConfigTest.java
+++ b/modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/ServerConfigTest.java
@@ -1,6 +1,7 @@
 package org.simplejavamail.mailer.internal;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.simplejavamail.api.mailer.config.ServerConfig;
 import org.simplejavamail.config.ConfigLoader;
@@ -24,6 +25,7 @@ public void restoreOriginalStaticProperties() {
 	}
 
 	@Test
+	@Ignore("Enable once the notnull plugin is enabled again or substituted")
 	public void NoArgconstructor_WithoutConfigFile_WithoutHost() {
 		ConfigLoaderTestHelper.clearConfigProperties();
 		
@@ -36,6 +38,7 @@ public void NoArgconstructor_WithoutConfigFile_WithoutHost() {
 	}
 
 	@Test
+	@Ignore("Enable once the notnull plugin is enabled again or substituted")
 	public void NoArgconstructor_WithoutConfigFile_WithoutPort() {
 		ConfigLoaderTestHelper.clearConfigProperties();
 		try {
diff --git a/pom.xml b/pom.xml
index 54d9b21e5..553bbb088 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.bbottema</groupId>
         <artifactId>modular-project-parent</artifactId>
-        <version>1.0.11</version>
+        <version>1.0.13</version>
     </parent>
 
     <groupId>org.simplejavamail</groupId>
@@ -19,6 +19,10 @@
     <description>Simple Java Mail - Maven master project</description>
     <url>http://www.simplejavamail.org/</url>
 
+    <properties>
+        <se.eris.notnull.instrument>false</se.eris.notnull.instrument>
+    </properties>
+
     <!-- to skip some steps: -DskipTests -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -Denforcer.skip=true -Djacoco.skip=true -Dlicense.skip=true -->
 
     <issueManagement>
@@ -233,4 +237,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>