Released 5.4.0

bbottema · Sep 28, 2019 · 9332ba6 · 9332ba6
1 parent 20d65b6
commit 9332ba6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](LICENSE-2.0.txt) 
 [![Latest Release](https://img.shields.io/maven-central/v/org.simplejavamail/simple-java-mail.svg?style=flat)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.simplejavamail%22%20AND%20a%3A%22simple-java-mail%22) 
-[![Javadocs](https://img.shields.io/badge/javadoc-5.3.0-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/simple-java-mail) 
+[![Javadocs](https://img.shields.io/badge/javadoc-5.4.0-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/simple-java-mail) 
 [![Build Status](https://img.shields.io/travis/bbottema/simple-java-mail.svg?style=flat)](https://travis-ci.org/bbottema/simple-java-mail) 
 [![Codacy](https://img.shields.io/codacy/9f142ca8c8c640c984835a8ae02d29f3.svg?style=flat)](https://www.codacy.com/app/b-bottema/simple-java-mail)
 [![Paypal Donate](https://img.shields.io/badge/donate%20with-paypal-blue.svg?style=flat)](https://paypal.me/bennybottema)
@@ -69,13 +69,13 @@ Simple Java Mail is available in [Maven Central](https://search.maven.org/#searc
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
 </dependency>
 ```
 
 ### Latest Progress ###
 
-[v5.4.0](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C5.4.0%7Cjar) (27?-August-2019)
+[v5.4.0](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C5.4.0%7Cjar) (28-August-2019)
 
 - [#221](https://github.com/bbottema/simple-java-mail/issues/221) API bugfix: server identity verification should not be tied to host trusting
 - [#226](https://github.com/bbottema/simple-java-mail/issues/226) Bug fix: Attachments with spaces in name are not handled properly

diff --git a/RELEASE.txt b/RELEASE.txt
@@ -3,10 +3,10 @@ http://www.simplejavamail.org
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
 </dependency>
 
-v5.4.0 (27?-August-2019)
+v5.4.0 (28-August-2019)
 
 - #221: API bugfix: server identity verification should not be tied to host trusting
 - #226: Bug fix: Attachments with spaces in name are not handled properly

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>simple-java-mail</artifactId>
     <packaging>jar</packaging>
     <name>Simple Java Mail</name>
-    <version>5.4.0-SNAPSHOT</version>
+    <version>5.4.0</version>
     <description>Simple API, Complex Emails. A light weight wrapper for the JavaMail SMTP API</description>
     <url>http://http://www.simplejavamail.org/</url>
 

diff --git a/src/main/java/org/simplejavamail/email/AttachmentResource.java b/src/main/java/org/simplejavamail/email/AttachmentResource.java
@@ -19,7 +19,9 @@
  * @see DataSource
  */
 public class AttachmentResource implements Serializable {
-
+
+	private static final long serialVersionUID = 1234567L;
+
 	/**
 	 * @see #AttachmentResource(String, DataSource)
 	 */
@@ -28,7 +30,8 @@ public class AttachmentResource implements Serializable {
 	/**
 	 * @see #AttachmentResource(String, DataSource)
 	 */
-	private final DataSource dataSource;
+	// data source is not serializable, so transient
+	private transient final DataSource dataSource;
 
 	/**
 	 * Constructor; initializes the attachment resource with a name and data.

diff --git a/src/main/java/org/simplejavamail/email/Email.java b/src/main/java/org/simplejavamail/email/Email.java
@@ -20,6 +20,8 @@
 @SuppressWarnings("SameParameterValue")
 public class Email implements Serializable {
 
+	private static final long serialVersionUID = 1234567L;
+
 	/**
 	 * @see EmailPopulatingBuilder#fixingMessageId(String)
 	 */
@@ -105,12 +107,14 @@ public class Email implements Serializable {
 	/**
 	 * @see EmailBuilder#forwarding(MimeMessage)
 	 */
-	private final MimeMessage emailToForward;
+	// mime message is not serializable, so transient
+	private transient final MimeMessage emailToForward;
 
 	/**
 	 * @see EmailPopulatingBuilder#signWithDomainKey(InputStream, String, String)
 	 */
-	private InputStream dkimPrivateKeyInputStream;
+	// mime message is not serializable, so transient
+	private transient InputStream dkimPrivateKeyInputStream;
 
 	/**
 	 * @see EmailPopulatingBuilder#signWithDomainKey(File, String, String)