#489: finished upgrade by upgrading the lingering activation dependencies as well. Also got rid of jakarta.xml.bind-api, which blocked the upgrade due to Java 11 requirement (but wasn't really needed anyway)

Author: bbottema

modules/cli-module/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.github.bbottema</groupId>
             <artifactId>java-reflection</artifactId>
-            <version>4.0.0</version>
+            <version>4.1.0</version>
         </dependency>
 
         <!-- needed for cli support -->

modules/core-test-module/pom.xml

@@ -44,11 +44,5 @@
             <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>

modules/core-test-module/src/main/java/testutil/ThumbsUpImage.java

@@ -1,6 +1,6 @@
 package testutil;
 
-import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
+import java.util.Base64;
 
 public class ThumbsUpImage {
     public static byte[] produceThumbsUpImage() {
@@ -10,6 +10,6 @@ public static byte[] produceThumbsUpImage() {
                 "ryZaDSjeg5mt4LCcFXyIn1fdSyXJQVt1OtMWGhoai0OD8T0W8GohZifE1PxD/o7LlsPLiFNAKRrwOABWptLAcqc6QGDAHQEOAYaA" +
                 "c8BNotsJAOgAUAosG1AFA/AtUoY3YEFhKMAvS2AE7iC1+WaG1H6gY3gzE36hUFJ8mqzbU1dUVBBqQBzTgIDQRkWo5qCZdpaenJ0Z" +
                 "x1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
-        return parseBase64Binary(base64String);
+        return Base64.getDecoder().decode(base64String);
     }
 }

modules/outlook-module/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>outlook-message-parser</artifactId>
-            <version>1.12.0</version>
+            <version>1.13.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest.java

@@ -13,10 +13,10 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.Base64;
 import java.util.Properties;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
-import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EmailPopulatingBuilderUsingDefaultsFromPropertyFileTest {
@@ -33,7 +33,7 @@ public void testBuilderSimpleBuildWithStandardEmail()
 		final String base64StringOfThumbsupImage = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABeElEQVRYw2NgoAAYGxu3GxkZ7TY1NZVloDcAWq4MxH+B+D8Qv3FwcOCgtwM6oJaDMTAUXOhmuYqKCjvQ0pdoDrCnmwNMTEwakC0H4u8GBgYC9Ap6DSD+iewAoIPm0ctyLqBlp9F8/x+YE4zpYT8T0LL16JYD8U26+B7oyz4sloPwenpYno3DchCeROsUbwa05A8eB3wB4kqgIxOAuArIng7EW4H4EhC/B+JXQLwDaI4ryZaDSjeg5mt4LCcFXyIn1fdSyXJQVt1OtMWGhoai0OD8T0W8GohZifE1PxD/o7LlsPLiFNAKRrwOABWptLAcqc6QGDAHQEOAYaAc8BNotsJAOgAUAosG1AFA/AtUoY3YEFhKMAvS2AE7iC1+WaG1H6gY3gzE36hUFJ8mqzbU1dUVBBqQBzTgIDQRkWo5qCZdpaenJ0Zx1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
 		ByteArrayDataSource namedAttachment = new ByteArrayDataSource("Black Tie Optional", "text/plain");
 		namedAttachment.setName("dresscode-ignored-because-of-override.txt");
-		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(parseBase64Binary(base64StringOfThumbsupImage), "image/png");
+		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png");
 		namedEmbeddedImage.setName("thumbsupNamed-ignored-because-of-override.png");
 
 		fixLoadedPropertyPath(Property.SMIME_ENCRYPTION_CERTIFICATE);
@@ -46,7 +46,7 @@ public void testBuilderSimpleBuildWithStandardEmail()
 				.withSubject("hey")
 				.withAttachment("dresscode.txt", namedAttachment)
 				.withAttachment("location.txt", "On the moon!".getBytes(Charset.defaultCharset()), "text/plain")
-				.withEmbeddedImage("thumbsup", parseBase64Binary(base64StringOfThumbsupImage), "image/png")
+				.withEmbeddedImage("thumbsup", Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png")
 				.withAttachment("fixedNameWithoutFileExtensionForNamedAttachment", namedAttachment)
 				.withEmbeddedImage("fixedNameWithoutFileExtensionForNamedEmbeddedImage", namedEmbeddedImage)
 				.buildEmail();
@@ -68,7 +68,7 @@ public void testBuilderSimpleBuildWithStandardEmail_PlusOptionals()
 		final String base64StringOfThumbsupImage = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABeElEQVRYw2NgoAAYGxu3GxkZ7TY1NZVloDcAWq4MxH+B+D8Qv3FwcOCgtwM6oJaDMTAUXOhmuYqKCjvQ0pdoDrCnmwNMTEwakC0H4u8GBgYC9Ap6DSD+iewAoIPm0ctyLqBlp9F8/x+YE4zpYT8T0LL16JYD8U26+B7oyz4sloPwenpYno3DchCeROsUbwa05A8eB3wB4kqgIxOAuArIng7EW4H4EhC/B+JXQLwDaI4ryZaDSjeg5mt4LCcFXyIn1fdSyXJQVt1OtMWGhoai0OD8T0W8GohZifE1PxD/o7LlsPLiFNAKRrwOABWptLAcqc6QGDAHQEOAYaAc8BNotsJAOgAUAosG1AFA/AtUoY3YEFhKMAvS2AE7iC1+WaG1H6gY3gzE36hUFJ8mqzbU1dUVBBqQBzTgIDQRkWo5qCZdpaenJ0Zx1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
 		ByteArrayDataSource namedAttachment = new ByteArrayDataSource("Black Tie Optional", "text/plain");
 		namedAttachment.setName("dresscode-ignored-because-of-override.txt");
-		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(parseBase64Binary(base64StringOfThumbsupImage), "image/png");
+		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png");
 		namedEmbeddedImage.setName("thumbsupNamed-ignored-because-of-override.png");
 
 		final Email email = EmailBuilder.startingBlank()
@@ -81,7 +81,7 @@ public void testBuilderSimpleBuildWithStandardEmail_PlusOptionals()
 				.withSubject("hey")
 				.withAttachment("dresscode.txt", namedAttachment)
 				.withAttachment("location.txt", "On the moon!".getBytes(Charset.defaultCharset()), "text/plain")
-				.withEmbeddedImage("thumbsup", parseBase64Binary(base64StringOfThumbsupImage), "image/png")
+				.withEmbeddedImage("thumbsup", Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png")
 				.withAttachment("fixedNameWithoutFileExtensionForNamedAttachment", namedAttachment)
 				.withEmbeddedImage("fixedNameWithoutFileExtensionForNamedEmbeddedImage", namedEmbeddedImage)
 				.withDispositionNotificationTo("[email protected]")

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java

@@ -27,13 +27,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.AbstractMap.SimpleEntry;
+import java.util.Base64;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
-import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
 import static java.util.Calendar.APRIL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -305,7 +305,7 @@ public void testDKIMPriming()
 						+ "YJMRlfXk67lJXCleZL15EpVPrQ34KlA==";
 
 		emailPopulatingBuilder.signWithDomainKey(DkimConfig.builder()
-						.dkimPrivateKeyData(new ByteArrayInputStream(parseBase64Binary(privateDERkeyBase64)))
+						.dkimPrivateKeyData(new ByteArrayInputStream(Base64.getDecoder().decode(privateDERkeyBase64)))
 						.dkimSigningDomain("supersecret-testing-domain.com")
 						.dkimSelector("dkim1")
 						.excludedHeadersFromDkimDefaultSigningList("Reply-To")
@@ -400,7 +400,7 @@ public void testDKIMPrimingAndSmimeCombo()
 						+ "YJMRlfXk67lJXCleZL15EpVPrQ34KlA==";
 
 		emailPopulatingBuilder.signWithDomainKey(DkimConfig.builder()
-				.dkimPrivateKeyData(new ByteArrayInputStream(parseBase64Binary(privateDERkeyBase64)))
+				.dkimPrivateKeyData(new ByteArrayInputStream(Base64.getDecoder().decode(privateDERkeyBase64)))
 				.dkimSigningDomain("somemail.com")
 				.dkimSelector("select")
 				.build());

modules/simple-java-mail/src/test/java/testutil/EmailHelper.java

@@ -18,14 +18,14 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.Charset;
+import java.util.Base64;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
 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;
@@ -93,13 +93,13 @@ public static EmailPopulatingBuilder createDummyEmailBuilder(@Nullable String id
 		// add two text files in different ways and a black thumbs up embedded image ->
 		ByteArrayDataSource namedAttachment = new ByteArrayDataSource("Black Tie Optional", "text/plain");
 		namedAttachment.setName("dresscode-ignored-because-of-override.txt");
-		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(parseBase64Binary(base64StringOfThumbsupImage), "image/png");
+		ByteArrayDataSource namedEmbeddedImage = new ByteArrayDataSource(Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png");
 		namedEmbeddedImage.setName("thumbsupNamed-ignored-because-of-override.png");
 
 		InternalEmailPopulatingBuilder internalBuilder = ((InternalEmailPopulatingBuilder) builder
 				.withAttachment("dresscode.txt", namedAttachment)
 				.withAttachment("location.txt", "On the moon!".getBytes(Charset.defaultCharset()), "text/plain")
-				.withEmbeddedImage("thumbsup", parseBase64Binary(base64StringOfThumbsupImage), "image/png")
+				.withEmbeddedImage("thumbsup", Base64.getDecoder().decode(base64StringOfThumbsupImage), "image/png")
 				// attachment name tests when producing MimeMessage ->
 				.withAttachment("fixedNameWithoutFileExtensionForNamedAttachment", namedAttachment) // this should be overridden by appending file extension
 				.withEmbeddedImage("fixedNameWithoutFileExtensionForNamedEmbeddedImage", namedEmbeddedImage)) // this should not be overridden