You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2018/11/06 10:43:37 UTC
[camel] 05/06: [CAMEL-12914]camel-rest-swagger - Unit test fails
after jetty upgrade
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee7a68917d24c028acfc38297d2e031ed2cfc369
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Nov 6 18:42:55 2018 +0800
[CAMEL-12914]camel-rest-swagger - Unit test fails after jetty upgrade
---
.../test/java/org/apache/camel/component/rest/swagger/HttpsTest.java | 2 +-
.../org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
index 6bf472d..1c33dae 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
@@ -167,7 +167,7 @@ public abstract class HttpsTest extends CamelTestSupport {
sslContextParameters.setCamelContext(camelContext);
sslContextParameters.setTrustManagers(trustManagerParameters);
final CipherSuitesParameters cipherSuites = new CipherSuitesParameters();
- cipherSuites.setCipherSuite(Collections.singletonList("TLS_RSA_WITH_AES_128_CBC_SHA256"));
+ cipherSuites.setCipherSuite(Collections.singletonList("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"));
sslContextParameters.setCipherSuites(cipherSuites);
sslContextParameters.setSecureSocketProtocol("TLSv1.2");
return sslContextParameters;
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
index 3791706..8592328 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
@@ -59,7 +59,7 @@ public final class Jetty94ServerFactory extends JettyHttpServerFactory {
sslContextFactory.setTrustStoreType(httpsSettings.trustStoreType());
}
sslContextFactory.setNeedClientAuth(httpsSettings.needClientAuth());
- sslContextFactory.setIncludeCipherSuites("TLS_RSA_WITH_AES_128_CBC_SHA256");
+ sslContextFactory.setIncludeCipherSuites("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256");
sslContextFactory.setProtocol("TLSv1.2");
final HttpConfiguration httpConfig = createHttpConfig(jettySettings);