commit 9da1f2c23f6265b62a3fbe68051d0cedf0a4d43c
author Radu Cotescu <radu@apache.org> Thu Mar 28 17:48:08 2019 +0100
committer Robert Munteanu <robert.munteanu@gmail.com> Thu Mar 28 18:01:13 2019 +0100
tree 8b13396741e3f8dc231c41b1efa9071f9361cb68
parent 95330f1312369738740edca534816d70e763ccdc

SLING-8311 - Investigate creating a Sling CLI tool for development task automation

* no need to customise the SSLContext

src/main/java/org/apache/sling/cli/impl/release/UpdateReporterCommand.java

diff --git a/src/main/java/org/apache/sling/cli/impl/release/UpdateReporterCommand.java b/src/main/java/org/apache/sling/cli/impl/release/UpdateReporterCommand.java
index 4c0c127..0a33043 100644
--- a/src/main/java/org/apache/sling/cli/impl/release/UpdateReporterCommand.java
+++ b/src/main/java/org/apache/sling/cli/impl/release/UpdateReporterCommand.java
@@ -20,17 +20,11 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLSocket;
-
 import org.apache.http.NameValuePair;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -38,8 +32,6 @@
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -79,19 +71,8 @@
         try {
             StagingRepository repository = repoFinder.find(Integer.parseInt(target));
             Release release = Release.fromString(repository.getDescription());
-            SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
-            sslContext.init(null, null, null);
-            SSLContext.setDefault(sslContext);
-            SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
-                    sslContext,
-                    new String[] {"TLSv1.2"},
-                    new String[] {
-                            "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-                    },
-                    new DefaultHostnameVerifier()
-            );
             try (CloseableHttpClient client =
-                         HttpClients.custom().setDefaultCredentialsProvider(credentialsProvider).setSSLSocketFactory(sslConnectionSocketFactory).build()) {
+                         HttpClients.custom().setDefaultCredentialsProvider(credentialsProvider).build()) {
                 HttpPost post = new HttpPost("https://reporter.apache.org/addrelease.py");
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 List<NameValuePair> parameters = new ArrayList<>();
@@ -108,7 +89,7 @@
                     }
                 }
             }
-        } catch (IOException | NoSuchAlgorithmException | KeyManagementException e) {
+        } catch (IOException e) {
             LOGGER.error(String.format("Unable to update reporter service; passed command: %s.", target), e);
         }