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/05/07 16:23:59 UTC
[camel-quarkus] branch quarkus-main updated (b1937f9c3e -> 38310db47b)
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 b1937f9c3e Add workaround for RemoteCacheManager bean discovery #4841
discard 67b7e59e05 Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
discard 3c7f8d3cd2 Upgrade Quarkus to 3.1.0.CR1
add 68e13e6a07 Updated CHANGELOG.md
add cf09ed618b Snnmp: reworked tests to avoid flaky failures
add 24b279ea33 Updated CHANGELOG.md
add ccc90939c7 Snmp: tiny timeout change in test to help stability
add 4912ac03f0 Upgrade Camel to 4.0.0-M3
add 5286e7f09c Ref #4384: Groovy DSL - Add support of Groovy extensions
add 0832f41ba9 Ref #4624: Upgrade to Groovy 4.x
add 7f04b173e0 Add support of expressions referring an external resource
add 3e3735e9dc Ref #1746: Groovy language native support
add aa15026584 Bump quarkiverse-jackson-jq.version from 2.0.0.Alpha to 2.0.1 (#4877)
add 8121356015 Restore camel-kubernetes related native testing (#4874)
add 73e85406b5 Updated CHANGELOG.md
add eefc917827 Regen SBOM from commit 73e85406b5542dd5a0010f3efecacb1db0d25cef
new 36426bcd9a Upgrade Quarkus to 3.1.0.CR1
new dbcfcc2044 Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
new 38310db47b Add workaround for RemoteCacheManager bean discovery #4841
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 (b1937f9c3e)
\
N -- N -- N refs/heads/quarkus-main (38310db47b)
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 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:
CHANGELOG.md | 12 +
camel-quarkus-sbom/camel-quarkus-sbom.json | 19828 +++++++++----------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 15016 +++++++-------
catalog/pom.xml | 26 -
docs/antora.yml | 2 +-
docs/modules/ROOT/examples/components/http.yml | 2 +-
docs/modules/ROOT/examples/components/solr.yml | 13 -
docs/modules/ROOT/examples/components/vm.yml | 13 -
docs/modules/ROOT/examples/languages/groovy.yml | 6 +-
docs/modules/ROOT/nav.adoc | 2 -
.../pages/reference/extensions/groovy-dsl.adoc | 6 -
.../ROOT/pages/reference/extensions/groovy.adoc | 22 +-
.../ROOT/pages/reference/extensions/http.adoc | 4 +-
.../ROOT/pages/reference/extensions/solr.adoc | 54 -
.../ROOT/pages/reference/extensions/vm.adoc | 46 -
.../CamelPackageScanClassResolverTest.java | 6 +-
.../camel/quarkus/core/CamelContextRecorder.java | 9 +-
.../apache/camel/quarkus/core/CamelRecorder.java | 3 +-
.../apache/camel/quarkus/core/ConsumeRecorder.java | 3 +-
.../camel/quarkus/core/FastCamelContext.java | 12 +-
.../org/apache/camel/quarkus/main/CamelMain.java | 3 +-
.../groovy/deployment/GroovyProcessor.java | 47 -
extensions-jvm/pom.xml | 1 -
.../httpclient/deployment/HttpClientProcessor.java | 22 +-
extensions-support/httpclient/runtime/pom.xml | 7 +
.../language/deployment/ExpressionBuildItem.java | 26 +-
.../deployment/LanguageSupportProcessor.java | 10 +-
.../language/deployment/ScriptBuildItem.java | 8 +-
.../language/deployment/dm/DryModeLanguage.java | 17 +-
.../deployment/dm/DryModeLanguageResolver.java | 4 +-
.../language/deployment/dm/DryModeMain.java | 6 +-
.../deployment/dm/DryModeScriptingLanguage.java | 7 +-
.../language/deployment/dm/ExpressionHolder.java | 12 +-
.../language/deployment/dm/ScriptHolder.java | 8 +-
.../dsl/groovy/deployment/GroovyDslProcessor.java | 65 +-
.../runtime/src/main/doc/limitations.adoc | 1 -
.../groovy/runtime/graal/GroovySubstitutions.java | 130 +-
.../groovy/deployment/pom.xml | 8 +
.../GroovyExpressionSourceBuildItem.java} | 31 +-
.../groovy/deployment/GroovyProcessor.java | 176 +
{extensions-jvm => extensions}/groovy/pom.xml | 2 +-
.../groovy/runtime/pom.xml | 9 +
.../groovy/runtime/src/main/doc/limitations.adoc | 3 +
.../groovy/runtime/GroovyExpressionRecorder.java} | 25 +-
.../groovy/runtime/GroovyStaticScript.java | 63 +
.../main/resources/META-INF/quarkus-extension.yaml | 0
.../component/http/deployment/HttpProcessor.java | 5 +-
.../java/joor/deployment/JavaJoorDslProcessor.java | 27 +-
.../camel/quarkus/component/jaxb/JaxbRecorder.java | 3 +-
.../component/joor/deployment/JoorProcessor.java | 2 +-
extensions/jq/runtime/pom.xml | 4 +
.../kamelet/deployment/KameletProcessor.java | 6 +-
.../quarkus/component/kamelet/KameletRecorder.java | 2 +-
.../runtime/CamelMicroProfileHealthRecorder.java | 2 +-
.../oaipmh/deployment/OaipmhProcessor.java | 1 -
extensions/pom.xml | 3 +-
extensions/solr/deployment/pom.xml | 73 -
.../component/solr/deployment/SolrProcessor.java | 86 -
extensions/solr/pom.xml | 37 -
extensions/solr/runtime/pom.xml | 114 -
.../main/resources/META-INF/quarkus-extension.yaml | 32 -
extensions/tika/runtime/pom.xml | 15 +
extensions/vm/deployment/pom.xml | 61 -
.../component/vm/deployment/VmProcessor.java | 31 -
extensions/vm/pom.xml | 37 -
extensions/vm/runtime/pom.xml | 99 -
.../main/resources/META-INF/quarkus-extension.yaml | 32 -
.../cxf/soap/client/it/CxfSoapClientTest.java | 8 +-
.../dataformats-json/json-gson/pom.xml | 4 +-
.../json/gson/JsonGsonDataformatsResource.java | 6 +-
.../json/gson/JsonGsonDataformatsRoute.java | 6 +-
.../dataformats-json/json-jackson/pom.xml | 4 +-
.../dataformats-json/json-jsonb/pom.xml | 4 +-
.../json/jsonb/JsonJsonbDataformatsResource.java | 6 +-
.../json/jsonb/JsonJsonbDataformatsRoute.java | 6 +-
.../camel/quarkus/component/bean/BeanRoutes.java | 2 +-
.../resolver/ComponentNameResolverResource.java | 5 +-
.../apache/camel/quarkus/core/CoreResource.java | 3 +-
.../component/direct/it/DirectResource.java | 3 +-
.../RouteConfigurationsTest.java | 2 +
.../dsl/modeline/it/DslModelineResource.java | 3 +-
integration-tests-jvm/groovy/pom.xml | 100 -
integration-tests-jvm/pom.xml | 1 -
.../quarkus/component/snmp/it/SnmpResource.java | 12 +-
.../camel/quarkus/component/snmp/it/SnmpRoute.java | 32 +-
.../camel/quarkus/component/snmp/it/SnmpTest.java | 41 +-
.../component/snmp/it/SnmpTestResource.java | 111 +-
.../support/azure/AzureStorageTestResource.java | 2 +-
integration-tests/dataformat/pom.xml | 2 -
.../component/dataformat/it/DataformatIT.java | 2 -
.../component/dataformat/it/DataformatTest.java | 2 -
integration-tests/dataformats-json-grouped/pom.xml | 4 +-
.../common/it/DebeziumMongodbResource.java | 2 +-
integration-tests/groovy-dsl/pom.xml | 54 +-
.../quarkus/dsl/groovy/GroovyDslResource.java | 6 +
.../main/resources/routes/routes-with-eip.groovy | 27 +-
.../camel/quarkus/dsl/groovy/GroovyDslTest.java | 181 +-
integration-tests/{joor => groovy}/pom.xml | 16 +-
.../quarkus/component/groovy/it/GroovyBean.java} | 4 +-
.../component/groovy/it/GroovyResource.java | 24 +
.../quarkus/component/groovy/it/GroovyRoutes.java | 18 +
.../groovy/src/main/resources/bean.txt | 4 +
.../quarkus/component/groovy/it/GroovyIT.java | 4 +-
.../quarkus/component/groovy/it/GroovyTest.java | 43 +-
.../quarkus/component/http/it/HttpProducers.java | 26 +-
.../component/kamelet/it/KameletResource.java | 2 +-
integration-tests/kubernetes/pom.xml | 2 -
.../camel/quarkus/main/CoreMainXmlIoResource.java | 7 +-
.../quarkus/main/CoreMainXmlJaxbResource.java | 5 +-
.../camel/quarkus/main/CoreMainResource.java | 9 +-
integration-tests/master-openshift/pom.xml | 2 -
.../scheme/MessagingComponentSchemeProducer.java | 3 +-
.../component/micrometer/it/MicrometerTest.java | 13 +-
.../it/health/MicroProfileHealthResource.java | 2 +-
.../opentelemetry/it/SpanExporterResource.java | 1 +
.../opentelemetry/it/OpenTelemetryTest.java | 46 +-
integration-tests/pom.xml | 2 +-
.../quarkus/component/rest/it/RestResource.java | 7 -
.../rest/src/main/resources/application.properties | 17 -
.../camel/quarkus/component/rest/it/RestTest.java | 9 -
.../src/test/resources/mappings/oauth2.json | 2 +-
integration-tests/solr/pom.xml | 205 -
.../component/solr/it/SolrCloudResource.java | 45 -
.../component/solr/it/SolrCommonResource.java | 185 -
.../quarkus/component/solr/it/SolrSslResource.java | 42 -
.../component/solr/it/SolrStandaloneResource.java | 41 -
.../camel/quarkus/component/solr/it/bean/Item.java | 47 -
.../solr/src/main/resources/application.properties | 21 -
.../camel/quarkus/component/solr/it/SolrIT.java | 23 -
.../camel/quarkus/component/solr/it/SolrTest.java | 263 -
.../component/solr/it/SolrTestResource.java | 154 -
.../src/test/resources/cloud-docker-compose.yml | 54 -
.../resources/cloud-docker-compose_nonlinux.yml | 58 -
.../solr/src/test/resources/ssl/README.adoc | 6 -
.../solr/src/test/resources/ssl/solr-ssl.der | 22 -
.../src/test/resources/ssl/solr-ssl.keystore.jks | Bin 2659 -> 0 bytes
pom.xml | 20 +-
poms/bom/pom.xml | 85 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 1598 +-
.../src/main/generated/flattened-reduced-pom.xml | 898 +-
.../generated/flattened-reduced-verbose-pom.xml | 998 +-
.../test/junit5/RouteFilterPatternExcludeTest.java | 5 +-
.../RouteFilterPatternIncludeExcludeTest.java | 5 +-
.../test/junit5/RouteFilterPatternIncludeTest.java | 5 +-
.../patterns/SimpleWeaveAddMockLastTest.java | 3 +-
tooling/scripts/test-categories.yaml | 2 +-
146 files changed, 19848 insertions(+), 22294 deletions(-)
delete mode 100644 docs/modules/ROOT/examples/components/solr.yml
delete mode 100644 docs/modules/ROOT/examples/components/vm.yml
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/solr.adoc
delete mode 100644 docs/modules/ROOT/pages/reference/extensions/vm.adoc
delete mode 100644 extensions-jvm/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
delete mode 100644 extensions/groovy-dsl/runtime/src/main/doc/limitations.adoc
rename {extensions-jvm => extensions}/groovy/deployment/pom.xml (87%)
copy extensions/{csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleExpressionSourceBuildItem.java => groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyExpressionSourceBuildItem.java} (64%)
create mode 100644 extensions/groovy/deployment/src/main/java/org/apache/camel/quarkus/component/groovy/deployment/GroovyProcessor.java
rename {extensions-jvm => extensions}/groovy/pom.xml (96%)
rename {extensions-jvm => extensions}/groovy/runtime/pom.xml (90%)
create mode 100644 extensions/groovy/runtime/src/main/doc/limitations.adoc
copy extensions/{csimple/runtime/src/main/java/org/apache/camel/quarkus/component/csimple/CSimpleLanguageRecorder.java => groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyExpressionRecorder.java} (57%)
create mode 100644 extensions/groovy/runtime/src/main/java/org/apache/camel/quarkus/component/groovy/runtime/GroovyStaticScript.java
rename {extensions-jvm => extensions}/groovy/runtime/src/main/resources/META-INF/quarkus-extension.yaml (100%)
delete mode 100644 extensions/solr/deployment/pom.xml
delete mode 100644 extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java
delete mode 100644 extensions/solr/pom.xml
delete mode 100644 extensions/solr/runtime/pom.xml
delete mode 100644 extensions/solr/runtime/src/main/resources/META-INF/quarkus-extension.yaml
delete mode 100644 extensions/vm/deployment/pom.xml
delete mode 100644 extensions/vm/deployment/src/main/java/org/apache/camel/quarkus/component/vm/deployment/VmProcessor.java
delete mode 100644 extensions/vm/pom.xml
delete mode 100644 extensions/vm/runtime/pom.xml
delete mode 100644 extensions/vm/runtime/src/main/resources/META-INF/quarkus-extension.yaml
delete mode 100644 integration-tests-jvm/groovy/pom.xml
copy extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/BuildTimeCamelCatalogBuildItem.java => integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy (57%)
copy integration-tests/{joor => groovy}/pom.xml (91%)
copy integration-tests/{joor/src/main/java/org/apache/camel/quarkus/component/joor/it/JoorBean.java => groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyBean.java} (93%)
rename {integration-tests-jvm => integration-tests}/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyResource.java (73%)
rename {integration-tests-jvm => integration-tests}/groovy/src/main/java/org/apache/camel/quarkus/component/groovy/it/GroovyRoutes.java (63%)
create mode 100644 integration-tests/groovy/src/main/resources/bean.txt
copy integration-test-groups/foundation/bean/src/test/java/org/apache/camel/quarkus/component/bean/EipIT.java => integration-tests/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyIT.java (90%)
rename {integration-tests-jvm => integration-tests}/groovy/src/test/java/org/apache/camel/quarkus/component/groovy/it/GroovyTest.java (55%)
delete mode 100644 integration-tests/rest/src/main/resources/application.properties
delete mode 100644 integration-tests/solr/pom.xml
delete mode 100644 integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrCloudResource.java
delete mode 100644 integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrCommonResource.java
delete mode 100644 integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrSslResource.java
delete mode 100644 integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrStandaloneResource.java
delete mode 100644 integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/bean/Item.java
delete mode 100644 integration-tests/solr/src/main/resources/application.properties
delete mode 100644 integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrIT.java
delete mode 100644 integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTest.java
delete mode 100644 integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTestResource.java
delete mode 100644 integration-tests/solr/src/test/resources/cloud-docker-compose.yml
delete mode 100644 integration-tests/solr/src/test/resources/cloud-docker-compose_nonlinux.yml
delete mode 100644 integration-tests/solr/src/test/resources/ssl/README.adoc
delete mode 100644 integration-tests/solr/src/test/resources/ssl/solr-ssl.der
delete mode 100644 integration-tests/solr/src/test/resources/ssl/solr-ssl.keystore.jks
[camel-quarkus] 02/03: 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 dbcfcc2044ef51501d3150ff5ccbae8f9b67104c
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 3b95543c8e..acfb922dfc 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/splunk.adoc[Splunk]
*** xref:reference/extensions/splunk-hec.adoc[Splunk HEC]
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 26208f8d9d..9cc52ba498 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -215,7 +215,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>splunk</module>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1baa5b4450..ca7d4dbf26 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -203,7 +203,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>splunk</module>
<module>spring-rabbitmq</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 ad928182b8..5d92b9afc7 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5061,7 +5061,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>
@@ -5070,7 +5070,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>
@@ -6256,11 +6256,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 77a7e96f92..b17c3d2d2d 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -4972,6 +4972,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} -->
@@ -6154,6 +6164,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 cf2ce7a641..7b098735ed 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -4972,6 +4972,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>
@@ -6154,6 +6164,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 fcae3e30a4..548fc70915 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -4972,6 +4972,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} -->
@@ -6154,6 +6164,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 6b3cab14c4..5526643855 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
- sql
group-03:
- bean-validator
[camel-quarkus] 03/03: Add workaround for RemoteCacheManager bean discovery #4841
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 38310db47b5a0910af74d3634c429a361b5b459d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Apr 27 11:03:48 2023 +0100
Add workaround for RemoteCacheManager bean discovery #4841
---
.../pages/reference/extensions/infinispan.adoc | 23 +++++++++++++
.../camel/quarkus/core/RuntimeBeanRepository.java | 8 +++++
.../runtime/src/main/doc/configuration.adoc | 23 +++++++++++++
.../infinispan/CamelInfinispanRecorder.java | 39 ++++++++++++++++++++++
.../infinispan/InfinispanQuarkusClientRoutes.java | 7 ++++
5 files changed, 100 insertions(+)
diff --git a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc
index 20cfea3021..15eeabc4a4 100644
--- a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc
@@ -54,6 +54,29 @@ endif::[]
You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you
may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties].
+Note that if you choose to use Quarkus Infinispan configuration properties, you *must* add an injection point for the `RemoteCacheManager` in order for it to be discoverable by the Camel Infinispan component. For example:
+
+[source,java]
+----
+public class Routes extends RouteBuilder {
+ // Injects the default unnamed RemoteCacheManager
+ @Inject
+ RemoteCacheManager cacheManager;
+
+ // If configured, injects an optional named RemoteCacheManager
+ @Inject
+ @InfinispanClientName("myNamedClient")
+ RemoteCacheManager namedCacheManager;
+
+ @Override
+ public void configure() {
+ // Route configuration here...
+ }
+}
+
+----
+
+
[id="extensions-infinispan-configuration-camel-infinispan-infinispanremoteaggregationrepository-in-native-mode"]
=== Camel Infinispan `InfinispanRemoteAggregationRepository` in native mode
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
index cd01044e1b..cfb34569f3 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
@@ -28,6 +28,7 @@ import io.quarkus.arc.Arc;
import io.quarkus.arc.ArcContainer;
import io.smallrye.common.annotation.Identifier;
import jakarta.enterprise.inject.AmbiguousResolutionException;
+import jakarta.enterprise.inject.literal.NamedLiteral;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.spi.BeanRepository;
@@ -73,10 +74,17 @@ public final class RuntimeBeanRepository implements BeanRepository {
private static <T> Optional<T> getReferenceByName(BeanManager manager, String name, Class<T> type) {
Set<Bean<?>> beans = manager.getBeans(name);
+
+ if (beans.isEmpty()) {
+ // Fallback to searching explicitly with NamedLiteral
+ beans = manager.getBeans(type, NamedLiteral.of(name));
+ }
+
if (beans.isEmpty()) {
// Fallback to SmallRye @Identifier
beans = manager.getBeans(type, Identifier.Literal.of(name));
}
+
return Optional.ofNullable(manager.resolve(beans)).map(bean -> getReference(manager, type, bean));
}
diff --git a/extensions/infinispan/runtime/src/main/doc/configuration.adoc b/extensions/infinispan/runtime/src/main/doc/configuration.adoc
index f4bd4fac58..cdc779e832 100644
--- a/extensions/infinispan/runtime/src/main/doc/configuration.adoc
+++ b/extensions/infinispan/runtime/src/main/doc/configuration.adoc
@@ -3,6 +3,29 @@
You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you
may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties].
+Note that if you choose to use Quarkus Infinispan configuration properties, you *must* add an injection point for the `RemoteCacheManager` in order for it to be discoverable by the Camel Infinispan component. For example:
+
+[source,java]
+----
+public class Routes extends RouteBuilder {
+ // Injects the default unnamed RemoteCacheManager
+ @Inject
+ RemoteCacheManager cacheManager;
+
+ // If configured, injects an optional named RemoteCacheManager
+ @Inject
+ @InfinispanClientName("myNamedClient")
+ RemoteCacheManager namedCacheManager;
+
+ @Override
+ public void configure() {
+ // Route configuration here...
+ }
+}
+
+----
+
+
=== Camel Infinispan `InfinispanRemoteAggregationRepository` in native mode
If you chose to use the `InfinispanRemoteAggregationRepository` in native mode, then you must xref:extensions/core.adoc#quarkus.camel.native.reflection.serialization-enabled[enable native serialization support].
diff --git a/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanRecorder.java b/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanRecorder.java
new file mode 100644
index 0000000000..9a53283e1b
--- /dev/null
+++ b/extensions/infinispan/runtime/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanRecorder.java
@@ -0,0 +1,39 @@
+package org.apache.camel.quarkus.component.infinispan;
+
+import java.lang.annotation.Annotation;
+
+import io.quarkus.infinispan.client.InfinispanClientName;
+import io.quarkus.infinispan.client.runtime.InfinispanClientUtil;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.literal.NamedLiteral;
+import org.apache.camel.quarkus.core.CamelBeanQualifierResolver;
+
+@Recorder
+public class CamelInfinispanRecorder {
+
+ public RuntimeValue<CamelBeanQualifierResolver> createInfinispanClientNameQualifierResolver(String clientName) {
+ CamelBeanQualifierResolver resolver = new CamelBeanQualifierResolver() {
+ Annotation[] annotations;
+
+ @Override
+ public Annotation[] resolveQualifiers() {
+ if (clientName.startsWith(InfinispanClientUtil.DEFAULT_INFINISPAN_CLIENT_NAME)) {
+ annotations = new Annotation[] { Default.Literal.INSTANCE };
+ } else {
+ annotations = new Annotation[] { NamedLiteral.of(clientName), InfinispanClientName.Literal.of(clientName) };
+ }
+
+ System.out.println(annotations);
+
+ return annotations;
+ }
+ };
+ return new RuntimeValue<>(resolver);
+ }
+
+ public RuntimeValue<?> createBean() {
+ return new RuntimeValue<>(new Object());
+ }
+}
diff --git a/integration-tests/infinispan-quarkus-client/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientRoutes.java b/integration-tests/infinispan-quarkus-client/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientRoutes.java
index 7f4c291606..4baa067bf7 100644
--- a/integration-tests/infinispan-quarkus-client/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientRoutes.java
+++ b/integration-tests/infinispan-quarkus-client/src/main/java/org/apache/camel/quarkus/component/infinispan/InfinispanQuarkusClientRoutes.java
@@ -18,6 +18,8 @@ package org.apache.camel.quarkus.component.infinispan;
import java.util.Set;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent;
import org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration;
@@ -29,8 +31,13 @@ import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.marshall.ProtoStreamMarshaller;
+@ApplicationScoped
public class InfinispanQuarkusClientRoutes extends InfinispanCommonRoutes {
+ // TODO: This should not be required: https://github.com/apache/camel-quarkus/issues/4841
+ @Inject
+ RemoteCacheManager cacheManager;
+
@Override
protected Configuration getConfigurationBuilder() {
Config config = ConfigProvider.getConfig();
[camel-quarkus] 01/03: 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 36426bcd9aaf2ff2846cf2e6c5dfc92438965b87
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 | 4 ++--
pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++----
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++----
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 56449ea052..afc02f5223 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,11 +30,11 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M3 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.1.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}
- target-maven-version: 3.8.8 # replace ${target-maven-version}
+ target-maven-version: 3.9.1 # replace ${target-maven-version}
# Attributes used in xrefs to other Antora components
cq-camel-components: components
diff --git a/pom.xml b/pom.xml
index 10927276bf..94c8a23900 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.1</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.1.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.1.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -80,7 +80,7 @@
<azure-identity.version>1.8.1</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>
@@ -144,7 +144,7 @@
<reactor-core.version>3.4.27</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>
@@ -223,7 +223,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
- <target-maven-version>3.8.8</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.9.1</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 9e17604dbb..77a7e96f92 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6328,22 +6328,22 @@
<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>bcprov-ext-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 d3a938b8ca..cf2ce7a641 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6308,22 +6308,22 @@
<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>bcprov-ext-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 e7709d7ded..fcae3e30a4 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6308,22 +6308,22 @@
<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>bcprov-ext-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} -->