You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/02/02 11:47:06 UTC
[camel] branch master updated: CAMEL-15958: Upgrade to vertx 3.9.5
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8de288b CAMEL-15958: Upgrade to vertx 3.9.5
8de288b is described below
commit 8de288b9616471c3044b57ce95a1c05590d79026
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 2 12:46:25 2021 +0100
CAMEL-15958: Upgrade to vertx 3.9.5
---
.../http/vertx/VertxPlatformHttpServerSupport.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
index 1c85dc0..bfff0e1 100644
--- a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
+++ b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServerSupport.java
@@ -35,8 +35,7 @@ import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpServerResponse;
-import io.vertx.core.net.KeyCertOptions;
-import io.vertx.core.net.TrustOptions;
+import io.vertx.core.net.JksOptions;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.BodyHandler;
import org.apache.camel.CamelContext;
@@ -172,24 +171,14 @@ public final class VertxPlatformHttpServerSupport {
if (sslParameters != null) {
options.setSsl(true);
- options.setKeyCertOptions(new KeyCertOptions() {
+ options.setKeyCertOptions(new JksOptions() {
@Override
public KeyManagerFactory getKeyManagerFactory(Vertx vertx) throws Exception {
return createKeyManagerFactory(camelContext, sslParameters);
}
-
- @Override
- public KeyCertOptions clone() {
- return this;
- }
});
- options.setTrustOptions(new TrustOptions() {
- @Override
- public TrustOptions clone() {
- return this;
- }
-
+ options.setTrustOptions(new JksOptions() {
@Override
public TrustManagerFactory getTrustManagerFactory(Vertx vertx) throws Exception {
return createTrustManagerFactory(camelContext, sslParameters);