Merge pull request #4 from DirectProjectJavaRI/develop

Releasing xd 6.0.1

Author: Greg Meyer

manifest.yml

@@ -3,7 +3,7 @@ applications:
 - name: direct-xd
   instances: 1
   buildpack: java_buildpack
-  path: target/xd-6.0-SNAPSHOT.war
+  path: target/xd-6.0.1-SNAPSHOT.war
   env: 
     spring.cloud.config.label: master    
   services:

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xd</artifactId>
     <name>NHIN Direct XD* Web Endpoint</name>
-    <version>6.0</version>
+    <version>6.0.1</version>
     <description>NHIN Direct XD Component</description>
     <inceptionYear>2010</inceptionYear>
     <packaging>war</packaging>
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.2.RELEASE</version>     
+		<version>2.1.3.RELEASE</version>     
 		<relativePath />
 	</parent>	      
     <developers>
@@ -54,21 +54,21 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.1.2.RELEASE</version>
+				<version>2.1.3.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 	        <dependency>
 	            <groupId>io.pivotal.spring.cloud</groupId>
 	            <artifactId>spring-cloud-services-dependencies</artifactId>
-	            <version>2.0.3.RELEASE</version>
+	            <version>2.1.1.RELEASE</version>
 	            <type>pom</type>
 	            <scope>import</scope>
 	        </dependency>				
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-parent</artifactId>
-				 <version>Greenwich.RELEASE</version>
+				 <version>Greenwich.SR1</version>
 				<type>pom</type>
 				<scope>import</scope>		
 			</dependency>											
@@ -277,7 +277,7 @@
 		            <plugin>
 		                <groupId>org.apache.maven.plugins</groupId>
 		                <artifactId>maven-javadoc-plugin</artifactId>
-		                <version>2.6.1</version>
+		                <version>2.9.1</version>
 		                <configuration>
 						    <additionalparam>-Xdoclint:none</additionalparam>
 							<charset>UTF-8</charset>
@@ -300,8 +300,7 @@
 			                </goals>
 			              </execution>
 			            </executions>
-		            </plugin>
-				    <!-- for release only		            
+		            </plugin>	            
 			        <plugin>
 		               <groupId>org.apache.maven.plugins</groupId>
 		               <artifactId>maven-gpg-plugin</artifactId>
@@ -315,7 +314,6 @@
 		                 </execution>
 		               </executions>
 		            </plugin>
-		            -->
                 </plugins>
             </build>
         </profile>
@@ -331,7 +329,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
+                <version>2.9.1</version>
                 <configuration>
 				    <additionalparam>-Xdoclint:none</additionalparam>
 					<charset>UTF-8</charset>

src/main/java/org/nhind/xdm/impl/SmtpMailClient.java

@@ -50,11 +50,6 @@ public class SmtpMailClient implements MailClient
 {
     final static int BUFFER = 2048;
 
-    private MimeMessage mmessage;
-    private Multipart mailBody;
-    private MimeBodyPart mainBody;
-    private MimeBodyPart mimeAttach;
-   
     private String hostname = null;
     private String username = null;
     private String password = null;
@@ -76,6 +71,11 @@ public SmtpMailClient(String hostname, String username, String password)
      */
     public void mail(DirectMessage message, String messageId, String suffix) throws MessagingException
     {
+        MimeMessage mmessage;
+        Multipart mailBody;
+        MimeBodyPart mainBody;
+        MimeBodyPart mimeAttach;    	
+    	
         boolean debug = false;
         java.security.Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());