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/03/06 08:13:11 UTC
[camel-quarkus] 03/03: Restore smallrye-reactive-messaging-camel extension
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 cc2da16c0d9f5ae7402dbf3947c19fb475afdd59
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 6 08:12:36 2023 +0000
Restore smallrye-reactive-messaging-camel extension
Fixes #4464
---
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 +-
pom.xml | 2 +-
poms/bom/pom.xml | 8 +--
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 +
14 files changed, 117 insertions(+), 12 deletions(-)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 3b76d03299..cb02146325 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -262,6 +262,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 ec20bcca6e..c8691d376c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -220,7 +220,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 f4325ca812..346c7e16f6 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -207,7 +207,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/pom.xml b/pom.xml
index b346ad865d..e41acb25a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,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.3.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.4.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>1.33</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 9e45880f77..cc24d513fc 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -4939,7 +4939,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>
@@ -4948,7 +4948,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>
@@ -6140,11 +6140,11 @@
<artifactId>netty-incubator-transport-classes-io_uring</artifactId>
<version>${io-netty-iouring.version}</version>
</dependency>
- <!--<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 f444241f16..ee5e030f9e 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -4842,6 +4842,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} -->
@@ -6011,6 +6021,11 @@
<artifactId>netty-incubator-transport-classes-io_uring</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.0.16.Final</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 1472d037e2..9c38b74b36 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -4842,6 +4842,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>
@@ -5996,6 +6006,11 @@
<artifactId>netty-incubator-transport-classes-io_uring</artifactId>
<version>0.0.16.Final</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 141c56c3c3..7ce23105a4 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -4842,6 +4842,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} -->
@@ -5996,6 +6006,11 @@
<artifactId>netty-incubator-transport-classes-io_uring</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.0.16.Final</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 ac5bce8945..f580079452 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -39,6 +39,7 @@ group-02:
- oaipmh
- pubnub
- protobuf
+ - smallrye-reactive-messaging
- solr
- sql
group-03: