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 2023/01/19 06:32:06 UTC
[camel] branch main updated (7b98a09ed87 -> 6a189890002)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 7b98a09ed87 CAMEL-18953: camel-jetty - Should throw 504 error if continuation timeout was hit
new 0dba16097b0 Upgrade wiremock
new ab176dc1057 Fixed test and upgrade wiremock
new 6a189890002 Fixed test and upgrade wiremock
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
components/camel-bonita/pom.xml | 15 ++++++++++++++-
components/camel-oaipmh/pom.xml | 15 ++++++++++++++-
components/camel-openstack/pom.xml | 4 ++--
components/camel-platform-http-vertx/pom.xml | 15 ++++++++++++++-
components/camel-pubnub/pom.xml | 2 +-
components/camel-rest-openapi/pom.xml | 11 ++++++++---
.../apache/camel/component/rest/openapi/HttpsTest.java | 2 +-
.../apache/camel/component/rest/openapi/HttpsV3Test.java | 2 +-
...ServerFactory.java => WireMockJettyServerFactory.java} | 9 ++++-----
components/camel-xchange/pom.xml | 3 +--
parent/pom.xml | 2 +-
12 files changed, 62 insertions(+), 20 deletions(-)
rename components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/{Jetty94ServerFactory.java => WireMockJettyServerFactory.java} (90%)
[camel] 01/03: Upgrade wiremock
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0dba16097b0884dd047461736873a5e58165f8a4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 18 22:42:17 2023 +0100
Upgrade wiremock
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 75cc643c217..257d5ce689d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,7 +509,7 @@
<web3j-quorum-version>0.8.0</web3j-quorum-version>
<weld-version>5.1.0.Final</weld-version>
<wildfly-elytron>1.15.4.Final</wildfly-elytron>
- <wiremock-version>2.32.0</wiremock-version>
+ <wiremock-version>2.35.0</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
<woodstox-core-version>6.4.0</woodstox-core-version>
<xbean-spring-version>4.21</xbean-spring-version>
[camel] 02/03: Fixed test and upgrade wiremock
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab176dc1057b68247859e294905cc13340371875
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 19 07:15:34 2023 +0100
Fixed test and upgrade wiremock
---
camel-dependencies/pom.xml | 2 +-
components/camel-bonita/pom.xml | 2 +-
components/camel-oaipmh/pom.xml | 2 +-
components/camel-openstack/pom.xml | 2 +-
components/camel-platform-http-vertx/pom.xml | 2 +-
components/camel-pubnub/pom.xml | 2 +-
components/camel-rest-openapi/pom.xml | 2 +-
.../java/org/apache/camel/component/rest/openapi/HttpsTest.java | 2 +-
.../org/apache/camel/component/rest/openapi/HttpsV3Test.java | 2 +-
...Jetty94ServerFactory.java => WireMockJettyServerFactory.java} | 9 ++++-----
components/camel-xchange/pom.xml | 2 +-
parent/pom.xml | 2 +-
12 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 18e5bfccfc4..11ca7698e92 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -514,7 +514,7 @@
<web3j-quorum-version>0.8.0</web3j-quorum-version>
<weld-version>5.1.0.Final</weld-version>
<wildfly-elytron>1.15.4.Final</wildfly-elytron>
- <wiremock-version>2.32.0</wiremock-version>
+ <wiremock-version>3.0.0-beta-2</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
<woodstox-core-version>6.4.0</woodstox-core-version>
<xbean-spring-version>4.21</xbean-spring-version>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 5123b027ff5..b2bc987280f 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8-standalone</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml
index eaac360060d..1c8a7422d91 100644
--- a/components/camel-oaipmh/pom.xml
+++ b/components/camel-oaipmh/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 3eb83a42909..e79a3222785 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml
index 7a7ceece56f..14393d8b574 100644
--- a/components/camel-platform-http-vertx/pom.xml
+++ b/components/camel-platform-http-vertx/pom.xml
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 34700855463..df25b6eb9d9 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 1d03b10f45d..9d7e01049b0 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</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/HttpsTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
index 0b379eb739b..64e6b2ab6c4 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java
@@ -65,7 +65,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public abstract class HttpsTest extends CamelTestSupport {
protected static WireMockServer petstore = new WireMockServer(
- wireMockConfig().httpServerFactory(new Jetty94ServerFactory()).containerThreads(13).dynamicPort()
+ wireMockConfig().httpServerFactory(new WireMockJettyServerFactory()).containerThreads(13).dynamicPort()
.dynamicHttpsPort().keystorePath(Resources.getResource("localhost.p12").toString()).keystoreType("PKCS12")
.keystorePassword("changeit"));
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java
index 89adda64fd6..b44f0e0a5be 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java
@@ -65,7 +65,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public abstract class HttpsV3Test extends CamelTestSupport {
public static WireMockServer petstore = new WireMockServer(
- wireMockConfig().httpServerFactory(new Jetty94ServerFactory()).containerThreads(13).dynamicPort()
+ wireMockConfig().httpServerFactory(new WireMockJettyServerFactory()).containerThreads(13).dynamicPort()
.dynamicHttpsPort().keystorePath(Resources.getResource("localhost.p12").toString()).keystoreType("PKCS12")
.keystorePassword("changeit"));
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/WireMockJettyServerFactory.java
similarity index 90%
rename from components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java
rename to components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/WireMockJettyServerFactory.java
index 42ce4b78ab4..baf65a13041 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/WireMockJettyServerFactory.java
@@ -22,8 +22,8 @@ import com.github.tomakehurst.wiremock.core.Options;
import com.github.tomakehurst.wiremock.http.AdminRequestHandler;
import com.github.tomakehurst.wiremock.http.HttpServer;
import com.github.tomakehurst.wiremock.http.StubRequestHandler;
-import com.github.tomakehurst.wiremock.jetty9.JettyHttpServer;
-import com.github.tomakehurst.wiremock.jetty9.JettyHttpServerFactory;
+import com.github.tomakehurst.wiremock.jetty.JettyHttpServer;
+import com.github.tomakehurst.wiremock.jetty.JettyHttpServerFactory;
import org.eclipse.jetty.io.NetworkTrafficListener;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -34,10 +34,9 @@ import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
/**
- * Wiremock 2.18.0 ships with Jetty 9.2, Camel (currently) uses 9.4 and the
- * {@link org.eclipse.jetty.util.ssl.SslContextFactory} removed {@code selectCipherSuites} method.
+ * Jetty 9.x {@link org.eclipse.jetty.util.ssl.SslContextFactory} removed {@code selectCipherSuites} method.
*/
-public final class Jetty94ServerFactory extends JettyHttpServerFactory {
+public final class WireMockJettyServerFactory extends JettyHttpServerFactory {
@Override
public HttpServer buildHttpServer(
final Options options, final AdminRequestHandler adminRequestHandler,
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index a912ff9fdb9..0ca86fd4786 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <artifactId>wiremock</artifactId>
<version>${wiremock-version}</version>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 257d5ce689d..e318dc298df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -509,7 +509,7 @@
<web3j-quorum-version>0.8.0</web3j-quorum-version>
<weld-version>5.1.0.Final</weld-version>
<wildfly-elytron>1.15.4.Final</wildfly-elytron>
- <wiremock-version>2.35.0</wiremock-version>
+ <wiremock-version>3.0.0-beta-2</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
<woodstox-core-version>6.4.0</woodstox-core-version>
<xbean-spring-version>4.21</xbean-spring-version>
[camel] 03/03: Fixed test and upgrade wiremock
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6a18989000275f0e580afb2502881e5730da5fad
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 19 07:31:50 2023 +0100
Fixed test and upgrade wiremock
---
components/camel-bonita/pom.xml | 13 +++++++++++++
components/camel-oaipmh/pom.xml | 13 +++++++++++++
components/camel-openstack/pom.xml | 2 +-
components/camel-platform-http-vertx/pom.xml | 13 +++++++++++++
components/camel-rest-openapi/pom.xml | 9 +++++++--
components/camel-xchange/pom.xml | 1 -
6 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index b2bc987280f..419fd67cd84 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -66,6 +66,19 @@
<artifactId>mockito-junit-jupiter</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>31.1-jre</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml
index 1c8a7422d91..1ad6ada1df4 100644
--- a/components/camel-oaipmh/pom.xml
+++ b/components/camel-oaipmh/pom.xml
@@ -59,6 +59,19 @@
<artifactId>camel-test-spring-junit5</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>31.1-jre</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index e79a3222785..a9d1dafed5b 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>31.1-jre</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml
index 14393d8b574..eb3b3243249 100644
--- a/components/camel-platform-http-vertx/pom.xml
+++ b/components/camel-platform-http-vertx/pom.xml
@@ -101,6 +101,19 @@
<version>${rest-assured-version}</version>
<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>31.1-jre</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 9d7e01049b0..12012b1d074 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -91,10 +91,15 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>31.1-jre</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index 0ca86fd4786..2dd4568e731 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -72,7 +72,6 @@
<artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>