This is an automated email from the ASF dual-hosted git repository.
jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new 60e36613e bz-68460 remove references to
com.sun.net.ssl.internal.ssl.Provider
60e36613e is described below
commit 60e36613e26539eab33707fb792673f5430f9fce
Author: Jaikiran Pai <jaiki...@apache.org>
AuthorDate: Thu Jan 11 07:28:59 2024 +0530
bz-68460 remove references to com.sun.net.ssl.internal.ssl.Provider
The Java SSLContext API notes that TLS version will be available at
runtime, so we don't have to lookup an internal JDK Provider class (which no
longer exists in recent Java versions) and then register it as a Security
Provider.
---
WHATSNEW | 5 +++++
.../apache/tools/ant/taskdefs/email/JakartaMimeMailer.java | 11 -----------
src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java | 11 -----------
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/WHATSNEW b/WHATSNEW
index cc4a0a622..779c314b5 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -12,6 +12,11 @@ Other changes:
Bugzilla Report 26453
+ * Removes direct references to com.sun.net.ssl.internal.ssl.Provider class
+ from the mail task, since that internal JDK class is no longer available
+ in recent versions of Java.
+ Bugzilla Report 68460
+
Fixed bugs:
-----------
diff --git
a/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java
b/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java
index a1ebb983c..0055c5ffc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/JakartaMimeMailer.java
@@ -25,8 +25,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
-import java.security.Provider;
-import java.security.Security;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -148,15 +146,6 @@ public class JakartaMimeMailer extends Mailer {
Session sesh;
Authenticator auth = null;
if (SSL) {
- try {
- final Provider p =
- Class.forName("com.sun.net.ssl.internal.ssl.Provider")
-
.asSubclass(Provider.class).getDeclaredConstructor().newInstance();
- Security.addProvider(p);
- } catch (final Exception e) {
- throw new BuildException(
- "could not instantiate ssl security provider, check
that you have JSSE in your classpath");
- }
// SMTP provider
props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
props.put("mail.smtp.socketFactory.fallback", "false");
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index 387078b8a..54514b984 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -25,8 +25,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
-import java.security.Provider;
-import java.security.Security;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -150,15 +148,6 @@ public class MimeMailer extends Mailer {
Session sesh;
Authenticator auth = null;
if (SSL) {
- try {
- final Provider p =
- Class.forName("com.sun.net.ssl.internal.ssl.Provider")
-
.asSubclass(Provider.class).getDeclaredConstructor().newInstance();
- Security.addProvider(p);
- } catch (final Exception e) {
- throw new BuildException(
- "could not instantiate ssl security provider, check
that you have JSSE in your classpath");
- }
// SMTP provider
props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
props.put("mail.smtp.socketFactory.fallback", "false");
