You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/05/22 06:51:48 UTC
[hbase] branch branch-2 updated: HBASE-27027 Use jetty SslContextFactory.Server instead of deprecated SslContextFactory (#4425)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new a6b1c7e234b HBASE-27027 Use jetty SslContextFactory.Server instead of deprecated SslContextFactory (#4425)
a6b1c7e234b is described below
commit a6b1c7e234b34bbab9fe730eb8e9986db05acc94
Author: bitterfox <yo...@linecorp.com>
AuthorDate: Sun May 22 12:32:17 2022 +0900
HBASE-27027 Use jetty SslContextFactory.Server instead of deprecated SslContextFactory (#4425)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 1be2c83b3dc8306050f67828c9c2e361f19481c6)
---
hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java | 2 +-
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
index de2e59befb4..8b452be89e7 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
@@ -418,7 +418,7 @@ public class HttpServer implements FilterContainer {
} else if ("https".equals(scheme)) {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
- SslContextFactory sslCtxFactory = new SslContextFactory();
+ SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
sslCtxFactory.setNeedClientAuth(needsClientAuth);
sslCtxFactory.setKeyManagerPassword(keyPassword);
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
index 02f8cb6a678..acf1c669d33 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
@@ -314,7 +314,7 @@ public class RESTServer implements Constants {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
- SslContextFactory sslCtxFactory = new SslContextFactory();
+ SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
String keystore = conf.get(REST_SSL_KEYSTORE_STORE);
String keystoreType = conf.get(REST_SSL_KEYSTORE_TYPE);
String password = HBaseConfiguration.getPassword(conf, REST_SSL_KEYSTORE_PASSWORD, null);
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index ac978038eee..33bd2ae869f 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -408,7 +408,7 @@ public class ThriftServer extends Configured implements Tool {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
- SslContextFactory sslCtxFactory = new SslContextFactory();
+ SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE_KEY);
String password =
HBaseConfiguration.getPassword(conf, THRIFT_SSL_KEYSTORE_PASSWORD_KEY, null);