You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2014/03/17 20:46:26 UTC
svn commit: r1578534 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement:
AnnouncementMailMojo.java mailsender/ProjectJavamailMailSender.java
Author: dennisl
Date: Mon Mar 17 19:46:26 2014
New Revision: 1578534
URL: http://svn.apache.org/r1578534
Log:
[MCHANGES-303] Add an option to enable tls
Submitted by: Benoit Guerin
Reviewed by: Dennis Lundberg
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=1578534&r1=1578533&r2=1578534&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Mon Mar 17 19:46:26 2014
@@ -132,6 +132,11 @@ public class AnnouncementMailMojo
@Parameter( property = "changes.sslMode", defaultValue = "false" )
private boolean sslMode;
+ /**
+ * If the option startTls should be used.
+ */
+ @Parameter( property = "changes.startTls", defaultValue = "false" )
+ private boolean startTls;
/**
* Subject for the email.
@@ -225,7 +230,7 @@ public class AnnouncementMailMojo
mailer.setSmtpPort( getSmtpPort() );
- mailer.setSslMode( sslMode );
+ mailer.setSslMode( sslMode, startTls );
if ( username != null )
{
@@ -502,6 +507,16 @@ public class AnnouncementMailMojo
this.sslMode = sslMode;
}
+ public boolean isStartTls()
+ {
+ return startTls;
+ }
+
+ public void setStartTls( boolean startTls )
+ {
+ this.startTls = startTls;
+ }
+
public String getSubject()
{
return subject;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=1578534&r1=1578533&r2=1578534&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java Mon Mar 17 19:46:26 2014
@@ -103,6 +103,12 @@ public class ProjectJavamailMailSender
getLogger().error( "You can't use sslMode because your system is missing an SSL Provider.", e );
}
}
+
+ if ( isTlsEnabled() )
+ {
+ props.put("mail.smtp.starttls.enable", "true");
+ }
+
if ( userProperties != null )
{
for (Object o : userProperties.keySet()) {