You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/04/05 13:49:52 UTC
[camel-quarkus] 18/18: Fixed #4735 and auto-generated changes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 161101a112f5f0ba6e9cd888eef42311dcbfd80d
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Apr 5 15:49:11 2023 +0200
Fixed #4735 and auto-generated changes
---
.../apache/camel/quarkus/component/bean/BeanRoutes.java | 2 +-
.../apache/camel/quarkus/component/bean/BeanTest.java | 2 --
poms/bom/src/main/generated/flattened-full-pom.xml | 17 ++++++++++++++++-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 17 ++++++++++++++++-
.../main/generated/flattened-reduced-verbose-pom.xml | 17 ++++++++++++++++-
5 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java
index 636ae134e2..67397d28cd 100644
--- a/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java
+++ b/integration-test-groups/foundation/bean/src/main/java/org/apache/camel/quarkus/component/bean/BeanRoutes.java
@@ -105,7 +105,7 @@ public class BeanRoutes extends RouteBuilder {
.to("bean:parametersBean?method=parameterLiterals(*, true)");
from("direct:parameterTypes")
- .to("bean:parametersBean?method=parameterTypes(String)");
+ .to("bean:parametersBean?method=parameterTypes(String.class)");
from("direct:produceInterface")
.process(e -> e.getMessage().setBody("produceInterface " + e.getMessage().getBody(String.class)));
diff --git a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java
index cce658e280..5e61dc0d55 100644
--- a/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java
+++ b/integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanTest.java
@@ -21,7 +21,6 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.camel.quarkus.component.bean.model.Employee;
import org.apache.camel.util.StringHelper;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -203,7 +202,6 @@ public class BeanTest {
}
@Test
- @Disabled // https://github.com/apache/camel-quarkus/issues/4735
public void parameterTypes() {
RestAssured.given()
.contentType(ContentType.JSON)
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index a989e0c487..d421893e8e 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2289,7 +2289,7 @@
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-tika</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.0.0-M2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6905,6 +6905,11 @@
<artifactId>cxf-rt-bindings-xml</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-rt-databinding-aegis</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-databinding-jaxb</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6915,6 +6920,11 @@
<artifactId>cxf-rt-frontend-simple</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-rt-javascript</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-management</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6955,6 +6965,11 @@
<artifactId>cxf-tools-common</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-tools-java2ws</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-tools-validator</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 85d3587fb0..7601307cc5 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -2289,7 +2289,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-tika</artifactId>
- <version>4.0.0-M2</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -6855,6 +6855,11 @@
<artifactId>cxf-rt-bindings-xml</artifactId>
<version>4.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>4.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
@@ -6865,6 +6870,11 @@
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>4.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ <version>4.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
@@ -6905,6 +6915,11 @@
<artifactId>cxf-tools-common</artifactId>
<version>4.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>4.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-validator</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 d9854dd4ac..6f5db4d495 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -2289,7 +2289,7 @@
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-tika</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.0.0-M2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6855,6 +6855,11 @@
<artifactId>cxf-rt-bindings-xml</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-rt-databinding-aegis</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-databinding-jaxb</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6865,6 +6870,11 @@
<artifactId>cxf-rt-frontend-simple</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-rt-javascript</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-management</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6905,6 +6915,11 @@
<artifactId>cxf-tools-common</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <artifactId>cxf-tools-java2ws</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-tools-validator</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->