You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/08/12 20:31:19 UTC
[camel-quarkus] branch main updated (23a9ba61f3 -> 9423192143)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 23a9ba61f3 Updated CHANGELOG.md
new 177542c66a Use CDI producres instead of camel.beans.* in application.properties
new 21f9acb064 CxfSoapClientIT.wsSecurityClient fails in native mode: wsse:Nonce not present in the request #3966
new 9423192143 Upgrade to cq-maven-plugin 3.1.0
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:
.../cxf-wss}/deployment/pom.xml | 21 +++--
extensions-support/{xstream => cxf-wss}/pom.xml | 4 +-
.../{aws2 => cxf-wss}/runtime/pom.xml | 23 ++---
.../main/resources/META-INF/quarkus-extension.yaml | 4 +-
extensions-support/pom.xml | 1 +
.../deployment/XmlsecurityProcessor.java | 12 ++-
integration-tests/cxf-soap/pom.xml | 8 +-
.../component/cxf/soap/it/CxfSoapRoutes.java | 103 +++++++++++++++++++++
.../component/cxf/soap/it/PasswordCallback.java | 6 +-
.../src/main/resources/application.properties | 37 --------
.../component/cxf/soap/it/CxfSoapClientTest.java | 3 -
pom.xml | 5 +-
poms/bom-test/pom.xml | 61 ------------
poms/bom/pom.xml | 73 +++++++++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 53 +++++++++++
.../src/main/generated/flattened-reduced-pom.xml | 73 +++++++++++++++
.../generated/flattened-reduced-verbose-pom.xml | 73 +++++++++++++++
17 files changed, 401 insertions(+), 159 deletions(-)
copy {extensions/stax => extensions-support/cxf-wss}/deployment/pom.xml (81%)
copy extensions-support/{xstream => cxf-wss}/pom.xml (92%)
copy extensions-support/{aws2 => cxf-wss}/runtime/pom.xml (77%)
copy extensions-support/{stax => cxf-wss}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (90%)
[camel-quarkus] 02/03: CxfSoapClientIT.wsSecurityClient fails in native mode: wsse:Nonce not present in the request #3966
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 21f9acb06451c79aa2f7532cb64abfec881d5ee9
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed Aug 10 14:57:00 2022 +0200
CxfSoapClientIT.wsSecurityClient fails in native mode: wsse:Nonce not
present in the request #3966
---
extensions-support/cxf-wss/deployment/pom.xml | 66 +++++++++++++++++++
extensions-support/cxf-wss/pom.xml | 39 ++++++++++++
extensions-support/cxf-wss/runtime/pom.xml | 67 ++++++++++++++++++++
.../main/resources/META-INF/quarkus-extension.yaml | 28 +++++++++
extensions-support/pom.xml | 1 +
.../deployment/XmlsecurityProcessor.java | 12 ++--
integration-tests/cxf-soap/pom.xml | 8 +--
.../component/cxf/soap/it/CxfSoapClientTest.java | 3 -
pom.xml | 3 +
poms/bom-test/pom.xml | 61 ------------------
poms/bom/pom.xml | 73 +++++++++++++++++-----
poms/bom/src/main/generated/flattened-full-pom.xml | 53 ++++++++++++++++
.../src/main/generated/flattened-reduced-pom.xml | 73 ++++++++++++++++++++++
.../generated/flattened-reduced-verbose-pom.xml | 73 ++++++++++++++++++++++
14 files changed, 470 insertions(+), 90 deletions(-)
diff --git a/extensions-support/cxf-wss/deployment/pom.xml b/extensions-support/cxf-wss/deployment/pom.xml
new file mode 100644
index 0000000000..40c84c0a66
--- /dev/null
+++ b/extensions-support/cxf-wss/deployment/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss-parent</artifactId>
+ <version>2.12.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-quarkus-support-cxf-wss-deployment</artifactId>
+ <name>Camel Quarkus :: Support :: CXF WSS :: Deployment</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-xmlsecurity-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-stax-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-rt-ws-security-deployment</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${quarkus.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/extensions-support/cxf-wss/pom.xml b/extensions-support/cxf-wss/pom.xml
new file mode 100644
index 0000000000..9092fc94bb
--- /dev/null
+++ b/extensions-support/cxf-wss/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-extensions-support</artifactId>
+ <version>2.12.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-quarkus-support-cxf-wss-parent</artifactId>
+ <name>Camel Quarkus :: Support :: CXF WSS</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>deployment</module>
+ <module>runtime</module>
+ </modules>
+
+</project>
diff --git a/extensions-support/cxf-wss/runtime/pom.xml b/extensions-support/cxf-wss/runtime/pom.xml
new file mode 100644
index 0000000000..d7d4c90cc4
--- /dev/null
+++ b/extensions-support/cxf-wss/runtime/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss-parent</artifactId>
+ <version>2.12.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId>
+ <name>Camel Quarkus :: Support :: CXF WSS :: Runtime</name>
+ <description>An aggregator for WS Security to work on Camel Quarkus. The required artifacts and code should eventually move to quarkus-cxf. See https://github.com/apache/camel-quarkus/issues/3977 </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-xmlsecurity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-stax</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-rt-ws-security</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${quarkus.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/extensions-support/cxf-wss/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/cxf-wss/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000..cdbd6085c3
--- /dev/null
+++ b/extensions-support/cxf-wss/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+---
+name: "Camel Quarkus Support CXF WSS"
+description: "Camel Quarkus Support CXF WSS"
+metadata:
+ unlisted: true
+ keywords:
+ - "camel"
+ - "StAX"
+ guide: "https://quarkus.io/guides/camel"
+ categories:
+ - "integration"
\ No newline at end of file
diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml
index f124a1964a..c44c058d78 100644
--- a/extensions-support/pom.xml
+++ b/extensions-support/pom.xml
@@ -42,6 +42,7 @@
<module>bouncycastle</module>
<module>commons-logging</module>
<module>consul-client</module>
+ <module>cxf-wss</module>
<module>debezium</module>
<module>google-cloud</module>
<module>google-http-client</module>
diff --git a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
index 6de8f47baa..a49bd392c3 100644
--- a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
+++ b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
@@ -29,7 +29,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.xml.security.c14n.CanonicalizerSpi;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
@@ -74,10 +74,12 @@ class XmlsecurityProcessor {
}
@BuildStep
- void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
- Stream.of(XMLSecurityConstants.class.getName())
- .map(RuntimeInitializedClassBuildItem::new)
- .forEach(runtimeInitializedClasses::produce);
+ void runtimeReinitializedClasses(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinitializedClasses) {
+ Stream.of(
+ /* XMLSecurityConstants has a SecureRandom field initialized in a static initializer */
+ XMLSecurityConstants.class.getName())
+ .map(RuntimeReinitializedClassBuildItem::new)
+ .forEach(runtimeReinitializedClasses::produce);
}
@BuildStep
diff --git a/integration-tests/cxf-soap/pom.xml b/integration-tests/cxf-soap/pom.xml
index 3c1626b132..e49047632d 100644
--- a/integration-tests/cxf-soap/pom.xml
+++ b/integration-tests/cxf-soap/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<executions>
<execution>
<id>generate-sources</id>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -94,8 +94,8 @@
</dependency>
<dependency>
- <groupId>io.quarkiverse.cxf</groupId>
- <artifactId>quarkus-cxf-rt-ws-security</artifactId>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/integration-tests/cxf-soap/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapClientTest.java b/integration-tests/cxf-soap/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapClientTest.java
index 6234c6d08e..7df5d9fd5f 100644
--- a/integration-tests/cxf-soap/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapClientTest.java
+++ b/integration-tests/cxf-soap/src/test/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapClientTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.quarkus.component.cxf.soap.it;
import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.junit.DisabledOnIntegrationTest;
-import io.quarkus.test.junit.DisabledOnIntegrationTest.ArtifactType;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.Test;
@@ -41,7 +39,6 @@ class CxfSoapClientTest {
}
@Test
- @DisabledOnIntegrationTest(forArtifactTypes = ArtifactType.NATIVE_BINARY, value = "https://github.com/apache/camel-quarkus/issues/3966")
public void wsSecurityClient() {
RestAssured.given()
.body("CamelQuarkusCXF")
diff --git a/pom.xml b/pom.xml
index 739c775af7..bd43a3a07d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,10 @@
<commons-lang.version>2.6</commons-lang.version><!-- used by hbase, should be pretty stable as commons-lang is not developed actively anymore -->
<commons-math3.version>3.6.1</commons-math3.version><!-- Mess in the transitive dependencies of Spark and hbase-testing-util -->
<curator.version>4.3.0</curator.version><!-- Mess in the transitive dependencies of Spark, Zookeeper and other hadoop related components -->
+ <cxf.version>3.5.3</cxf.version><!-- @sync io.quarkiverse.cxf:quarkus-cxf-parent:${quarkiverse-cxf.version} prop:cxf.version -->
+ <cxf.xjc-utils.version>3.3.2</cxf.xjc-utils.version><!-- @sync org.apache.cxf:cxf:${cxf.version} prop:cxf.xjc-utils.version -->
<eddsa.version>${eddsa-version}</eddsa.version>
+ <ehcache.version>${ehcache3-version}</ehcache.version><!-- Remove once we import quarkus-cxf-bom https://github.com/apache/camel-quarkus/issues/3983 -->
<freemarker.version>2.3.31</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version} prop:freemarker.version -->
<geny.version>0.6.2</geny.version>
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index fcb8a6bf53..7f8df3e7e6 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -353,67 +353,6 @@
<version>${greenmail.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
- <version>${cxf-xjc-utils-version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency><!-- Resolves Quarkus CXF convergence error -->
- <groupId>org.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>${ehcache3-version}</version>
- </dependency>
- <dependency><!-- Resolves Quarkus CXF convergence error -->
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>${neethi.version}</version>
- </dependency>
- <dependency><!-- Resolves Quarkus CXF convergence error -->
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.cxf</groupId>
- <artifactId>quarkus-cxf-rt-ws-security</artifactId>
- <version>${quarkiverse-cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.cxf</groupId>
- <artifactId>quarkus-cxf-rt-ws-security-deployment</artifactId>
- <version>${quarkiverse-cxf.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 7a6d161020..8bf893d3c2 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -8823,6 +8823,16 @@
<artifactId>camel-quarkus-support-consul-client-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-debezium</artifactId>
@@ -10122,10 +10132,10 @@
<artifactId>curator-x-discovery</artifactId>
<version>${curator.version}</version>
</dependency>
- <dependency><!-- Resolves dependency convergence error between CXF and CMIS -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -10133,10 +10143,10 @@
</exclusion>
</exclusions>
</dependency>
- <dependency><!-- Resolves dependency convergence error between CXF and CMIS -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -10144,10 +10154,10 @@
</exclusion>
</exclusions>
</dependency>
- <dependency><!-- Resolves dependency convergence error between Camel CXF and Quarkus CXF -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -10158,7 +10168,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10177,7 +10187,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -10196,7 +10206,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10212,17 +10222,40 @@
</exclusion>
</exclusions>
</dependency>
- <dependency><!-- Resolves dependency convergence error between CXF and CMIS -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core4</artifactId>
@@ -10271,7 +10304,7 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>${xmlsec-version}</version>
+ <version>${xmlsec.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
@@ -10283,11 +10316,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency><!-- Resolves Quarkus CXF convergence error -->
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
@@ -10358,6 +10386,11 @@
<artifactId>org.eclipse.jgit</artifactId>
<version>${jgit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>${ehcache.version}</version>
+ </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
@@ -10408,6 +10441,11 @@
<artifactId>mvel2</artifactId>
<version>${mvel2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ </dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
@@ -10589,6 +10627,7 @@
<resolutionEntryPointInclude>org.apache.camel.quarkus:*</resolutionEntryPointInclude>
<resolutionEntryPointInclude>ca.uhn.hapi:*</resolutionEntryPointInclude>
<resolutionEntryPointInclude>net.openhft:affinity</resolutionEntryPointInclude><!-- https://github.com/apache/camel-quarkus/issues/3788 -->
+ <resolutionEntryPointInclude>org.apache.cxf.xjc-utils:cxf-xjc-runtime</resolutionEntryPointInclude><!-- https://github.com/apache/camel-quarkus/issues/3788 -->
</resolutionEntryPointIncludes>
<addExclusions>
<addExclusion>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index ded37d2bf5..1c952c6e90 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -8767,6 +8767,16 @@
<artifactId>camel-quarkus-support-consul-client-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-cxf-wss-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-support-debezium</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10165,12 +10175,35 @@
<artifactId>cxf-rt-wsdl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>geronimo-jta_1.1_spec</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>cxf-xjc-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>htrace-core4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10232,6 +10265,16 @@
<groupId>org.apache.santuario</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlsec</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10303,6 +10346,11 @@
<artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>6.2.0.202206071550-r</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>ehcache</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10353,6 +10401,11 @@
<artifactId>mvel2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.4.14.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>neethi</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</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 8e26c3aa84..3c72181d95 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -8767,6 +8767,16 @@
<artifactId>camel-quarkus-support-consul-client-deployment</artifactId>
<version>2.12.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId>
+ <version>2.12.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-cxf-wss-deployment</artifactId>
+ <version>2.12.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-debezium</artifactId>
@@ -9863,6 +9873,26 @@
<artifactId>quarkus-cxf-deployment</artifactId>
<version>1.4.0</version>
</dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-rt-ws-security</artifactId>
+ <version>1.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-rt-ws-security-deployment</artifactId>
+ <version>1.4.0</version>
+ </dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
@@ -10121,12 +10151,35 @@
<artifactId>cxf-rt-wsdl</artifactId>
<version>3.5.3</version>
<exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>3.3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core4</artifactId>
@@ -10188,6 +10241,16 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>2.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -10259,6 +10322,11 @@
<artifactId>org.eclipse.jgit</artifactId>
<version>6.2.0.202206071550-r</version>
</dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>3.9.6</version>
+ </dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
@@ -10304,6 +10372,11 @@
<artifactId>mvel2</artifactId>
<version>2.4.14.Final</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>3.2.0</version>
+ </dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</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 aa82b2e013..f1045b9083 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -8767,6 +8767,16 @@
<artifactId>camel-quarkus-support-consul-client-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-cxf-wss</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-support-cxf-wss-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.12.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-support-debezium</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -9863,6 +9873,26 @@
<artifactId>quarkus-cxf-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>quarkus-cxf-rt-ws-security</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>quarkus-cxf-rt-ws-security-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10121,12 +10151,35 @@
<artifactId>cxf-rt-wsdl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>geronimo-jta_1.1_spec</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>cxf-xjc-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.htrace</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>htrace-core4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10188,6 +10241,16 @@
<groupId>org.apache.santuario</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlsec</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.xml.bind-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10259,6 +10322,11 @@
<artifactId>org.eclipse.jgit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>6.2.0.202206071550-r</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>ehcache</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -10304,6 +10372,11 @@
<artifactId>mvel2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.4.14.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>neethi</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.optaplanner</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
[camel-quarkus] 03/03: Upgrade to cq-maven-plugin 3.1.0
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9423192143a81f74e951956d84eac91b95b5599a
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Aug 11 12:08:14 2022 +0200
Upgrade to cq-maven-plugin 3.1.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bd43a3a07d..a8543b9d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
<maven-utils.version>0.1.0</maven-utils.version>
<!-- Maven plugin versions (keep sorted alphabetically) -->
- <cq-plugin.version>2.27.0</cq-plugin.version>
+ <cq-plugin.version>3.1.0</cq-plugin.version>
<build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
[camel-quarkus] 01/03: Use CDI producres instead of camel.beans.* in application.properties
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 177542c66ab9b3a5cd0036777111f7e165bddcd3
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Aug 9 12:33:08 2022 +0200
Use CDI producres instead of camel.beans.* in application.properties
---
.../component/cxf/soap/it/CxfSoapRoutes.java | 103 +++++++++++++++++++++
.../component/cxf/soap/it/PasswordCallback.java | 6 +-
.../src/main/resources/application.properties | 37 --------
3 files changed, 106 insertions(+), 40 deletions(-)
diff --git a/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapRoutes.java b/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapRoutes.java
index 40f25f2422..7ece4e148c 100644
--- a/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapRoutes.java
+++ b/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/CxfSoapRoutes.java
@@ -16,10 +16,42 @@
*/
package org.apache.camel.quarkus.component.cxf.soap.it;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import com.helloworld.service.CodeFirstService;
+import com.helloworld.service.HelloPortType;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
+import org.apache.cxf.ext.logging.LoggingFeature;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+@ApplicationScoped
public class CxfSoapRoutes extends RouteBuilder {
+
+ @Inject
+ @Named("passwordCallback")
+ PasswordCallback passwordCallback;
+
+ @Inject
+ @Named("loggingFeature")
+ LoggingFeature loggingFeature;
+
+ @Inject
+ @Named("wssInterceptor")
+ WSS4JOutInterceptor wssInterceptor;
+
+ @ConfigProperty(name = "wiremock.url")
+ String serviceBaseUri;
+
@Override
public void configure() {
@@ -41,4 +73,75 @@ public class CxfSoapRoutes extends RouteBuilder {
from("cxf:bean:codeFirstServiceEndpoint")
.setBody().constant("Hello CamelQuarkusCXF");
}
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ WSS4JOutInterceptor wssInterceptor() {
+ final Map<String, Object> props = new HashMap<>();
+ props.put(ConfigurationConstants.ACTION, "UsernameToken");
+ props.put(ConfigurationConstants.PASSWORD_TYPE, "PasswordText");
+ props.put(ConfigurationConstants.USER, "camel");
+ props.put("passwordCallbackRef", passwordCallback);
+ props.put(ConfigurationConstants.ADD_USERNAMETOKEN_NONCE, "true");
+ props.put(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, "true");
+ return new WSS4JOutInterceptor(props);
+ }
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ public LoggingFeature loggingFeature() {
+ final LoggingFeature result = new LoggingFeature();
+ result.setPrettyLogging(true);
+ return result;
+ }
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ CxfEndpoint secureEndpoint() {
+ final CxfEndpoint result = new CxfEndpoint();
+ result.setServiceClass(HelloPortType.class);
+ result.setAddress(serviceBaseUri + "/hellowss");
+ result.setWsdlURL("wsdl/HelloService.wsdl");
+ result.getFeatures().add(loggingFeature);
+ result.getOutInterceptors().add(wssInterceptor);
+ return result;
+ }
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ CxfEndpoint soapClientEndpoint() {
+ final CxfEndpoint result = new CxfEndpoint();
+ result.setServiceClass(HelloPortType.class);
+ result.setAddress(serviceBaseUri + "/hello");
+ result.setWsdlURL("wsdl/HelloService.wsdl");
+ result.getFeatures().add(loggingFeature);
+ return result;
+ }
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ CxfEndpoint soapServiceEndpoint() {
+ final CxfEndpoint result = new CxfEndpoint();
+ result.setServiceClass(HelloPortType.class);
+ result.setAddress("/hello");
+ result.setWsdlURL("wsdl/HelloService.wsdl");
+ result.getFeatures().add(loggingFeature);
+ return result;
+ }
+
+ @Produces
+ @ApplicationScoped
+ @Named
+ CxfEndpoint codeFirstServiceEndpoint() {
+ final CxfEndpoint result = new CxfEndpoint();
+ result.setServiceClass(CodeFirstService.class);
+ result.setAddress("/codefirst");
+ result.getFeatures().add(loggingFeature);
+ return result;
+ }
}
diff --git a/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/PasswordCallback.java b/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/PasswordCallback.java
index 2527932f08..99e86f65c1 100644
--- a/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/PasswordCallback.java
+++ b/integration-tests/cxf-soap/src/main/java/org/apache/camel/quarkus/component/cxf/soap/it/PasswordCallback.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.it;
+package org.apache.camel.quarkus.component.cxf.soap.it;
import java.io.IOException;
@@ -33,9 +33,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
@Named("passwordCallback")
public class PasswordCallback implements CallbackHandler {
@ConfigProperty(name = "password-callback.username")
- private String username;
+ String username;
@ConfigProperty(name = "password-callback.password")
- private String password;
+ String password;
/**
* Here, we attempt to get the password from the private alias/passwords map.
diff --git a/integration-tests/cxf-soap/src/main/resources/application.properties b/integration-tests/cxf-soap/src/main/resources/application.properties
index fb91160edd..efc3dcbba6 100644
--- a/integration-tests/cxf-soap/src/main/resources/application.properties
+++ b/integration-tests/cxf-soap/src/main/resources/application.properties
@@ -18,42 +18,5 @@
password-callback.username=camel
password-callback.password=quarkus
-camel.beans.wssArgs=#class:java.util.HashMap
-camel.beans.wssArgs.action=UsernameToken
-camel.beans.wssArgs.passwordType=PasswordText
-camel.beans.wssArgs.user=camel
-camel.beans.wssArgs.passwordCallbackRef=#bean:passwordCallback
-camel.beans.wssArgs.addUsernameTokenNonce=true
-camel.beans.wssArgs.addUsernameTokenCreated=true
-
-camel.beans.wssInterceptor=#class:org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor(#bean:wssArgs)
-
-camel.beans.loggingFeature=#class:org.apache.cxf.ext.logging.LoggingFeature
-camel.beans.loggingFeature.prettyLogging=true
-
-camel.beans.secureEndpoint=#class:org.apache.camel.component.cxf.jaxws.CxfEndpoint
-camel.beans.secureEndpoint.serviceClass=com.helloworld.service.HelloPortType
-camel.beans.secureEndpoint.address=${wiremock.url}/hellowss
-camel.beans.secureEndpoint.wsdlURL=wsdl/HelloService.wsdl
-camel.beans.secureEndpoint.features[0]=#bean:loggingFeature
-camel.beans.secureEndpoint.outInterceptors[0]=#bean:wssInterceptor
-
-camel.beans.soapClientEndpoint=#class:org.apache.camel.component.cxf.jaxws.CxfEndpoint
-camel.beans.soapClientEndpoint.serviceClass=com.helloworld.service.HelloPortType
-camel.beans.soapClientEndpoint.address=${wiremock.url}/hello
-camel.beans.soapClientEndpoint.wsdlURL=wsdl/HelloService.wsdl
-camel.beans.soapClientEndpoint.features[0]=#bean:loggingFeature
-
-camel.beans.soapServiceEndpoint=#class:org.apache.camel.component.cxf.jaxws.CxfEndpoint
-camel.beans.soapServiceEndpoint.serviceClass=com.helloworld.service.HelloPortType
-camel.beans.soapServiceEndpoint.address=/hello
-camel.beans.soapServiceEndpoint.wsdlURL=wsdl/HelloService.wsdl
-camel.beans.soapServiceEndpoint.features[0]=#bean:loggingFeature
-
-camel.beans.codeFirstServiceEndpoint=#class:org.apache.camel.component.cxf.jaxws.CxfEndpoint
-camel.beans.codeFirstServiceEndpoint.serviceClass=com.helloworld.service.CodeFirstService
-camel.beans.codeFirstServiceEndpoint.address=/codefirst
-camel.beans.codeFirstServiceEndpoint.features[0]=#bean:loggingFeature
-
quarkus.cxf.path=/soapservice
quarkus.native.resources.includes = wsdl/*.wsdl