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 29543ccee98fedfb462ea9543e47bd3287088e87
Author: James Netherton <jamesnether...@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 8a5e06087d..c4af3c4059 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -214,7 +214,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 479d31ab85..4e06019b5c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -202,7 +202,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 3a368ed0c8..3edf4ffeb9 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>
@@ -6263,11 +6263,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 43283d8df1..d2485d6059 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} -->
@@ -6161,6 +6171,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.5.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 649d1d63a4..26fc0719e7 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>
@@ -6161,6 +6171,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.5.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 e5ba5b76ab..89bd28138f 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} -->
@@ -6161,6 +6171,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.5.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 9d1a1e2471..feaa382828 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:
