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 2023/04/24 07:06:57 UTC
[camel-quarkus] branch quarkus-main updated (450ec7a0fd -> 4bbc86c6b8)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 450ec7a0fd Upgrade Quarkus to 3.1.0.CR1
add ee6cadb250 Snmp: Extend test coverage #4797
add 2f3dbfb2b9 Add camel-cli-connector extension. Fixes #4051
add fdc23d49ad Upgrade to quarkus-cxf 2.0.1
add fcc04efbdb Test that WSDLs served in JVM and native modes are the same #4746
add dc5c8c5b2f Avoid stale resources from previous builds and older branches in grouped modules
add 1c3faa0303 Upgrade cassandra-quarkus to 1.2.0
add c46181432a Updated CHANGELOG.md
add a742267f2c Bump quarkiverse-pooled-jms.version from 2.0.0.CR2 to 2.0.0 (#4818)
add 8a44f8d227 Regen SBOM from commit a742267f2cd8ebec9019ff6f76dc9698fe1446bb
add d576f00a9c Updated CHANGELOG.md
new 529c657c4e Upgrade Quarkus to 3.1.0.CR1
new 4bbc86c6b8 Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (450ec7a0fd)
\
N -- N -- N refs/heads/quarkus-main (4bbc86c6b8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
CHANGELOG.md | 9 +
camel-quarkus-sbom/camel-quarkus-sbom.json | 15384 ++++++++++---------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 14007 ++++++++---------
catalog/pom.xml | 13 +
.../modules/ROOT/examples/others/cli-connector.yml | 13 +
docs/modules/ROOT/nav.adoc | 2 +
.../{mapstruct.adoc => cli-connector.adoc} | 18 +-
.../extensions/smallrye-reactive-messaging.adoc | 62 +
.../deployment/pom.xml | 8 +-
.../deployment/CliConnectorProcessor.java} | 8 +-
.../{elasticsearch => cli-connector}/pom.xml | 4 +-
.../{mapstruct => cli-connector}/runtime/pom.xml | 10 +-
.../main/resources/META-INF/quarkus-extension.yaml | 7 +-
extensions-jvm/pom.xml | 1 +
extensions/pom.xml | 2 +-
.../src/main/resources/application.properties | 4 +
.../component/cxf/soap/server/it/Java2wsIT.java} | 4 +-
.../component/cxf/soap/server/it/Java2wsTest.java | 126 +
.../{groovy => cli-connector}/pom.xml | 26 +-
.../cli/connector/it/CliConnectorResource.java} | 14 +-
.../cli/connector/it/CliConnectorTest.java | 8 +-
integration-tests-jvm/pom.xml | 1 +
integration-tests-jvm/snmp/pom.xml | 5 +
.../quarkus/component/snmp/it/SnmpResource.java | 120 +-
.../camel/quarkus/component/snmp/it/SnmpRoute.java | 44 +-
.../camel/quarkus/component/snmp/it/SnmpTest.java | 67 +-
.../component/snmp/it/SnmpTestResource.java | 135 +
integration-tests/pom.xml | 2 +-
.../messaging/it/FilesMessageConsumer.java | 1 -
.../reactive/messaging/it/PublisherRoute.java | 1 -
.../it/SmallRyeReactiveMessagingResource.java | 1 -
.../reactive/messaging/it/SubscriberRoute.java | 3 +-
pom.xml | 8 +-
poms/bom/pom.xml | 39 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 561 +-
.../src/main/generated/flattened-reduced-pom.xml | 99 +-
.../generated/flattened-reduced-verbose-pom.xml | 509 +-
tooling/scripts/group-tests.groovy | 14 +-
tooling/scripts/test-categories.yaml | 1 +
39 files changed, 16322 insertions(+), 15019 deletions(-)
create mode 100644 docs/modules/ROOT/examples/others/cli-connector.yml
copy docs/modules/ROOT/pages/reference/extensions/{mapstruct.adoc => cli-connector.adoc} (66%)
create mode 100644 docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc
copy extensions-jvm/{elasticsearch => cli-connector}/deployment/pom.xml (89%)
copy extensions-jvm/{elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java => cli-connector/deployment/src/main/java/org/apache/camel/quarkus/component/cli/connector/deployment/CliConnectorProcessor.java} (87%)
copy extensions-jvm/{elasticsearch => cli-connector}/pom.xml (93%)
copy extensions-jvm/{mapstruct => cli-connector}/runtime/pom.xml (91%)
copy extensions-jvm/{jasypt => cli-connector}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (88%)
copy integration-test-groups/{foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/EipIT.java => cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsIT.java} (91%)
create mode 100644 integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/Java2wsTest.java
copy integration-tests-jvm/{groovy => cli-connector}/pom.xml (82%)
copy integration-tests-jvm/{etcd3/src/main/java/org/apache/camel/quarkus/component/etcd3/it/Etcd3Resource.java => cli-connector/src/main/java/org/apache/camel/quarkus/component/cli/connector/it/CliConnectorResource.java} (78%)
copy extensions/aws2-lambda/runtime/src/main/org/apache/lambda/it/Aws2LambdaTest.java => integration-tests-jvm/cli-connector/src/test/java/org/apache/camel/quarkus/component/cli/connector/it/CliConnectorTest.java (84%)
copy integration-test-groups/aws2/aws2-kinesis/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisRoutes.java => integration-tests-jvm/snmp/src/main/java/org/apache/camel/quarkus/component/snmp/it/SnmpRoute.java (52%)
create mode 100644 integration-tests-jvm/snmp/src/test/java/org/apache/camel/quarkus/component/snmp/it/SnmpTestResource.java
[camel-quarkus] 02/02: Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4bbc86c6b89afc9e73700835504b3d67b2ade222
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Apr 24 08:02:56 2023 +0100
Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
This reverts commit 7906778cc8cb618e2db325fdee125db4cbf28779.
---
docs/modules/ROOT/nav.adoc | 1 +
.../extensions/smallrye-reactive-messaging.adoc | 62 ++++++++++++++++++++++
extensions/pom.xml | 2 +-
integration-tests/pom.xml | 2 +-
.../messaging/it/FilesMessageConsumer.java | 1 -
.../reactive/messaging/it/PublisherRoute.java | 1 -
.../it/SmallRyeReactiveMessagingResource.java | 1 -
.../reactive/messaging/it/SubscriberRoute.java | 3 +-
poms/bom/pom.xml | 24 +++++++--
poms/bom/src/main/generated/flattened-full-pom.xml | 15 ++++++
.../src/main/generated/flattened-reduced-pom.xml | 15 ++++++
.../generated/flattened-reduced-verbose-pom.xml | 15 ++++++
tooling/scripts/test-categories.yaml | 1 +
13 files changed, 132 insertions(+), 11 deletions(-)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index db85342613..edd26d68b0 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -267,6 +267,7 @@
*** xref:reference/extensions/sjms2.adoc[Simple JMS2]
*** xref:reference/extensions/huaweicloud-smn.adoc[SimpleNotification]
*** xref:reference/extensions/slack.adoc[Slack]
+*** xref:reference/extensions/smallrye-reactive-messaging.adoc[SmallRye Reactive Messaging]
*** xref:reference/extensions/snakeyaml.adoc[SnakeYAML]
*** xref:reference/extensions/solr.adoc[Solr]
*** xref:reference/extensions/splunk.adoc[Splunk]
diff --git a/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc b/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc
new file mode 100644
index 0000000000..5f23cc78f2
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc
@@ -0,0 +1,62 @@
+// Do not edit directly!
+// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
+[id="extensions-smallrye-reactive-messaging"]
+= SmallRye Reactive Messaging
+:page-aliases: extensions/smallrye-reactive-messaging.adoc
+:linkattrs:
+:cq-artifact-id: camel-quarkus-smallrye-reactive-messaging
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
+:cq-description: Camel integration with SmallRye Reactive Messaging
+:cq-deprecated: false
+:cq-jvm-since: 1.0.0
+:cq-native-since: 1.0.0
+
+ifeval::[{doc-show-badges} == true]
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
+endif::[]
+
+Camel integration with SmallRye Reactive Messaging
+
+[id="extensions-smallrye-reactive-messaging-maven-coordinates"]
+== Maven coordinates
+
+https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-smallrye-reactive-messaging[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"]
+
+Or add the coordinates to your existing project:
+
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-smallrye-reactive-messaging</artifactId>
+</dependency>
+----
+ifeval::[{doc-show-user-guide-link} == true]
+Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+endif::[]
+
+[id="extensions-smallrye-reactive-messaging-usage"]
+== Usage
+This extension leverages https://www.smallrye.io/smallrye-reactive-messaging/[SmallRye Reactive Messaging].
+Examples for how to use the Camel connector are outlined within the https://www.smallrye.io/smallrye-reactive-messaging/[documentation].
+
+[NOTE]
+====
+Where the SmallRye Reactive Messaging documentation makes references to Camel component maven dependencies, you should ensure that the corresponding camel-quarkus extension is used.
+E.g `<artifactId>camel-file</artifactId>` should be `<artifactId>camel-quarkus-file</artifactId>`.
+
+When using this extension, there is no need to explictly add `io.smallrye.reactive:smallrye-reactive-messaging-camel` or `io.quarkus:quarkus-quarkus-smallrye-reactive-messaging` to your project.
+====
+
+
+[id="extensions-smallrye-reactive-messaging-additional-camel-quarkus-configuration"]
+== Additional Camel Quarkus configuration
+
+This extension leverages the Camel xref:reference/extensions/reactive-streams.adoc[Reactive Streams] extension. Various aspects of the reactive streams component can be configured
+via the configuration options outlined within the xref:reference/extensions/reactive-streams.adoc[documentation].
+
+This extension also leverages the Quarkus SmallRye Reactive Messaging extension. Its configuration options are documented https://quarkus.io/guides/all-config#quarkus-smallrye-reactive-messaging_quarkus-smallrye-reactive-messaging[here].
+
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 39359ba779..fc5eb3d000 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -218,7 +218,7 @@
<module>sjms</module>
<module>sjms2</module>
<module>slack</module>
- <!--<module>smallrye-reactive-messaging</module> https://github.com/apache/camel-quarkus/issues/4464 -->
+ <module>smallrye-reactive-messaging</module>
<module>snakeyaml</module>
<module>soap</module>
<module>solr</module>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 362b8e6ac5..c3fab9a02a 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -205,7 +205,7 @@
<module>sjms2-artemis-client</module>
<module>sjms2-qpid-amqp-client</module>
<module>slack</module>
- <!--<module>smallrye-reactive-messaging</module>-->
+ <module>smallrye-reactive-messaging</module>
<module>soap</module>
<module>solr</module>
<module>splunk</module>
diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/FilesMessageConsumer.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/FilesMessageConsumer.java
index f0c526b668..11c48eb751 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/FilesMessageConsumer.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/FilesMessageConsumer.java
@@ -23,7 +23,6 @@ import java.util.concurrent.CompletionStage;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-
import org.apache.camel.CamelContext;
import org.apache.camel.component.file.GenericFile;
import org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
index 6ff0d786e7..bae2c06e27 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
@@ -20,7 +20,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import jakarta.inject.Inject;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
index 0a01873eac..bb1d6e1a87 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
@@ -28,7 +28,6 @@ import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
import org.apache.camel.ProducerTemplate;
@Path("/smallrye-reactive-messaging")
diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SubscriberRoute.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SubscriberRoute.java
index d6f00c662b..f2d5546414 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SubscriberRoute.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SubscriberRoute.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.quarkus.component.smallrye.reactive.messaging.it;
-import jakarta.inject.Inject;
-
import io.smallrye.mutiny.Multi;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
import org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 542d94aed7..62bc0669fa 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5053,7 +5053,7 @@
<artifactId>camel-quarkus-slack-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-smallrye-reactive-messaging</artifactId>
<version>${camel-quarkus.version}</version>
@@ -5062,7 +5062,7 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId>
<version>${camel-quarkus.version}</version>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-smpp</artifactId>
@@ -6293,11 +6293,27 @@
<artifactId>quarkus-tika-deployment</artifactId>
<version>${quarkiverse-tika.version}</version>
</dependency>
- <!--<dependency>
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>${minio.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty.incubator</groupId>
+ <artifactId>netty-incubator-transport-classes-io_uring</artifactId>
+ <version>${io-netty-iouring.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
<version>${smallrye.reactive.messaging.camel.version}</version>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-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 f4f6020de2..946a994540 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -4964,6 +4964,16 @@
<artifactId>camel-quarkus-slack-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.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-smallrye-reactive-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.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-smallrye-reactive-messaging-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.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-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6191,6 +6201,11 @@
<artifactId>quarkus-tika-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.jms-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 8499fa18ed..4837879fd3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -4964,6 +4964,16 @@
<artifactId>camel-quarkus-slack-deployment</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-smallrye-reactive-messaging</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-smallrye-reactive-messaging-deployment</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-smpp</artifactId>
@@ -6191,6 +6201,11 @@
<artifactId>quarkus-tika-deployment</artifactId>
<version>2.0.0</version>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>smallrye-reactive-messaging-camel</artifactId>
+ <version>4.4.0</version>
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-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 001ad6858e..a8022b62e1 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -4964,6 +4964,16 @@
<artifactId>camel-quarkus-slack-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.0.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-smallrye-reactive-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.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-smallrye-reactive-messaging-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.0.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-smpp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6191,6 +6201,11 @@
<artifactId>quarkus-tika-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>2.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.jms-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 951eeeb628..3d6acd0332 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -41,6 +41,7 @@ group-02:
- oaipmh
- pubnub
- protobuf
+ - smallrye-reactive-messaging
- solr
- sql
group-03:
[camel-quarkus] 01/02: Upgrade Quarkus to 3.1.0.CR1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 529c657c4e8e11c818b09729397abc68b64c36ac
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Apr 17 08:25:26 2023 +0100
Upgrade Quarkus to 3.1.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 8 ++++----
poms/bom/pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++++---
poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++++++---
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++++++---
6 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 7d5bcbebad..25e569f825 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M2 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/pom.xml b/pom.xml
index fe8a95055b..fe666173bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.0</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.0.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.0.0.Alpha3</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -80,7 +80,7 @@
<azure-identity.version>1.7.3</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity -->
<azure-core-http-vertx.version>1.0.0-beta.3</azure-core-http-vertx.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 -->
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom -->
- <bouncycastle.version>1.72</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on -->
+ <bouncycastle.version>1.73</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on -->
<brotli.version>0.1.2</brotli.version>
<caffeine.version>3.1.5</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine -->
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
@@ -102,7 +102,7 @@
<google-cloud-pubsub-bom.version>1.121.0</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom -->
<google-cloud-pubsub.version>1.121.0</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub -->
<graalvm.version>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.54.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.54.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
@@ -143,7 +143,7 @@
<reactor-core.version>3.4.26</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.5.0</retrofit.version>
- <smallrye.reactive.messaging.camel.version>4.4.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>4.5.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring-version}</spring.version>
<snakeyaml.version>2.0</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<tablesaw.version>0.43.1</tablesaw.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index bf1c44358d..542d94aed7 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6415,6 +6415,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index e017722e92..f4f6020de2 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6308,6 +6308,10 @@
<groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>slf4j-log4j12</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6350,17 +6354,17 @@
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.brotli</groupId><!-- 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 9b541d7ac0..8499fa18ed 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6288,6 +6288,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6330,17 +6334,17 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk18on</artifactId>
- <version>1.72</version>
+ <version>1.73</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.72</version>
+ <version>1.73</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.72</version>
+ <version>1.73</version>
</dependency>
<dependency>
<groupId>org.brotli</groupId>
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 f2ba7e1bdd..001ad6858e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6288,6 +6288,10 @@
<groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>slf4j-log4j12</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6330,17 +6334,17 @@
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.brotli</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->