You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/12/06 13:00:25 UTC
[camel-quarkus] branch 2.13.x updated (6a31f2619d -> 2c6b9561bc)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 6a31f2619d Upgrade to quarkus-cxf 1.5.8
new 24588d3158 Avoid port clashes with WireMock dynamically allocated port
new 2c6b9561bc Manage jakarta.xml.soap-api and sync jakarta.ws properties with CXF
The 2 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:
.../quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java | 4 +++-
.../camel/quarkus/component/validator/it/ValidatorTestResource.java | 5 +++--
.../org/apache/camel/quarkus/component/xml/it/XmlTestResource.java | 5 +++--
pom.xml | 5 +++--
poms/bom/pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-full-pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +++++
8 files changed, 32 insertions(+), 7 deletions(-)
[camel-quarkus] 01/02: Avoid port clashes with WireMock dynamically allocated port
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 24588d3158bc0070a3e6b06dd85fcdf129c71495
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Dec 5 08:55:50 2022 +0000
Avoid port clashes with WireMock dynamically allocated port
---
.../quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java | 4 +++-
.../camel/quarkus/component/validator/it/ValidatorTestResource.java | 5 +++--
.../org/apache/camel/quarkus/component/xml/it/XmlTestResource.java | 5 +++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java b/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
index 349b714608..bd02e45860 100644
--- a/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
+++ b/integration-tests-support/wiremock/src/main/java/org/apache/camel/quarkus/test/wiremock/WireMockTestResourceLifecycleManager.java
@@ -33,6 +33,7 @@ import com.github.tomakehurst.wiremock.recording.RecordingStatus;
import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.logging.Logger;
@@ -111,6 +112,7 @@ public abstract class WireMockTestResourceLifecycleManager implements QuarkusTes
}
}
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
@@ -215,7 +217,7 @@ public abstract class WireMockTestResourceLifecycleManager implements QuarkusTes
LOG.info("Starting WireMockServer");
MockBackendUtils.startMockBackend(true);
- WireMockConfiguration configuration = options().dynamicPort();
+ WireMockConfiguration configuration = options().port(AvailablePortFinder.getNextAvailable());
customizeWiremockConfiguration(configuration);
if (!isRecordingEnabled()) {
diff --git a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
index 0826e204e6..161daf17c8 100644
--- a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
+++ b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -46,7 +46,7 @@ public class ValidatorTestResource implements QuarkusTestResourceLifecycleManage
+ "</xs:element>"
+ "</xs:schema>";
- server = new WireMockServer(WireMockConfiguration.DYNAMIC_PORT);
+ server = new WireMockServer(AvailablePortFinder.getNextAvailable());
server.start();
server.stubFor(
get(urlEqualTo("/xsd"))
@@ -62,6 +62,7 @@ public class ValidatorTestResource implements QuarkusTestResourceLifecycleManage
public void stop() {
if (server != null) {
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
diff --git a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
index a22599edb3..c8b228f928 100644
--- a/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
+++ b/integration-tests/xml/src/test/java/org/apache/camel/quarkus/component/xml/it/XmlTestResource.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.apache.camel.quarkus.test.AvailablePortFinder;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -36,7 +36,7 @@ public class XmlTestResource implements QuarkusTestResourceLifecycleManager {
public Map<String, String> start() {
try (InputStream in = Thread.currentThread().getContextClassLoader()
.getResourceAsStream("xslt/classpath-transform.xsl")) {
- server = new WireMockServer(WireMockConfiguration.DYNAMIC_PORT);
+ server = new WireMockServer(AvailablePortFinder.getNextAvailable());
server.start();
server.stubFor(
get(urlEqualTo("/xslt"))
@@ -55,6 +55,7 @@ public class XmlTestResource implements QuarkusTestResourceLifecycleManager {
public void stop() {
if (server != null) {
server.stop();
+ AvailablePortFinder.releaseReservedPorts();
}
}
}
[camel-quarkus] 02/02: Manage jakarta.xml.soap-api and sync jakarta.ws properties with CXF
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2c6b9561bc59cbba32a17cb5cea61573d3d68098
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Dec 2 10:28:23 2022 +0000
Manage jakarta.xml.soap-api and sync jakarta.ws properties with CXF
---
pom.xml | 5 +++--
poms/bom/pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-full-pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +++++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c633e95770..a5c3afff60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,9 @@
<jackson1.version>1.9.13</jackson1.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
<jackson-asl.version>${jackson1.version}</jackson-asl.version><!-- Can be different from jackson1.version on some occasions -->
<jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
- <jakarta.jws.ws.api.version>2.1.0</jakarta.jws.ws.api.version>
- <jakarta.xml.ws.api.version>2.3.3</jakarta.xml.ws.api.version>
+ <jakarta.jws.ws.api.version>2.1.0</jakarta.jws.ws.api.version><!-- @sync org.apache.cxf:cxf-parent:${cxf.version} prop:cxf.jakarta.jwsapi.version -->
+ <jakarta.xml.soap-api.version>1.4.2</jakarta.xml.soap-api.version><!-- @sync org.apache.cxf:cxf-parent:${cxf.version} prop:cxf.jakarta.soapapi.version -->
+ <jakarta.xml.ws.api.version>2.3.3</jakarta.xml.ws.api.version><!-- @sync org.apache.cxf:cxf-parent:${cxf.version} prop:cxf.jakarta.wsapi.version -->
<java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch -->
<jcodings.version>1.0.55</jcodings.version><!-- used by hbase -->
<jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c3f2e03131..08042125d2 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -10072,6 +10072,11 @@
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>${jakarta.xml.soap-api.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index ad9a7c96ee..ea5485c28f 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10012,6 +10012,11 @@
<artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.soap-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.4.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.xml.ws-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 56ac9f379f..494e859c02 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10012,6 +10012,11 @@
<artifactId>jakarta.jms-api</artifactId>
<version>2.0.3</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
+ </dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index f03778a4fa..ffdd0b4cdd 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10012,6 +10012,11 @@
<artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.soap-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.4.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.xml.ws-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->