[zeppelin] branch master updated: [ZEPPELIN-4736] The use of SslContextFactory is deprecated

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexott pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c3ce78  [ZEPPELIN-4736] The use of SslContextFactory is deprecated
5c3ce78 is described below

commit 5c3ce78d89927606c75b0dd836f7fac30d155bd3
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Wed Apr 8 11:49:20 2020 +0200

    [ZEPPELIN-4736] The use of SslContextFactory is deprecated
    
    ### What is this PR for?
    Remove deprecation for SslContextFactory.
    https://www.eclipse.org/jetty/javadoc/9.4.26.v20200117/org/eclipse/jetty/util/ssl/SslContextFactory.html#%3Cinit%3E()
    
    Sorry for this little change. My IDE alerts me to this deprecation every time.
    ### What type of PR is it?
    * Improvement
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4736
    
    ### How should this be tested?
    * **Travis-CI**: https://travis-ci.org/github/Reamer/zeppelin/builds/672439814
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #3727 from Reamer/direct_SslContextFactory_deprecation and squashes the following commits:
    
    2fdb39de8 [Philipp Dallig] The direct use of SslContextFactory is deprecated
---
 .../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 2097b05..493d7e7 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -85,7 +85,6 @@ import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -441,7 +440,7 @@ public class ZeppelinServer extends ResourceConfig {
   }
 
   private static SslContextFactory getSslContextFactory(ZeppelinConfiguration conf) {
-    SslContextFactory sslContextFactory = new SslContextFactory();
+    SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
 
     // Set keystore
     sslContextFactory.setKeyStorePath(conf.getKeyStorePath());