diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-19 13:40:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-19 13:40:19 +0100 |
commit | 8ab536a363c3c5ac0c98bb819da026cb5ce15165 (patch) | |
tree | 2da99aa23f106da4085e6525478771528e17e58e | |
parent | ce87ec09f9845cd6f7fb186869446e07a7b3b66d (diff) |
Revert "Temporarily downgrade Jetty to evaluate performance degradation"
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 2 | ||||
-rw-r--r-- | pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index aa550a84efb..87327bc217e 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -185,7 +185,7 @@ public class ConnectorFactory { factory.setTrustStorePassword(password.orElseThrow(passwordRequiredForJKSKeyStore("trust"))); } - factory.setSslKeyManagerFactoryAlgorithm(sslConfig.sslKeyManagerFactoryAlgorithm()); + factory.setKeyManagerFactoryAlgorithm(sslConfig.sslKeyManagerFactoryAlgorithm()); factory.setProtocol(sslConfig.protocol()); return new SslConnectionFactory(factory, HttpVersion.HTTP_1_1.asString()); } @@ -1068,7 +1068,7 @@ <curator.version>2.9.1</curator.version> <jackson2.version>2.8.3</jackson2.version> <jersey2.version>2.23.2</jersey2.version> - <jetty.version>9.3.12.v20160915</jetty.version> + <jetty.version>9.3.16.v20170120</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <test.hide>true</test.hide> <doclint>all</doclint> |