You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2021/02/08 16:31:41 UTC
[camel] branch master updated: Upgraded wiremock to 2.27.2
This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 1540f99 Upgraded wiremock to 2.27.2
1540f99 is described below
commit 1540f99d12462ad339cc87f6ff357fc1e9394adf
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Feb 8 16:44:38 2021 +0100
Upgraded wiremock to 2.27.2
---
components/camel-pubnub/pom.xml | 7 +++++++
components/camel-rest-openapi/pom.xml | 10 +++++++++-
.../camel/component/rest/openapi/Jetty94ServerFactory.java | 4 +++-
components/camel-rest-swagger/pom.xml | 10 +++++++++-
.../camel/component/rest/swagger/Jetty94ServerFactory.java | 4 +++-
parent/pom.xml | 2 +-
6 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index a60a73a..ff7f702 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -85,6 +85,13 @@
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>29.0-jre</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 6dcd209..2d6e0d7 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -81,9 +81,17 @@
<scope>test</scope>
</dependency>
+ <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>29.0-jre</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-jre8</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
<exclusions>
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java
index e4d0a1c..13b4310 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java
@@ -28,6 +28,7 @@ import org.eclipse.jetty.io.NetworkTrafficListener;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -45,9 +46,10 @@ public final class Jetty94ServerFactory extends JettyHttpServerFactory {
return new JettyHttpServer(options, adminRequestHandler, stubRequestHandler) {
@Override
protected ServerConnector createHttpsConnector(
+ Server server,
final String bindAddress, final HttpsSettings httpsSettings,
final JettySettings jettySettings, final NetworkTrafficListener listener) {
- final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(httpsSettings.keyStorePath());
sslContextFactory.setKeyManagerPassword(httpsSettings.keyStorePassword());
diff --git a/components/camel-rest-swagger/pom.xml b/components/camel-rest-swagger/pom.xml
index 82c8a10..552ad88 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -102,9 +102,17 @@
<scope>test</scope>
</dependency>
+ <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>29.0-jre</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock</artifactId>
+ <artifactId>wiremock-jre8</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
<exclusions>
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 0421fb4..dab2f73 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
@@ -28,6 +28,7 @@ import org.eclipse.jetty.io.NetworkTrafficListener;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -45,9 +46,10 @@ public final class Jetty94ServerFactory extends JettyHttpServerFactory {
return new JettyHttpServer(options, adminRequestHandler, stubRequestHandler) {
@Override
protected ServerConnector createHttpsConnector(
+ Server server,
final String bindAddress, final HttpsSettings httpsSettings,
final JettySettings jettySettings, final NetworkTrafficListener listener) {
- final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(httpsSettings.keyStorePath());
sslContextFactory.setKeyManagerPassword(httpsSettings.keyStorePassword());
diff --git a/parent/pom.xml b/parent/pom.xml
index 5da099e..d6f4a7f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -549,7 +549,7 @@
<web3j-quorum-version>0.8.0</web3j-quorum-version>
<weld3-version>3.1.1.Final</weld3-version>
<wildfly-elytron>1.11.4.Final</wildfly-elytron>
- <wiremock-version>2.24.1</wiremock-version>
+ <wiremock-version>2.27.2</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
<woodstox-core-version>6.1.1</woodstox-core-version>
<xalan-version>2.7.2</xalan-version>