You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/04/26 20:54:53 UTC
[maven-resolver] branch depre created (now 084fdce)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch depre
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.
at 084fdce remove some deprecated properties
This branch includes the following new commits:
new 084fdce remove some deprecated properties
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-resolver] 01/01: remove some deprecated properties
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch depre
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 084fdce8131643b92053f8b54b09d500eeff68d4
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 26 16:54:35 2020 -0400
remove some deprecated properties
---
.../org/eclipse/aether/transport/http/SslSocketFactory.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
index 4426da4..ce81313 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
@@ -26,17 +26,17 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
/**
* Specialized SSL socket factory to more closely resemble the JRE's HttpsClient and respect well-known SSL-related
* configuration properties.
*
- * @see <a href="http://docs.oracle.com/javase/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#Customization">JSSE
+ * @see <a href="https://docs.oracle.com/javase/1.5.0/docs/guide/security/jsse/JSSERefGuide.html#Customization">JSSE
* Reference Guide, Customization</a>
*/
final class SslSocketFactory
- extends org.apache.http.conn.ssl.SSLSocketFactory
+ extends SSLConnectionSocketFactory
{
private final String[] cipherSuites;
@@ -54,13 +54,13 @@ final class SslSocketFactory
return ( context != null ) ? context.getSocketFactory() : (SSLSocketFactory) SSLSocketFactory.getDefault();
}
- private static X509HostnameVerifier getHostnameVerifier( HostnameVerifier verifier )
+ private static HostnameVerifier getHostnameVerifier( HostnameVerifier verifier )
{
return ( verifier != null ) ? X509HostnameVerifierAdapter.adapt( verifier )
- : org.apache.http.conn.ssl.SSLSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
+ : getDefaultHostnameVerifier();
}
- private SslSocketFactory( SSLSocketFactory socketfactory, X509HostnameVerifier hostnameVerifier,
+ private SslSocketFactory( SSLSocketFactory socketfactory, HostnameVerifier hostnameVerifier,
String[] cipherSuites, String[] protocols )
{
super( socketfactory, hostnameVerifier );