You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/10 08:59:14 UTC
[maven-changes-plugin] 01/02: [MCHANGES-403] Remove use of internal
Sun SSL provider
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHANGES-403
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit a33811de2c2479ae04a74f5d9d076aea58b4d9ae
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Feb 10 09:57:34 2020 +0100
[MCHANGES-403] Remove use of internal Sun SSL provider
---
.../mailsender/ProjectJavamailMailSender.java | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java b/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java
index db7a90d..a95414d 100644
--- a/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java
+++ b/src/main/java/org/apache/maven/plugins/announcement/mailsender/ProjectJavamailMailSender.java
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.announcement.mailsender;
* under the License.
*/
-import java.security.Security;
import java.util.Date;
import java.util.Properties;
@@ -85,24 +84,12 @@ public class ProjectJavamailMailSender
if ( isSslMode() )
{
- try
- {
- // Try to load the SSL Provider class before we use it, it isn't present in non-Sun JVMs
- this.getClass().getClassLoader().loadClass( "com.sun.net.ssl.internal.ssl.Provider" );
-
- Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
+ props.put( "mail.smtp.socketFactory.port", String.valueOf( getSmtpPort() ) );
- props.put( "mail.smtp.socketFactory.port", String.valueOf( getSmtpPort() ) );
+ props.put( "mail.smtp.socketFactory.class", SSL_FACTORY );
- props.put( "mail.smtp.socketFactory.class", SSL_FACTORY );
-
- props.put( "mail.smtp.socketFactory.fallback", "false" );
- }
- catch ( ClassNotFoundException e )
- {
- getLogger().error( "You can't use sslMode because your system is missing an SSL Provider.", e );
- }
- }
+ props.put( "mail.smtp.socketFactory.fallback", "false" );
+ }
if ( isTlsEnabled() )
{