diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-15 11:06:57 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-15 11:16:37 +0200 |
| commit | 73d8c282702e02cd238d08e219747afbcca47bd9 (patch) | |
| tree | 212d87a18a1d10dae8c672c8b29dbe0c22de9009 /jdisc_http_service | |
| parent | 5318ae61a73db8b49552e16debd58b9af04ecf1d (diff) | |
Upgrade Jetty to 9.4.16
Use Server subclass as default constructor of SslContextFactory and some
methods are marked as deprecated.
Diffstat (limited to 'jdisc_http_service')
3 files changed, 3 insertions, 3 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java index facb54bc37a..f6f79691626 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java @@ -37,7 +37,7 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro public SslContextFactory getInstance(String containerId, int port) { ConnectorConfig.Ssl sslConfig = connectorConfig.ssl(); if (!sslConfig.enabled()) throw new IllegalStateException(); - SslContextFactory factory = new JDiscSslContextFactory(); + SslContextFactory.Server factory = new JDiscSslContextFactory(); switch (sslConfig.clientAuth()) { case NEED_AUTH: diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java index 90d67996402..4d3bb4a280a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java @@ -13,7 +13,7 @@ import java.util.Objects; * * @author bjorncs */ -class JDiscSslContextFactory extends SslContextFactory { +class JDiscSslContextFactory extends SslContextFactory.Server { private String trustStorePassword; diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java index d7d28e7d242..a5652042f9e 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java @@ -13,7 +13,7 @@ import java.net.InetSocketAddress; * * @author bjorncs */ -class TlsContextManagedSslContextFactory extends SslContextFactory { +class TlsContextManagedSslContextFactory extends SslContextFactory.Server { private final TlsContext tlsContext; |