This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a83783c4532b40e3673d4aa08d2a0529431e315d Author: Zineb Bendhiba <bendhiba.zi...@gmail.com> AuthorDate: Wed Dec 22 16:16:52 2021 +0100 Upgrade to Camel 3.15.0 --- catalog/pom.xml | 13 --- docs/antora.yml | 6 +- .../ROOT/examples/components/atomix-map.yml | 2 +- .../ROOT/examples/components/atomix-messaging.yml | 2 +- .../ROOT/examples/components/atomix-multimap.yml | 2 +- .../ROOT/examples/components/atomix-queue.yml | 2 +- .../ROOT/examples/components/atomix-set.yml | 2 +- .../ROOT/examples/components/atomix-value.yml | 2 +- .../ROOT/examples/components/azure-eventhubs.yml | 2 +- .../examples/components/azure-storage-blob.yml | 2 +- .../examples/components/azure-storage-datalake.yml | 2 +- .../examples/components/azure-storage-queue.yml | 2 +- .../modules/ROOT/examples/components/beanstalk.yml | 2 +- docs/modules/ROOT/examples/components/elsql.yml | 2 +- .../modules/ROOT/examples/components/etcd-keys.yml | 2 +- .../ROOT/examples/components/etcd-stats.yml | 2 +- .../ROOT/examples/components/etcd-watch.yml | 2 +- docs/modules/ROOT/examples/components/ganglia.yml | 2 +- docs/modules/ROOT/examples/components/ipfs.yml | 2 +- docs/modules/ROOT/examples/components/jing.yml | 2 +- .../ROOT/examples/components/json-patch.yml | 2 +- .../ROOT/examples/components/kamelet-reify.yml | 13 --- .../ROOT/examples/components/milo-browse.yml | 13 +++ docs/modules/ROOT/examples/components/msv.yml | 2 +- docs/modules/ROOT/examples/components/nagios.yml | 2 +- docs/modules/ROOT/examples/components/nsq.yml | 2 +- docs/modules/ROOT/examples/components/sip.yml | 2 +- docs/modules/ROOT/examples/components/soroush.yml | 2 +- docs/modules/ROOT/examples/components/yammer.yml | 2 +- .../{avro-jackson.yml => avroJackson.yml} | 2 +- docs/modules/ROOT/examples/dataformats/beanio.yml | 2 +- docs/modules/ROOT/examples/dataformats/bindy.yml | 2 +- .../modules/ROOT/examples/dataformats/fastjson.yml | 13 +++ docs/modules/ROOT/examples/dataformats/gson.yml | 13 +++ .../{gzipdeflater.yml => gzipDeflater.yml} | 2 +- docs/modules/ROOT/examples/dataformats/jackson.yml | 13 +++ .../dataformats/{jacksonxml.yml => jacksonXml.yml} | 4 +- docs/modules/ROOT/examples/dataformats/johnzon.yml | 13 +++ docs/modules/ROOT/examples/dataformats/jsonb.yml | 13 +++ .../{mime-multipart.yml => mimeMultipart.yml} | 2 +- .../{protobuf-jackson.yml => protobufJackson.yml} | 2 +- .../{yaml-snakeyaml.yml => snakeYaml.yml} | 2 +- .../dataformats/{soapjaxb.yml => soap.yml} | 2 +- .../dataformats/{tarfile.yml => tarFile.yml} | 2 +- .../{univocity-csv.yml => univocityCsv.yml} | 2 +- .../{univocity-fixed.yml => univocityFixed.yml} | 2 +- .../{univocity-tsv.yml => univocityTsv.yml} | 2 +- .../dataformats/{secureXML.yml => xmlSecurity.yml} | 2 +- .../ROOT/examples/dataformats/xstreamJson.yml | 13 +++ .../{zipdeflater.yml => zipDeflater.yml} | 4 +- .../dataformats/{zipfile.yml => zipFile.yml} | 2 +- docs/modules/ROOT/nav.adoc | 1 - .../ROOT/pages/reference/extensions/atomix.adoc | 6 +- .../ROOT/pages/reference/extensions/beanio.adoc | 6 +- .../ROOT/pages/reference/extensions/beanstalk.adoc | 6 +- .../ROOT/pages/reference/extensions/elsql.adoc | 6 +- .../ROOT/pages/reference/extensions/etcd.adoc | 6 +- .../ROOT/pages/reference/extensions/fastjson.adoc | 2 +- .../ROOT/pages/reference/extensions/ganglia.adoc | 6 +- .../ROOT/pages/reference/extensions/gson.adoc | 2 +- .../ROOT/pages/reference/extensions/ipfs.adoc | 6 +- .../pages/reference/extensions/jackson-avro.adoc | 2 +- .../reference/extensions/jackson-protobuf.adoc | 2 +- .../ROOT/pages/reference/extensions/jackson.adoc | 2 +- .../pages/reference/extensions/jacksonxml.adoc | 2 +- .../ROOT/pages/reference/extensions/jing.adoc | 6 +- .../ROOT/pages/reference/extensions/johnzon.adoc | 2 +- .../ROOT/pages/reference/extensions/jsonb.adoc | 2 +- .../pages/reference/extensions/kamelet-reify.adoc | 35 ------- .../ROOT/pages/reference/extensions/mail.adoc | 2 +- .../ROOT/pages/reference/extensions/milo.adoc | 1 + .../ROOT/pages/reference/extensions/msv.adoc | 6 +- .../ROOT/pages/reference/extensions/nagios.adoc | 6 +- .../ROOT/pages/reference/extensions/nsq.adoc | 6 +- .../ROOT/pages/reference/extensions/sip.adoc | 6 +- .../ROOT/pages/reference/extensions/snakeyaml.adoc | 2 +- .../ROOT/pages/reference/extensions/soap.adoc | 2 +- .../ROOT/pages/reference/extensions/soroush.adoc | 6 +- .../ROOT/pages/reference/extensions/tarfile.adoc | 2 +- .../reference/extensions/univocity-parsers.adoc | 6 +- .../pages/reference/extensions/xmlsecurity.adoc | 2 +- .../ROOT/pages/reference/extensions/xstream.adoc | 2 +- .../ROOT/pages/reference/extensions/yammer.adoc | 6 +- .../pages/reference/extensions/zip-deflater.adoc | 4 +- .../ROOT/pages/reference/extensions/zipfile.adoc | 2 +- extensions-jvm/kamelet-reify/deployment/pom.xml | 61 ------------ .../reify/deployment/KameletReifyProcessor.java | 46 --------- extensions-jvm/kamelet-reify/pom.xml | 37 ------- extensions-jvm/kamelet-reify/runtime/pom.xml | 110 --------------------- .../main/resources/META-INF/quarkus-extension.yaml | 33 ------- extensions-jvm/pom.xml | 1 - extensions-jvm/spark/bom/pom.xml | 12 +++ extensions/jta/runtime/pom.xml | 6 ++ .../deployment/MicroProfileHealthProcessor.java | 55 +++-------- .../deployment/MicroProfileHealthEnabledTest.java | 15 ++- .../runtime/CamelMicroProfileHealthRecorder.java | 22 +++-- .../component/netty/deployment/NettyProcessor.java | 7 ++ .../rabbitmq/deployment/RabbitmqProcessor.java | 9 +- .../src/main/resources/yaml/routes.yaml | 11 ++- .../component/fastjson/it/FastjsonResource.java | 2 +- integration-tests-jvm/kamelet-reify/pom.xml | 82 --------------- .../kamelet/reify/it/KameletReifyResource.java | 51 ---------- .../kamelet/reify/it/KameletReifyTest.java | 34 ------- integration-tests-jvm/pom.xml | 1 - .../component/dataformat/it/DataformatRoute.java | 4 +- .../dataformats/jackson/xml/JacksonXmlRoute.java | 14 +-- .../dataformats/json/JsonDataformatsRoute.java | 4 +- .../src/main/resources/routes/jackson-routes.xml | 18 ++-- .../quarkus/component/kafka/CamelKafkaRoutes.java | 4 +- .../src/main/resources/routes/my-rests.yaml | 9 +- .../src/main/resources/routes/my-routes.yaml | 11 ++- .../microprofile/it/health/LivenessCheck.java | 1 + .../it/health/MicroProfileHealthResource.java | 12 ++- .../microprofile/it/health/ReadinessCheck.java | 1 + .../it/health/MicroProfileHealthTest.java | 61 ++++++------ .../component/salesforce/SalesforceResource.java | 7 +- .../component/salesforce/SalesforceTest.java | 13 ++- .../quarkus/component/soap/it/SoapRoutes.java | 26 ++--- .../UniVocityFixedWidthDataFormatMarshalRoute.java | 8 +- ...niVocityFixedWidthDataFormatUnmarshalRoute.java | 12 +-- .../xmlsecurity/it/XmlsecurityRoutes.java | 8 +- pom.xml | 6 +- poms/bom/pom.xml | 15 --- 123 files changed, 389 insertions(+), 810 deletions(-) diff --git a/catalog/pom.xml b/catalog/pom.xml index efe9f3e..84ab92d 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -2328,19 +2328,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-kotlin</artifactId> <version>${project.version}</version> <type>pom</type> diff --git a/docs/antora.yml b/docs/antora.yml index 168241c..e352a3d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -29,9 +29,9 @@ asciidoc: min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.4 # replace ${target-maven-version} - camel-version: 3.14.0 # replace ${camel.version} - camel-docs-version: 3.14.x # replace ${camel.docs.components.version} + camel-version: 3.15.0-SNAPSHOT # replace ${camel.version} + camel-docs-version: 3.15.x # replace ${camel.docs.components.version} quarkus-version: 2.7.0.CR1 # replace ${quarkus.version} # attributes used in xrefs to other Antora components - cq-camel-components: 3.14.x@components # replace ${camel.docs.components.xref} + cq-camel-components: 3.15.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest diff --git a/docs/modules/ROOT/examples/components/atomix-map.yml b/docs/modules/ROOT/examples/components/atomix-map.yml index 67564b2..8ef7609 100644 --- a/docs/modules/ROOT/examples/components/atomix-map.yml +++ b/docs/modules/ROOT/examples/components/atomix-map.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-map diff --git a/docs/modules/ROOT/examples/components/atomix-messaging.yml b/docs/modules/ROOT/examples/components/atomix-messaging.yml index 2107063..9df518c 100644 --- a/docs/modules/ROOT/examples/components/atomix-messaging.yml +++ b/docs/modules/ROOT/examples/components/atomix-messaging.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-messaging diff --git a/docs/modules/ROOT/examples/components/atomix-multimap.yml b/docs/modules/ROOT/examples/components/atomix-multimap.yml index 48d0bbf..96258f1 100644 --- a/docs/modules/ROOT/examples/components/atomix-multimap.yml +++ b/docs/modules/ROOT/examples/components/atomix-multimap.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-multimap diff --git a/docs/modules/ROOT/examples/components/atomix-queue.yml b/docs/modules/ROOT/examples/components/atomix-queue.yml index 63e8be7..73d9fd6 100644 --- a/docs/modules/ROOT/examples/components/atomix-queue.yml +++ b/docs/modules/ROOT/examples/components/atomix-queue.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-queue diff --git a/docs/modules/ROOT/examples/components/atomix-set.yml b/docs/modules/ROOT/examples/components/atomix-set.yml index 56c0533..6724793 100644 --- a/docs/modules/ROOT/examples/components/atomix-set.yml +++ b/docs/modules/ROOT/examples/components/atomix-set.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-set diff --git a/docs/modules/ROOT/examples/components/atomix-value.yml b/docs/modules/ROOT/examples/components/atomix-value.yml index 779b40e..f21d33e 100644 --- a/docs/modules/ROOT/examples/components/atomix-value.yml +++ b/docs/modules/ROOT/examples/components/atomix-value.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-atomix cqArtifactIdBase: atomix cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: atomix-value diff --git a/docs/modules/ROOT/examples/components/azure-eventhubs.yml b/docs/modules/ROOT/examples/components/azure-eventhubs.yml index 52f94e8..4d09d2a 100644 --- a/docs/modules/ROOT/examples/components/azure-eventhubs.yml +++ b/docs/modules/ROOT/examples/components/azure-eventhubs.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.7.0 cqNativeSince: 1.7.0 cqCamelPartName: azure-eventhubs cqCamelPartTitle: Azure Event Hubs -cqCamelPartDescription: The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers. +cqCamelPartDescription: Send and receive events to/from Azure Event Hubs using AMQP protocol. cqExtensionPageTitle: Azure Event Hubs diff --git a/docs/modules/ROOT/examples/components/azure-storage-blob.yml b/docs/modules/ROOT/examples/components/azure-storage-blob.yml index dfce732..42cfb5c 100644 --- a/docs/modules/ROOT/examples/components/azure-storage-blob.yml +++ b/docs/modules/ROOT/examples/components/azure-storage-blob.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0 cqNativeSince: 1.6.0 cqCamelPartName: azure-storage-blob cqCamelPartTitle: Azure Storage Blob Service -cqCamelPartDescription: Store and retrieve blobs from Azure Storage Blob Service using SDK v12. +cqCamelPartDescription: Store and retrieve blobs from Azure Storage Blob Service. cqExtensionPageTitle: Azure Storage Blob Service diff --git a/docs/modules/ROOT/examples/components/azure-storage-datalake.yml b/docs/modules/ROOT/examples/components/azure-storage-datalake.yml index c66aa04..a768d99 100644 --- a/docs/modules/ROOT/examples/components/azure-storage-datalake.yml +++ b/docs/modules/ROOT/examples/components/azure-storage-datalake.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.8.0 cqNativeSince: n/a cqCamelPartName: azure-storage-datalake cqCamelPartTitle: Azure Storage Datalake Service -cqCamelPartDescription: Camel Azure Datalake Gen2 Component +cqCamelPartDescription: Sends and receives files to/from Azure DataLake Storage. cqExtensionPageTitle: Azure storage datalake service diff --git a/docs/modules/ROOT/examples/components/azure-storage-queue.yml b/docs/modules/ROOT/examples/components/azure-storage-queue.yml index edb634d..87d5d8e 100644 --- a/docs/modules/ROOT/examples/components/azure-storage-queue.yml +++ b/docs/modules/ROOT/examples/components/azure-storage-queue.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0 cqNativeSince: 1.7.0 cqCamelPartName: azure-storage-queue cqCamelPartTitle: Azure Storage Queue Service -cqCamelPartDescription: The azure-storage-queue component is used for storing and retrieving the messages to/from Azure Storage Queue using Azure SDK v12. +cqCamelPartDescription: Stores and retrieves messages to/from Azure Storage Queue. cqExtensionPageTitle: Azure Storage Queue Service diff --git a/docs/modules/ROOT/examples/components/beanstalk.yml b/docs/modules/ROOT/examples/components/beanstalk.yml index 958aec5..e30d3f1 100644 --- a/docs/modules/ROOT/examples/components/beanstalk.yml +++ b/docs/modules/ROOT/examples/components/beanstalk.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-beanstalk cqArtifactIdBase: beanstalk cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: beanstalk diff --git a/docs/modules/ROOT/examples/components/elsql.yml b/docs/modules/ROOT/examples/components/elsql.yml index 45eb0bf..151dea2 100644 --- a/docs/modules/ROOT/examples/components/elsql.yml +++ b/docs/modules/ROOT/examples/components/elsql.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-elsql cqArtifactIdBase: elsql cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: elsql diff --git a/docs/modules/ROOT/examples/components/etcd-keys.yml b/docs/modules/ROOT/examples/components/etcd-keys.yml index 91d76e2..0d4228d 100644 --- a/docs/modules/ROOT/examples/components/etcd-keys.yml +++ b/docs/modules/ROOT/examples/components/etcd-keys.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-etcd cqArtifactIdBase: etcd cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: etcd-keys diff --git a/docs/modules/ROOT/examples/components/etcd-stats.yml b/docs/modules/ROOT/examples/components/etcd-stats.yml index 79e717a..9a1ed45 100644 --- a/docs/modules/ROOT/examples/components/etcd-stats.yml +++ b/docs/modules/ROOT/examples/components/etcd-stats.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-etcd cqArtifactIdBase: etcd cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: etcd-stats diff --git a/docs/modules/ROOT/examples/components/etcd-watch.yml b/docs/modules/ROOT/examples/components/etcd-watch.yml index da7660f..f296e17 100644 --- a/docs/modules/ROOT/examples/components/etcd-watch.yml +++ b/docs/modules/ROOT/examples/components/etcd-watch.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-etcd cqArtifactIdBase: etcd cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: etcd-watch diff --git a/docs/modules/ROOT/examples/components/ganglia.yml b/docs/modules/ROOT/examples/components/ganglia.yml index 71827a0..085e64b 100644 --- a/docs/modules/ROOT/examples/components/ganglia.yml +++ b/docs/modules/ROOT/examples/components/ganglia.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-ganglia cqArtifactIdBase: ganglia cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: ganglia diff --git a/docs/modules/ROOT/examples/components/ipfs.yml b/docs/modules/ROOT/examples/components/ipfs.yml index 7c895a0..63d1591 100644 --- a/docs/modules/ROOT/examples/components/ipfs.yml +++ b/docs/modules/ROOT/examples/components/ipfs.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-ipfs cqArtifactIdBase: ipfs cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: 1.7.0 cqCamelPartName: ipfs diff --git a/docs/modules/ROOT/examples/components/jing.yml b/docs/modules/ROOT/examples/components/jing.yml index b9a905b..2c16f94 100644 --- a/docs/modules/ROOT/examples/components/jing.yml +++ b/docs/modules/ROOT/examples/components/jing.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-jing cqArtifactIdBase: jing cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: 1.2.0 cqCamelPartName: jing diff --git a/docs/modules/ROOT/examples/components/json-patch.yml b/docs/modules/ROOT/examples/components/json-patch.yml index 603c229..d8dd96f 100644 --- a/docs/modules/ROOT/examples/components/json-patch.yml +++ b/docs/modules/ROOT/examples/components/json-patch.yml @@ -9,5 +9,5 @@ cqJvmSince: 2.7.0 cqNativeSince: n/a cqCamelPartName: json-patch cqCamelPartTitle: JsonPatch -cqCamelPartDescription: JsonPatch component which transform JSON using JSON patch (RFC 6902). +cqCamelPartDescription: Transforms JSON using JSON patch (RFC 6902). cqExtensionPageTitle: JsonPatch diff --git a/docs/modules/ROOT/examples/components/kamelet-reify.yml b/docs/modules/ROOT/examples/components/kamelet-reify.yml deleted file mode 100644 index 67585ce..0000000 --- a/docs/modules/ROOT/examples/components/kamelet-reify.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-kamelet-reify -cqArtifactIdBase: kamelet-reify -cqNativeSupported: false -cqStatus: Preview -cqDeprecated: true -cqJvmSince: 2.0.0 -cqNativeSince: n/a -cqCamelPartName: kamelet-reify -cqCamelPartTitle: Kamelet Reify -cqCamelPartDescription: To call Kamelets (indirectly) -cqExtensionPageTitle: Kamelet Reify diff --git a/docs/modules/ROOT/examples/components/milo-browse.yml b/docs/modules/ROOT/examples/components/milo-browse.yml new file mode 100644 index 0000000..842481c --- /dev/null +++ b/docs/modules/ROOT/examples/components/milo-browse.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-milo +cqArtifactIdBase: milo +cqNativeSupported: false +cqStatus: Preview +cqDeprecated: false +cqJvmSince: 1.1.0 +cqNativeSince: n/a +cqCamelPartName: milo-browse +cqCamelPartTitle: OPC UA Browser +cqCamelPartDescription: Connect to OPC UA servers using the binary protocol for browsing the node tree. +cqExtensionPageTitle: OPC UA Client diff --git a/docs/modules/ROOT/examples/components/msv.yml b/docs/modules/ROOT/examples/components/msv.yml index ef74e68..48e704e 100644 --- a/docs/modules/ROOT/examples/components/msv.yml +++ b/docs/modules/ROOT/examples/components/msv.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-msv cqArtifactIdBase: msv cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: 1.4.0 cqCamelPartName: msv diff --git a/docs/modules/ROOT/examples/components/nagios.yml b/docs/modules/ROOT/examples/components/nagios.yml index 39b28a0..c4bd922 100644 --- a/docs/modules/ROOT/examples/components/nagios.yml +++ b/docs/modules/ROOT/examples/components/nagios.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-nagios cqArtifactIdBase: nagios cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: 1.4.0 cqCamelPartName: nagios diff --git a/docs/modules/ROOT/examples/components/nsq.yml b/docs/modules/ROOT/examples/components/nsq.yml index 7391deb..af00fff 100644 --- a/docs/modules/ROOT/examples/components/nsq.yml +++ b/docs/modules/ROOT/examples/components/nsq.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-nsq cqArtifactIdBase: nsq cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: 1.2.0 cqCamelPartName: nsq diff --git a/docs/modules/ROOT/examples/components/sip.yml b/docs/modules/ROOT/examples/components/sip.yml index 7091d56..5f30d77 100644 --- a/docs/modules/ROOT/examples/components/sip.yml +++ b/docs/modules/ROOT/examples/components/sip.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-sip cqArtifactIdBase: sip cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: sip diff --git a/docs/modules/ROOT/examples/components/soroush.yml b/docs/modules/ROOT/examples/components/soroush.yml index 1df557d..7fa469b 100644 --- a/docs/modules/ROOT/examples/components/soroush.yml +++ b/docs/modules/ROOT/examples/components/soroush.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-soroush cqArtifactIdBase: soroush cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: soroush diff --git a/docs/modules/ROOT/examples/components/yammer.yml b/docs/modules/ROOT/examples/components/yammer.yml index 67e7b81..85fc448 100644 --- a/docs/modules/ROOT/examples/components/yammer.yml +++ b/docs/modules/ROOT/examples/components/yammer.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-yammer cqArtifactIdBase: yammer cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: yammer diff --git a/docs/modules/ROOT/examples/dataformats/avro-jackson.yml b/docs/modules/ROOT/examples/dataformats/avroJackson.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/avro-jackson.yml rename to docs/modules/ROOT/examples/dataformats/avroJackson.yml index f5cf1b4..1490606 100644 --- a/docs/modules/ROOT/examples/dataformats/avro-jackson.yml +++ b/docs/modules/ROOT/examples/dataformats/avroJackson.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 2.0.0 cqNativeSince: 2.0.0 -cqCamelPartName: avro-jackson +cqCamelPartName: avroJackson cqCamelPartTitle: Avro Jackson cqCamelPartDescription: Marshal POJOs to Avro and back using Jackson. cqExtensionPageTitle: Avro Jackson diff --git a/docs/modules/ROOT/examples/dataformats/beanio.yml b/docs/modules/ROOT/examples/dataformats/beanio.yml index f80a772..ff4deef 100644 --- a/docs/modules/ROOT/examples/dataformats/beanio.yml +++ b/docs/modules/ROOT/examples/dataformats/beanio.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-beanio cqArtifactIdBase: beanio cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: beanio diff --git a/docs/modules/ROOT/examples/dataformats/bindy.yml b/docs/modules/ROOT/examples/dataformats/bindy.yml index 8c87981..4189238 100644 --- a/docs/modules/ROOT/examples/dataformats/bindy.yml +++ b/docs/modules/ROOT/examples/dataformats/bindy.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 -cqCamelPartName: bindy-kvp +cqCamelPartName: bindyKvp cqCamelPartTitle: Bindy Key Value Pair cqCamelPartDescription: Marshal and unmarshal between POJOs and key-value pair (KVP) format using Camel Bindy cqExtensionPageTitle: Bindy diff --git a/docs/modules/ROOT/examples/dataformats/fastjson.yml b/docs/modules/ROOT/examples/dataformats/fastjson.yml new file mode 100644 index 0000000..04ae36f --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/fastjson.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-fastjson +cqArtifactIdBase: fastjson +cqNativeSupported: false +cqStatus: Preview +cqDeprecated: false +cqJvmSince: 1.1.0 +cqNativeSince: n/a +cqCamelPartName: fastjson +cqCamelPartTitle: JSON Fastjson +cqCamelPartDescription: Marshal POJOs to JSON and back using Fastjson +cqExtensionPageTitle: JSON Fastjson diff --git a/docs/modules/ROOT/examples/dataformats/gson.yml b/docs/modules/ROOT/examples/dataformats/gson.yml new file mode 100644 index 0000000..7936858 --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/gson.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-gson +cqArtifactIdBase: gson +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 1.0.0 +cqNativeSince: 1.0.0 +cqCamelPartName: gson +cqCamelPartTitle: JSON Gson +cqCamelPartDescription: Marshal POJOs to JSON and back using Gson +cqExtensionPageTitle: Gson diff --git a/docs/modules/ROOT/examples/dataformats/gzipdeflater.yml b/docs/modules/ROOT/examples/dataformats/gzipDeflater.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/gzipdeflater.yml rename to docs/modules/ROOT/examples/dataformats/gzipDeflater.yml index b3c1cc8..e3dff7e 100644 --- a/docs/modules/ROOT/examples/dataformats/gzipdeflater.yml +++ b/docs/modules/ROOT/examples/dataformats/gzipDeflater.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 -cqCamelPartName: gzipdeflater +cqCamelPartName: gzipDeflater cqCamelPartTitle: GZip Deflater cqCamelPartDescription: Compress and decompress messages using java.util.zip.GZIPStream. cqExtensionPageTitle: Zip Deflate Compression diff --git a/docs/modules/ROOT/examples/dataformats/jackson.yml b/docs/modules/ROOT/examples/dataformats/jackson.yml new file mode 100644 index 0000000..42986a8 --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/jackson.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-jackson +cqArtifactIdBase: jackson +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 0.3.0 +cqNativeSince: 0.3.0 +cqCamelPartName: jackson +cqCamelPartTitle: JSON Jackson +cqCamelPartDescription: Marshal POJOs to JSON and back using Jackson +cqExtensionPageTitle: Jackson diff --git a/docs/modules/ROOT/examples/dataformats/jacksonxml.yml b/docs/modules/ROOT/examples/dataformats/jacksonXml.yml similarity index 87% rename from docs/modules/ROOT/examples/dataformats/jacksonxml.yml rename to docs/modules/ROOT/examples/dataformats/jacksonXml.yml index e51472c..b1fe57a 100644 --- a/docs/modules/ROOT/examples/dataformats/jacksonxml.yml +++ b/docs/modules/ROOT/examples/dataformats/jacksonXml.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 -cqCamelPartName: jacksonxml -cqCamelPartTitle: JacksonXML +cqCamelPartName: jacksonXml +cqCamelPartTitle: Jackson XML cqCamelPartDescription: Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson. cqExtensionPageTitle: JacksonXML diff --git a/docs/modules/ROOT/examples/dataformats/johnzon.yml b/docs/modules/ROOT/examples/dataformats/johnzon.yml new file mode 100644 index 0000000..a925ae2 --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/johnzon.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-johnzon +cqArtifactIdBase: johnzon +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 1.0.0 +cqNativeSince: 1.0.0 +cqCamelPartName: johnzon +cqCamelPartTitle: JSON Johnzon +cqCamelPartDescription: Marshal POJOs to JSON and back using Johnzon +cqExtensionPageTitle: Johnzon diff --git a/docs/modules/ROOT/examples/dataformats/jsonb.yml b/docs/modules/ROOT/examples/dataformats/jsonb.yml new file mode 100644 index 0000000..1a44191 --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/jsonb.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-jsonb +cqArtifactIdBase: jsonb +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 1.5.0 +cqNativeSince: 1.5.0 +cqCamelPartName: jsonb +cqCamelPartTitle: JSON JSON-B +cqCamelPartDescription: Marshal POJOs to JSON and back using JSON-B. +cqExtensionPageTitle: JSON-B diff --git a/docs/modules/ROOT/examples/dataformats/mime-multipart.yml b/docs/modules/ROOT/examples/dataformats/mimeMultipart.yml similarity index 92% rename from docs/modules/ROOT/examples/dataformats/mime-multipart.yml rename to docs/modules/ROOT/examples/dataformats/mimeMultipart.yml index 28b79fe..30c065f 100644 --- a/docs/modules/ROOT/examples/dataformats/mime-multipart.yml +++ b/docs/modules/ROOT/examples/dataformats/mimeMultipart.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 0.2.0 cqNativeSince: 0.2.0 -cqCamelPartName: mime-multipart +cqCamelPartName: mimeMultipart cqCamelPartTitle: MIME Multipart cqCamelPartDescription: Marshal Camel messages with attachments into MIME-Multipart messages and back. cqExtensionPageTitle: Mail diff --git a/docs/modules/ROOT/examples/dataformats/protobuf-jackson.yml b/docs/modules/ROOT/examples/dataformats/protobufJackson.yml similarity index 92% rename from docs/modules/ROOT/examples/dataformats/protobuf-jackson.yml rename to docs/modules/ROOT/examples/dataformats/protobufJackson.yml index 39b13ae..4a32fbc 100644 --- a/docs/modules/ROOT/examples/dataformats/protobuf-jackson.yml +++ b/docs/modules/ROOT/examples/dataformats/protobufJackson.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 2.0.0 cqNativeSince: 2.0.0 -cqCamelPartName: protobuf-jackson +cqCamelPartName: protobufJackson cqCamelPartTitle: Protobuf Jackson cqCamelPartDescription: Marshal POJOs to Protobuf and back using Jackson. cqExtensionPageTitle: Protobuf Jackson diff --git a/docs/modules/ROOT/examples/dataformats/yaml-snakeyaml.yml b/docs/modules/ROOT/examples/dataformats/snakeYaml.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/yaml-snakeyaml.yml rename to docs/modules/ROOT/examples/dataformats/snakeYaml.yml index ce3b309..9ec26d3 100644 --- a/docs/modules/ROOT/examples/dataformats/yaml-snakeyaml.yml +++ b/docs/modules/ROOT/examples/dataformats/snakeYaml.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 0.4.0 cqNativeSince: 0.4.0 -cqCamelPartName: yaml-snakeyaml +cqCamelPartName: snakeYaml cqCamelPartTitle: YAML SnakeYAML cqCamelPartDescription: Marshal and unmarshal Java objects to and from YAML using SnakeYAML cqExtensionPageTitle: SnakeYAML diff --git a/docs/modules/ROOT/examples/dataformats/soapjaxb.yml b/docs/modules/ROOT/examples/dataformats/soap.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/soapjaxb.yml rename to docs/modules/ROOT/examples/dataformats/soap.yml index 42ccbcc..851e773 100644 --- a/docs/modules/ROOT/examples/dataformats/soapjaxb.yml +++ b/docs/modules/ROOT/examples/dataformats/soap.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 -cqCamelPartName: soapjaxb +cqCamelPartName: soap cqCamelPartTitle: SOAP cqCamelPartDescription: Marshal Java objects to SOAP messages and back. cqExtensionPageTitle: SOAP dataformat diff --git a/docs/modules/ROOT/examples/dataformats/tarfile.yml b/docs/modules/ROOT/examples/dataformats/tarFile.yml similarity index 94% rename from docs/modules/ROOT/examples/dataformats/tarfile.yml rename to docs/modules/ROOT/examples/dataformats/tarFile.yml index 9950a45..3f25f1f 100644 --- a/docs/modules/ROOT/examples/dataformats/tarfile.yml +++ b/docs/modules/ROOT/examples/dataformats/tarFile.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 0.3.0 cqNativeSince: 0.3.0 -cqCamelPartName: tarfile +cqCamelPartName: tarFile cqCamelPartTitle: Tar File cqCamelPartDescription: Archive files into tarballs or extract files from tarballs. cqExtensionPageTitle: Tar File diff --git a/docs/modules/ROOT/examples/dataformats/univocity-csv.yml b/docs/modules/ROOT/examples/dataformats/univocityCsv.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/univocity-csv.yml rename to docs/modules/ROOT/examples/dataformats/univocityCsv.yml index b829cd3..0f2ac5b 100644 --- a/docs/modules/ROOT/examples/dataformats/univocity-csv.yml +++ b/docs/modules/ROOT/examples/dataformats/univocityCsv.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.1.0 cqNativeSince: 1.2.0 -cqCamelPartName: univocity-csv +cqCamelPartName: univocityCsv cqCamelPartTitle: uniVocity CSV cqCamelPartDescription: Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers. cqExtensionPageTitle: uniVocity CSV diff --git a/docs/modules/ROOT/examples/dataformats/univocity-fixed.yml b/docs/modules/ROOT/examples/dataformats/univocityFixed.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/univocity-fixed.yml rename to docs/modules/ROOT/examples/dataformats/univocityFixed.yml index 1c0caeb..c7406c8 100644 --- a/docs/modules/ROOT/examples/dataformats/univocity-fixed.yml +++ b/docs/modules/ROOT/examples/dataformats/univocityFixed.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.1.0 cqNativeSince: 1.2.0 -cqCamelPartName: univocity-fixed +cqCamelPartName: univocityFixed cqCamelPartTitle: uniVocity Fixed Length cqCamelPartDescription: Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers. cqExtensionPageTitle: uniVocity CSV diff --git a/docs/modules/ROOT/examples/dataformats/univocity-tsv.yml b/docs/modules/ROOT/examples/dataformats/univocityTsv.yml similarity index 94% rename from docs/modules/ROOT/examples/dataformats/univocity-tsv.yml rename to docs/modules/ROOT/examples/dataformats/univocityTsv.yml index deb0ba6..1612494 100644 --- a/docs/modules/ROOT/examples/dataformats/univocity-tsv.yml +++ b/docs/modules/ROOT/examples/dataformats/univocityTsv.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.1.0 cqNativeSince: 1.2.0 -cqCamelPartName: univocity-tsv +cqCamelPartName: univocityTsv cqCamelPartTitle: uniVocity TSV cqCamelPartDescription: Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers. cqExtensionPageTitle: uniVocity CSV diff --git a/docs/modules/ROOT/examples/dataformats/secureXML.yml b/docs/modules/ROOT/examples/dataformats/xmlSecurity.yml similarity index 93% rename from docs/modules/ROOT/examples/dataformats/secureXML.yml rename to docs/modules/ROOT/examples/dataformats/xmlSecurity.yml index a798e77..3c421c9 100644 --- a/docs/modules/ROOT/examples/dataformats/secureXML.yml +++ b/docs/modules/ROOT/examples/dataformats/xmlSecurity.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.1.0 cqNativeSince: 1.7.0 -cqCamelPartName: secureXML +cqCamelPartName: xmlSecurity cqCamelPartTitle: XML Security cqCamelPartDescription: Encrypt and decrypt XML payloads using Apache Santuario. cqExtensionPageTitle: XML Security Sign diff --git a/docs/modules/ROOT/examples/dataformats/xstreamJson.yml b/docs/modules/ROOT/examples/dataformats/xstreamJson.yml new file mode 100644 index 0000000..e520d3c --- /dev/null +++ b/docs/modules/ROOT/examples/dataformats/xstreamJson.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-xstream +cqArtifactIdBase: xstream +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 1.0.0 +cqNativeSince: 1.0.0 +cqCamelPartName: xstreamJson +cqCamelPartTitle: JSON XStream +cqCamelPartDescription: Marshal POJOs to JSON and back using XStream +cqExtensionPageTitle: XStream diff --git a/docs/modules/ROOT/examples/dataformats/zipdeflater.yml b/docs/modules/ROOT/examples/dataformats/zipDeflater.yml similarity index 86% rename from docs/modules/ROOT/examples/dataformats/zipdeflater.yml rename to docs/modules/ROOT/examples/dataformats/zipDeflater.yml index aab95dd..ec6ce3d 100644 --- a/docs/modules/ROOT/examples/dataformats/zipdeflater.yml +++ b/docs/modules/ROOT/examples/dataformats/zipDeflater.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 -cqCamelPartName: zipdeflater -cqCamelPartTitle: Zip Deflate Compression +cqCamelPartName: zipDeflater +cqCamelPartTitle: Zip Deflater cqCamelPartDescription: Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater. cqExtensionPageTitle: Zip Deflate Compression diff --git a/docs/modules/ROOT/examples/dataformats/zipfile.yml b/docs/modules/ROOT/examples/dataformats/zipFile.yml similarity index 94% rename from docs/modules/ROOT/examples/dataformats/zipfile.yml rename to docs/modules/ROOT/examples/dataformats/zipFile.yml index b34e54c..261e497 100644 --- a/docs/modules/ROOT/examples/dataformats/zipfile.yml +++ b/docs/modules/ROOT/examples/dataformats/zipFile.yml @@ -7,7 +7,7 @@ cqStatus: Stable cqDeprecated: false cqJvmSince: 0.2.0 cqNativeSince: 0.2.0 -cqCamelPartName: zipfile +cqCamelPartName: zipFile cqCamelPartTitle: Zip File cqCamelPartDescription: Compression and decompress streams using java.util.zip.ZipStream. cqExtensionPageTitle: Zip File diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 540dde1..e760217 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -191,7 +191,6 @@ *** xref:reference/extensions/json-patch.adoc[JsonPatch] *** xref:reference/extensions/kafka.adoc[Kafka] *** xref:reference/extensions/kamelet.adoc[Kamelet] -*** xref:reference/extensions/kamelet-reify.adoc[Kamelet Reify] *** xref:reference/extensions/kotlin.adoc[Kotlin] *** xref:reference/extensions/kotlin-dsl.adoc[Kotlin DSL] *** xref:reference/extensions/kubernetes.adoc[Kubernetes] diff --git a/docs/modules/ROOT/pages/reference/extensions/atomix.adoc b/docs/modules/ROOT/pages/reference/extensions/atomix.adoc index 774cbe7..21c7e7a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/atomix.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/atomix.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-atomix :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Access Atomix's distributed map. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Access Atomix's distributed map. diff --git a/docs/modules/ROOT/pages/reference/extensions/beanio.adoc b/docs/modules/ROOT/pages/reference/extensions/beanio.adoc index 8e27fab..859402a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/beanio.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/beanio.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-beanio :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats). -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats). diff --git a/docs/modules/ROOT/pages/reference/extensions/beanstalk.adoc b/docs/modules/ROOT/pages/reference/extensions/beanstalk.adoc index 3542aef..f3e22c5 100644 --- a/docs/modules/ROOT/pages/reference/extensions/beanstalk.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/beanstalk.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-beanstalk :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Retrieve and post-process Beanstalk jobs. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Retrieve and post-process Beanstalk jobs. diff --git a/docs/modules/ROOT/pages/reference/extensions/elsql.adoc b/docs/modules/ROOT/pages/reference/extensions/elsql.adoc index d44b600..163f423 100644 --- a/docs/modules/ROOT/pages/reference/extensions/elsql.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/elsql.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-elsql :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Use ElSql to define SQL queries. Extends the SQL Component. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Use ElSql to define SQL queries. Extends the SQL Component. diff --git a/docs/modules/ROOT/pages/reference/extensions/etcd.adoc b/docs/modules/ROOT/pages/reference/extensions/etcd.adoc index d4f16c4..5eecd28 100644 --- a/docs/modules/ROOT/pages/reference/extensions/etcd.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/etcd.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-etcd :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Get, set or delete keys in etcd key-value store. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Get, set or delete keys in etcd key-value store. diff --git a/docs/modules/ROOT/pages/reference/extensions/fastjson.adoc b/docs/modules/ROOT/pages/reference/extensions/fastjson.adoc index 5adc174..df3d07b 100644 --- a/docs/modules/ROOT/pages/reference/extensions/fastjson.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/fastjson.adoc @@ -18,7 +18,7 @@ Marshal POJOs to JSON and back using Fastjson == What's inside -* xref:{cq-camel-components}:dataformats:json-fastjson-dataformat.adoc[JSON Fastjson data format] +* xref:{cq-camel-components}:dataformats:fastjson-dataformat.adoc[JSON Fastjson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/ganglia.adoc b/docs/modules/ROOT/pages/reference/extensions/ganglia.adoc index 3e7eded..1c55de6 100644 --- a/docs/modules/ROOT/pages/reference/extensions/ganglia.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/ganglia.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-ganglia :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Send metrics to Ganglia monitoring system. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send metrics to Ganglia monitoring system. diff --git a/docs/modules/ROOT/pages/reference/extensions/gson.adoc b/docs/modules/ROOT/pages/reference/extensions/gson.adoc index ab98d7c..cd7f437 100644 --- a/docs/modules/ROOT/pages/reference/extensions/gson.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/gson.adoc @@ -19,7 +19,7 @@ Marshal POJOs to JSON and back using Gson == What's inside -* xref:{cq-camel-components}:dataformats:json-gson-dataformat.adoc[JSON Gson data format] +* xref:{cq-camel-components}:dataformats:gson-dataformat.adoc[JSON Gson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/ipfs.adoc b/docs/modules/ROOT/pages/reference/extensions/ipfs.adoc index 737f432..05d7d6b 100644 --- a/docs/modules/ROOT/pages/reference/extensions/ipfs.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/ipfs.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-ipfs :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Access the Interplanetary File System (IPFS). -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: 1.7.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.7.0## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.7.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Access the Interplanetary File System (IPFS). diff --git a/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc b/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc index 753b85d..683e3ee 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc @@ -18,7 +18,7 @@ Marshal POJOs to Avro and back using Jackson. == What's inside -* xref:{cq-camel-components}:dataformats:avro-jackson-dataformat.adoc[Avro Jackson data format] +* xref:{cq-camel-components}:dataformats:avroJackson-dataformat.adoc[Avro Jackson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/jackson-protobuf.adoc b/docs/modules/ROOT/pages/reference/extensions/jackson-protobuf.adoc index 11542c4..7a8a37a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jackson-protobuf.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jackson-protobuf.adoc @@ -18,7 +18,7 @@ Marshal POJOs to Protobuf and back using Jackson. == What's inside -* xref:{cq-camel-components}:dataformats:protobuf-jackson-dataformat.adoc[Protobuf Jackson data format] +* xref:{cq-camel-components}:dataformats:protobufJackson-dataformat.adoc[Protobuf Jackson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/jackson.adoc b/docs/modules/ROOT/pages/reference/extensions/jackson.adoc index 795c22a..d7b0eda 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jackson.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jackson.adoc @@ -19,7 +19,7 @@ Marshal POJOs to JSON and back using Jackson == What's inside -* xref:{cq-camel-components}:dataformats:json-jackson-dataformat.adoc[JSON Jackson data format] +* xref:{cq-camel-components}:dataformats:jackson-dataformat.adoc[JSON Jackson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/jacksonxml.adoc b/docs/modules/ROOT/pages/reference/extensions/jacksonxml.adoc index 54460e5..89f5df0 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jacksonxml.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jacksonxml.adoc @@ -19,7 +19,7 @@ Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson. == What's inside -* xref:{cq-camel-components}:dataformats:jacksonxml-dataformat.adoc[JacksonXML data format] +* xref:{cq-camel-components}:dataformats:jacksonXml-dataformat.adoc[Jackson XML data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/jing.adoc b/docs/modules/ROOT/pages/reference/extensions/jing.adoc index 760e77f..2b647f0 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jing.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jing.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-jing :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Validate XML against a RelaxNG schema (XML Syntax or Compact Syntax) using Jing library. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: 1.2.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.2.0## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.2.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Validate XML against a RelaxNG schema (XML Syntax or Compact Syntax) using Jing library. diff --git a/docs/modules/ROOT/pages/reference/extensions/johnzon.adoc b/docs/modules/ROOT/pages/reference/extensions/johnzon.adoc index 0bfb0c4..2447781 100644 --- a/docs/modules/ROOT/pages/reference/extensions/johnzon.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/johnzon.adoc @@ -19,7 +19,7 @@ Marshal POJOs to JSON and back using Johnzon == What's inside -* xref:{cq-camel-components}:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon data format] +* xref:{cq-camel-components}:dataformats:johnzon-dataformat.adoc[JSON Johnzon data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc b/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc index 7897f62..af90600 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jsonb.adoc @@ -18,7 +18,7 @@ Marshal POJOs to JSON and back using JSON-B. == What's inside -* xref:{cq-camel-components}:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B data format] +* xref:{cq-camel-components}:dataformats:jsonb-dataformat.adoc[JSON JSON-B data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/kamelet-reify.adoc b/docs/modules/ROOT/pages/reference/extensions/kamelet-reify.adoc deleted file mode 100644 index 52cfb34..0000000 --- a/docs/modules/ROOT/pages/reference/extensions/kamelet-reify.adoc +++ /dev/null @@ -1,35 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= Kamelet Reify -:linkattrs: -:cq-artifact-id: camel-quarkus-kamelet-reify -:cq-native-supported: false -:cq-status: Preview -:cq-status-deprecation: Preview Deprecated -:cq-description: To call Kamelets (indirectly) -:cq-deprecated: true -:cq-jvm-since: 2.0.0 -:cq-native-since: n/a - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## - -To call Kamelets (indirectly) - -== What's inside - -* xref:{cq-camel-components}::kamelet-reify-component.adoc[Kamelet Reify component], URI syntax: `kamelet-reify:delegateUri` - -Please refer to the above link for usage and configuration details. - -== Maven coordinates - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify</artifactId> -</dependency> ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. diff --git a/docs/modules/ROOT/pages/reference/extensions/mail.adoc b/docs/modules/ROOT/pages/reference/extensions/mail.adoc index 81c8cda..9a9ed91 100644 --- a/docs/modules/ROOT/pages/reference/extensions/mail.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/mail.adoc @@ -21,7 +21,7 @@ Send and receive emails using imap, pop3 and smtp protocols. Marshal Camel messa * xref:{cq-camel-components}::mail-component.adoc[IMAP component], URI syntax: `imap:host:port` * xref:{cq-camel-components}::mail-component.adoc[IMAPS (Secure) component], URI syntax: `imaps:host:port` -* xref:{cq-camel-components}:dataformats:mime-multipart-dataformat.adoc[MIME Multipart data format] +* xref:{cq-camel-components}:dataformats:mimeMultipart-dataformat.adoc[MIME Multipart data format] * xref:{cq-camel-components}::mail-component.adoc[POP3 component], URI syntax: `pop3:host:port` * xref:{cq-camel-components}::mail-component.adoc[POP3S component], URI syntax: `pop3s:host:port` * xref:{cq-camel-components}::mail-component.adoc[SMTP component], URI syntax: `smtp:host:port` diff --git a/docs/modules/ROOT/pages/reference/extensions/milo.adoc b/docs/modules/ROOT/pages/reference/extensions/milo.adoc index def02e3..2628289 100644 --- a/docs/modules/ROOT/pages/reference/extensions/milo.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/milo.adoc @@ -18,6 +18,7 @@ Connect to OPC UA servers using the binary protocol for acquiring telemetry data == What's inside +* xref:{cq-camel-components}::milo-browse-component.adoc[OPC UA Browser component], URI syntax: `milo-browse:endpointUri` * xref:{cq-camel-components}::milo-client-component.adoc[OPC UA Client component], URI syntax: `milo-client:endpointUri` * xref:{cq-camel-components}::milo-server-component.adoc[OPC UA Server component], URI syntax: `milo-server:itemId` diff --git a/docs/modules/ROOT/pages/reference/extensions/msv.adoc b/docs/modules/ROOT/pages/reference/extensions/msv.adoc index 7c6a8b6..1d66692 100644 --- a/docs/modules/ROOT/pages/reference/extensions/msv.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/msv.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-msv :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Validate XML payloads using Multi-Schema Validator (MSV). -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: 1.4.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.4.0## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.4.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Validate XML payloads using Multi-Schema Validator (MSV). diff --git a/docs/modules/ROOT/pages/reference/extensions/nagios.adoc b/docs/modules/ROOT/pages/reference/extensions/nagios.adoc index 72b6a8b..9ac61ce 100644 --- a/docs/modules/ROOT/pages/reference/extensions/nagios.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/nagios.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-nagios :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Send passive checks to Nagios using JSendNSCA. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: 1.4.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.4.0## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.4.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send passive checks to Nagios using JSendNSCA. diff --git a/docs/modules/ROOT/pages/reference/extensions/nsq.adoc b/docs/modules/ROOT/pages/reference/extensions/nsq.adoc index d9b5a7b..561e05a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/nsq.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/nsq.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-nsq :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Send and receive messages from NSQ realtime distributed messaging platform. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: 1.2.0 [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.2.0## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.2.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send and receive messages from NSQ realtime distributed messaging platform. diff --git a/docs/modules/ROOT/pages/reference/extensions/sip.adoc b/docs/modules/ROOT/pages/reference/extensions/sip.adoc index 7ef61d6..3b908b6 100644 --- a/docs/modules/ROOT/pages/reference/extensions/sip.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/sip.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-sip :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Send and receive messages using the SIP protocol (used in telecommunications). -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send and receive messages using the SIP protocol (used in telecommunications). diff --git a/docs/modules/ROOT/pages/reference/extensions/snakeyaml.adoc b/docs/modules/ROOT/pages/reference/extensions/snakeyaml.adoc index a4a18bc..9398114 100644 --- a/docs/modules/ROOT/pages/reference/extensions/snakeyaml.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/snakeyaml.adoc @@ -19,7 +19,7 @@ Marshal and unmarshal Java objects to and from YAML using SnakeYAML == What's inside -* xref:{cq-camel-components}:dataformats:yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML data format] +* xref:{cq-camel-components}:dataformats:snakeYaml-dataformat.adoc[YAML SnakeYAML data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/soap.adoc b/docs/modules/ROOT/pages/reference/extensions/soap.adoc index f8bbf0c..c06ddf3 100644 --- a/docs/modules/ROOT/pages/reference/extensions/soap.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/soap.adoc @@ -19,7 +19,7 @@ Marshal Java objects to SOAP messages and back. == What's inside -* xref:{cq-camel-components}:dataformats:soapjaxb-dataformat.adoc[SOAP data format] +* xref:{cq-camel-components}:dataformats:soap-dataformat.adoc[SOAP data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/soroush.adoc b/docs/modules/ROOT/pages/reference/extensions/soroush.adoc index f149cf9..1354d85 100644 --- a/docs/modules/ROOT/pages/reference/extensions/soroush.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/soroush.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-soroush :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Send and receive messages as a Soroush chat bot. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Send and receive messages as a Soroush chat bot. diff --git a/docs/modules/ROOT/pages/reference/extensions/tarfile.adoc b/docs/modules/ROOT/pages/reference/extensions/tarfile.adoc index 0920cef..7f452e2 100644 --- a/docs/modules/ROOT/pages/reference/extensions/tarfile.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/tarfile.adoc @@ -19,7 +19,7 @@ Archive files into tarballs or extract files from tarballs. == What's inside -* xref:{cq-camel-components}:dataformats:tarfile-dataformat.adoc[Tar File data format] +* xref:{cq-camel-components}:dataformats:tarFile-dataformat.adoc[Tar File data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/univocity-parsers.adoc b/docs/modules/ROOT/pages/reference/extensions/univocity-parsers.adoc index 11faaac..991bcf8 100644 --- a/docs/modules/ROOT/pages/reference/extensions/univocity-parsers.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/univocity-parsers.adoc @@ -18,9 +18,9 @@ Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) usin == What's inside -* xref:{cq-camel-components}:dataformats:univocity-csv-dataformat.adoc[uniVocity CSV data format] -* xref:{cq-camel-components}:dataformats:univocity-fixed-dataformat.adoc[uniVocity Fixed Length data format] -* xref:{cq-camel-components}:dataformats:univocity-tsv-dataformat.adoc[uniVocity TSV data format] +* xref:{cq-camel-components}:dataformats:univocityCsv-dataformat.adoc[uniVocity CSV data format] +* xref:{cq-camel-components}:dataformats:univocityFixed-dataformat.adoc[uniVocity Fixed Length data format] +* xref:{cq-camel-components}:dataformats:univocityTsv-dataformat.adoc[uniVocity TSV data format] Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/xmlsecurity.adoc b/docs/modules/ROOT/pages/reference/extensions/xmlsecurity.adoc index fbe5a86..b341e5d 100644 --- a/docs/modules/ROOT/pages/reference/extensions/xmlsecurity.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/xmlsecurity.adoc @@ -18,7 +18,7 @@ Sign XML payloads using the XML signature specification. == What's inside -* xref:{cq-camel-components}:dataformats:secureXML-dataformat.adoc[XML Security data format] +* xref:{cq-camel-components}:dataformats:xmlSecurity-dataformat.adoc[XML Security data format] * xref:{cq-camel-components}::xmlsecurity-sign-component.adoc[XML Security Sign component], URI syntax: `xmlsecurity-sign:name` * xref:{cq-camel-components}::xmlsecurity-verify-component.adoc[XML Security Verify component], URI syntax: `xmlsecurity-verify:name` diff --git a/docs/modules/ROOT/pages/reference/extensions/xstream.adoc b/docs/modules/ROOT/pages/reference/extensions/xstream.adoc index 4a45c69..5ff6b89 100644 --- a/docs/modules/ROOT/pages/reference/extensions/xstream.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/xstream.adoc @@ -19,7 +19,7 @@ Marshal and unmarshal POJOs to/from XML or JSON using XStream library. == What's inside -* xref:{cq-camel-components}:dataformats:json-xstream-dataformat.adoc[JSON XStream data format] +* xref:{cq-camel-components}:dataformats:xstreamJson-dataformat.adoc[JSON XStream data format] * xref:{cq-camel-components}:dataformats:xstream-dataformat.adoc[XStream data format] Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/yammer.adoc b/docs/modules/ROOT/pages/reference/extensions/yammer.adoc index 06b67c3..64626e0 100644 --- a/docs/modules/ROOT/pages/reference/extensions/yammer.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/yammer.adoc @@ -5,14 +5,14 @@ :cq-artifact-id: camel-quarkus-yammer :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Interact with the Yammer enterprise social network. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.1.0 :cq-native-since: n/a [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## Interact with the Yammer enterprise social network. diff --git a/docs/modules/ROOT/pages/reference/extensions/zip-deflater.adoc b/docs/modules/ROOT/pages/reference/extensions/zip-deflater.adoc index 2f84a6b..d1af705 100644 --- a/docs/modules/ROOT/pages/reference/extensions/zip-deflater.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/zip-deflater.adoc @@ -19,8 +19,8 @@ Compress and decompress streams using java.util.zip.Deflater, java.util.zip.Infl == What's inside -* xref:{cq-camel-components}:dataformats:gzipdeflater-dataformat.adoc[GZip Deflater data format] -* xref:{cq-camel-components}:dataformats:zipdeflater-dataformat.adoc[Zip Deflate Compression data format] +* xref:{cq-camel-components}:dataformats:gzipDeflater-dataformat.adoc[GZip Deflater data format] +* xref:{cq-camel-components}:dataformats:zipDeflater-dataformat.adoc[Zip Deflater data format] Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/zipfile.adoc b/docs/modules/ROOT/pages/reference/extensions/zipfile.adoc index 3ee690a..90bd227 100644 --- a/docs/modules/ROOT/pages/reference/extensions/zipfile.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/zipfile.adoc @@ -19,7 +19,7 @@ Compression and decompress streams using java.util.zip.ZipStream. == What's inside -* xref:{cq-camel-components}:dataformats:zipfile-dataformat.adoc[Zip File data format] +* xref:{cq-camel-components}:dataformats:zipFile-dataformat.adoc[Zip File data format] Please refer to the above link for usage and configuration details. diff --git a/extensions-jvm/kamelet-reify/deployment/pom.xml b/extensions-jvm/kamelet-reify/deployment/pom.xml deleted file mode 100644 index 218fe76..0000000 --- a/extensions-jvm/kamelet-reify/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify-parent</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-kamelet-reify-deployment</artifactId> - <name>Camel Quarkus :: Kamelet Reify :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions-jvm/kamelet-reify/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/deployment/KameletReifyProcessor.java b/extensions-jvm/kamelet-reify/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/deployment/KameletReifyProcessor.java deleted file mode 100644 index 5293266..0000000 --- a/extensions-jvm/kamelet-reify/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/deployment/KameletReifyProcessor.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.kamelet.reify.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.pkg.steps.NativeBuild; -import org.apache.camel.quarkus.core.JvmOnlyRecorder; -import org.jboss.logging.Logger; - -class KameletReifyProcessor { - - private static final Logger LOG = Logger.getLogger(KameletReifyProcessor.class); - private static final String FEATURE = "camel-kamelet-reify"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - /** - * Remove this once this extension starts supporting the native mode. - */ - @BuildStep(onlyIf = NativeBuild.class) - @Record(value = ExecutionTime.RUNTIME_INIT) - void warnJvmInNative(JvmOnlyRecorder recorder) { - JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time - recorder.warnJvmInNative(FEATURE); // warn at runtime - } -} diff --git a/extensions-jvm/kamelet-reify/pom.xml b/extensions-jvm/kamelet-reify/pom.xml deleted file mode 100644 index b7250e7..0000000 --- a/extensions-jvm/kamelet-reify/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-extensions-jvm</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-kamelet-reify-parent</artifactId> - <name>Camel Quarkus :: Kamelet Reify</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> -</project> diff --git a/extensions-jvm/kamelet-reify/runtime/pom.xml b/extensions-jvm/kamelet-reify/runtime/pom.xml deleted file mode 100644 index c1d069f..0000000 --- a/extensions-jvm/kamelet-reify/runtime/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify-parent</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-kamelet-reify</artifactId> - <name>Camel Quarkus :: Kamelet Reify :: Runtime</name> - <description>To call Kamelets (indirectly)</description> - - <properties> - <camel.quarkus.jvmSince>2.0.0</camel.quarkus.jvmSince> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-kamelet-reify</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-bootstrap-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - - - <profiles> - <profile> - <id>full</id> - <activation> - <property> - <name>!quickly</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-maven-plugin</artifactId> - <executions> - <execution> - <id>update-extension-doc-page</id> - <goals> - <goal>update-extension-doc-page</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/extensions-jvm/kamelet-reify/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/kamelet-reify/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 3e0c672..0000000 --- a/extensions-jvm/kamelet-reify/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Kamelet Reify" -description: "To call Kamelets (indirectly)" -metadata: - unlisted: true - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/kamelet-reify.html" - categories: - - "integration" - status: - - "preview" - - "deprecated" \ No newline at end of file diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml index 077362d..0e1c1f0 100644 --- a/extensions-jvm/pom.xml +++ b/extensions-jvm/pom.xml @@ -90,7 +90,6 @@ <module>json-patch</module> <module>jsonapi</module> <module>jt400</module> - <module>kamelet-reify</module> <module>kotlin-dsl</module> <module>ldap</module> <module>ldif</module> diff --git a/extensions-jvm/spark/bom/pom.xml b/extensions-jvm/spark/bom/pom.xml index 97127e2..b8984b2 100644 --- a/extensions-jvm/spark/bom/pom.xml +++ b/extensions-jvm/spark/bom/pom.xml @@ -40,6 +40,10 @@ <version>${camel.version}</version> <exclusions> <exclusion> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + </exclusion> + <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> @@ -59,6 +63,14 @@ <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.yetus</groupId> + <artifactId>audience-annotations</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/extensions/jta/runtime/pom.xml b/extensions/jta/runtime/pom.xml index 5946b0a..9112925 100644 --- a/extensions/jta/runtime/pom.xml +++ b/extensions/jta/runtime/pom.xml @@ -55,6 +55,12 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jta</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.quarkus</groupId> diff --git a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java index 351c9eb..9718884 100644 --- a/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java +++ b/extensions/microprofile-health/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthProcessor.java @@ -22,10 +22,6 @@ import java.util.List; import java.util.function.BooleanSupplier; import java.util.function.Predicate; -import javax.enterprise.inject.Vetoed; - -import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; -import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; @@ -39,19 +35,17 @@ import org.apache.camel.impl.health.ConsumersHealthCheckRepository; import org.apache.camel.impl.health.ContextHealthCheck; import org.apache.camel.impl.health.HealthCheckRegistryRepository; import org.apache.camel.impl.health.RoutesHealthCheckRepository; -import org.apache.camel.microprofile.health.AbstractCamelMicroProfileHealthCheck; import org.apache.camel.quarkus.component.microprofile.health.runtime.CamelMicroProfileHealthConfig; import org.apache.camel.quarkus.component.microprofile.health.runtime.CamelMicroProfileHealthRecorder; +import org.apache.camel.quarkus.core.deployment.main.spi.CamelMainEnabled; import org.apache.camel.quarkus.core.deployment.spi.CamelBeanBuildItem; +import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem; +import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination; +import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem; import org.apache.camel.quarkus.core.deployment.util.CamelSupport; import org.apache.camel.util.ObjectHelper; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; -import org.eclipse.microprofile.health.Liveness; -import org.eclipse.microprofile.health.Readiness; -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.AnnotationTarget; -import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -61,9 +55,6 @@ class MicroProfileHealthProcessor { private static final DotName CAMEL_HEALTH_CHECK_DOTNAME = DotName.createSimple(HealthCheck.class.getName()); private static final DotName CAMEL_HEALTH_CHECK_REPOSITORY_DOTNAME = DotName .createSimple(HealthCheckRepository.class.getName()); - private static final DotName MICROPROFILE_LIVENESS_DOTNAME = DotName.createSimple(Liveness.class.getName()); - private static final DotName MICROPROFILE_READINESS_DOTNAME = DotName.createSimple(Readiness.class.getName()); - private static final DotName VETOED_DOTNAME = DotName.createSimple(Vetoed.class.getName()); private static final String FEATURE = "camel-microprofile-health"; static final class HealthEnabled implements BooleanSupplier { @@ -99,13 +90,17 @@ class MicroProfileHealthProcessor { return new FeatureBuildItem(FEATURE); } - @Record(ExecutionTime.STATIC_INIT) + @BuildStep(onlyIf = { CamelMainEnabled.class, HealthEnabled.class }) + CamelServicePatternBuildItem excludeDefaultHealthCheckRegistry() { + // Prevent camel main from overwriting the HealthCheckRegistry configured by this extension + return new CamelServicePatternBuildItem(CamelServiceDestination.DISCOVERY, false, + "META-INF/services/org/apache/camel/" + HealthCheckRegistry.FACTORY); + } + @BuildStep(onlyIf = { HealthEnabled.class, HealthRegistryEnabled.class }) - CamelBeanBuildItem healthCheckRegistry(CamelMicroProfileHealthRecorder recorder, CamelMicroProfileHealthConfig config) { - return new CamelBeanBuildItem( - "HealthCheckRegistry", - HealthCheckRegistry.class.getName(), - recorder.createHealthCheckRegistry(config)); + @Record(ExecutionTime.STATIC_INIT) + CamelContextCustomizerBuildItem customizeHealthCheckRegistry(CamelMicroProfileHealthRecorder recorder) { + return new CamelContextCustomizerBuildItem(recorder.createHealthCheckRegistry()); } @BuildStep(onlyIf = HealthEnabled.class) @@ -160,28 +155,6 @@ class MicroProfileHealthProcessor { return buildItems; } - @BuildStep(onlyIfNot = HealthEnabled.class) - void disableCamelMicroProfileHealthChecks(BuildProducer<AnnotationsTransformerBuildItem> transformers) { - // Veto the Camel MicroProfile checks to disable them - transformers.produce(new AnnotationsTransformerBuildItem(context -> { - if (context.isClass()) { - AnnotationTarget target = context.getTarget(); - if (isCamelMicroProfileHealthCheck(target.asClass())) { - AnnotationInstance annotationInstance = AnnotationInstance.create(VETOED_DOTNAME, target, - new AnnotationValue[0]); - context.transform().add(annotationInstance).done(); - } - } - })); - } - - private boolean isCamelMicroProfileHealthCheck(ClassInfo classInfo) { - String className = classInfo.name().toString(); - return className.startsWith(AbstractCamelMicroProfileHealthCheck.class.getPackage().getName()) - && (classInfo.classAnnotation(MICROPROFILE_LIVENESS_DOTNAME) != null - || classInfo.classAnnotation(MICROPROFILE_READINESS_DOTNAME) != null); - } - private CamelBeanBuildItem createHealthCamelBeanBuildItem(ClassInfo classInfo) { String beanName; String className = classInfo.name().toString(); diff --git a/extensions/microprofile-health/deployment/src/test/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthEnabledTest.java b/extensions/microprofile-health/deployment/src/test/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthEnabledTest.java index c46e047..cbd278d 100644 --- a/extensions/microprofile-health/deployment/src/test/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthEnabledTest.java +++ b/extensions/microprofile-health/deployment/src/test/java/org/apache/camel/quarkus/component/microprofile/health/deployment/MicroProfileHealthEnabledTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.component.microprofile.health.deployment; -import java.util.Set; - import javax.inject.Inject; import io.quarkus.test.QuarkusUnitTest; @@ -25,8 +23,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.impl.health.ConsumersHealthCheckRepository; import org.apache.camel.impl.health.ContextHealthCheck; -import org.apache.camel.impl.health.DefaultHealthCheckRegistry; import org.apache.camel.impl.health.RoutesHealthCheckRepository; +import org.apache.camel.microprofile.health.CamelMicroProfileHealthCheckRegistry; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -46,12 +44,11 @@ public class MicroProfileHealthEnabledTest { CamelContext context; @Test - public void healthCheckRegistryBeanNotNull() { - Set<HealthCheckRegistry> registries = context.getRegistry().findByType(HealthCheckRegistry.class); - assertEquals(1, registries.size()); - - HealthCheckRegistry registry = registries.iterator().next(); - assertTrue(registry instanceof DefaultHealthCheckRegistry); + public void healthCheckRegistryNotNull() { + HealthCheckRegistry registry = HealthCheckRegistry.get(context); + assertNotNull(registry); + assertTrue(registry instanceof CamelMicroProfileHealthCheckRegistry); + assertEquals("camel-microprofile-health", registry.getId()); } @Test diff --git a/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java b/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java index 01d546f..e33777b 100644 --- a/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java +++ b/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java @@ -18,17 +18,25 @@ package org.apache.camel.quarkus.component.microprofile.health.runtime; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; +import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheckRegistry; -import org.apache.camel.impl.health.DefaultHealthCheckRegistry; +import org.apache.camel.microprofile.health.CamelMicroProfileHealthCheckRegistry; +import org.apache.camel.spi.CamelContextCustomizer; @Recorder public class CamelMicroProfileHealthRecorder { - public RuntimeValue<HealthCheckRegistry> createHealthCheckRegistry(CamelMicroProfileHealthConfig config) { - HealthCheckRegistry answer = new DefaultHealthCheckRegistry(); - answer.setId("camel-microprofile-health"); - answer.setEnabled(config.enabled); - return new RuntimeValue<>(answer); - } + public RuntimeValue<CamelContextCustomizer> createHealthCheckRegistry() { + + return new RuntimeValue<>(new CamelContextCustomizer() { + @Override + public void configure(CamelContext camelContext) { + HealthCheckRegistry registry = new CamelMicroProfileHealthCheckRegistry(camelContext); + registry.setId("camel-microprofile-health"); + registry.setEnabled(true); + camelContext.setExtension(HealthCheckRegistry.class, registry); + } + }); + } } diff --git a/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java index 0c6afba..2247b9a 100644 --- a/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java +++ b/extensions/netty/deployment/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java @@ -18,7 +18,9 @@ package org.apache.camel.quarkus.component.netty.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CamelSerializationBuildItem; +import org.apache.commons.pool2.impl.DefaultEvictionPolicy; class NettyProcessor { @@ -33,4 +35,9 @@ class NettyProcessor { CamelSerializationBuildItem serialization() { return new CamelSerializationBuildItem(); } + + @BuildStep + ReflectiveClassBuildItem registerForReflection() { + return new ReflectiveClassBuildItem(true, false, false, DefaultEvictionPolicy.class.getName()); + } } diff --git a/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java b/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java index aaab1dc..daadef7 100644 --- a/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java +++ b/extensions/rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/rabbitmq/deployment/RabbitmqProcessor.java @@ -18,11 +18,10 @@ package org.apache.camel.quarkus.component.rabbitmq.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -import org.jboss.logging.Logger; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import org.apache.commons.pool2.impl.DefaultEvictionPolicy; class RabbitmqProcessor { - private static final Logger LOG = Logger.getLogger(RabbitmqProcessor.class); - private static final String FEATURE = "camel-rabbitmq"; @BuildStep @@ -30,4 +29,8 @@ class RabbitmqProcessor { return new FeatureBuildItem(FEATURE); } + @BuildStep + ReflectiveClassBuildItem registerForReflection() { + return new ReflectiveClassBuildItem(true, false, false, DefaultEvictionPolicy.class.getName()); + } } diff --git a/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml b/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml index 6e5418f..fd4dc34 100644 --- a/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml +++ b/integration-test-groups/foundation/route-configurations/src/main/resources/yaml/routes.yaml @@ -17,8 +17,9 @@ - route: route-configuration-id: "xmlRouteConfiguration" - from: "direct:yamlRoute" - steps: - - throw-exception: - exception-type: "org.apache.camel.quarkus.core.it.routeconfigurations.RouteConfigurationsException" - message: "Intentional exception to trigger onException in xmlRouteConfiguration" \ No newline at end of file + from: + uri: "direct:yamlRoute" + steps: + - throw-exception: + exception-type: "org.apache.camel.quarkus.core.it.routeconfigurations.RouteConfigurationsException" + message: "Intentional exception to trigger onException in xmlRouteConfiguration" \ No newline at end of file diff --git a/integration-tests-jvm/fastjson/src/main/java/org/apache/camel/quarkus/component/fastjson/it/FastjsonResource.java b/integration-tests-jvm/fastjson/src/main/java/org/apache/camel/quarkus/component/fastjson/it/FastjsonResource.java index 14275b0..ab8fcf9 100644 --- a/integration-tests-jvm/fastjson/src/main/java/org/apache/camel/quarkus/component/fastjson/it/FastjsonResource.java +++ b/integration-tests-jvm/fastjson/src/main/java/org/apache/camel/quarkus/component/fastjson/it/FastjsonResource.java @@ -33,7 +33,7 @@ public class FastjsonResource { private static final Logger LOG = Logger.getLogger(FastjsonResource.class); - private static final String DATAFORMAT_JSON_FASTJSON = "json-fastjson"; + private static final String DATAFORMAT_JSON_FASTJSON = "fastjson"; @Inject CamelContext context; diff --git a/integration-tests-jvm/kamelet-reify/pom.xml b/integration-tests-jvm/kamelet-reify/pom.xml deleted file mode 100644 index e300b48..0000000 --- a/integration-tests-jvm/kamelet-reify/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-build-parent-it</artifactId> - <version>2.7.0-SNAPSHOT</version> - <relativePath>../../poms/build-parent-it/pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-kamelet-reify</artifactId> - <name>Camel Quarkus :: Integration Tests :: Kamelet Reify</name> - <description>Integration tests for Camel Quarkus Kamelet Reify extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>virtualDependencies</id> - <activation> - <property> - <name>!noVirtualDependencies</name> - </property> - </activation> - <dependencies> - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - </profiles> -</project> diff --git a/integration-tests-jvm/kamelet-reify/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyResource.java b/integration-tests-jvm/kamelet-reify/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyResource.java deleted file mode 100644 index 41f67c1..0000000 --- a/integration-tests-jvm/kamelet-reify/src/main/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyResource.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.kamelet.reify.it; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import org.apache.camel.CamelContext; -import org.jboss.logging.Logger; - -@Path("/kamelet-reify") -@ApplicationScoped -public class KameletReifyResource { - - private static final Logger LOG = Logger.getLogger(KameletReifyResource.class); - - private static final String COMPONENT_KAMELET_REIFY = "kamelet-reify"; - @Inject - CamelContext context; - - @Path("/load/component/kamelet-reify") - @GET - @Produces(MediaType.TEXT_PLAIN) - public Response loadComponentKameletReify() throws Exception { - /* This is an autogenerated test */ - if (context.getComponent(COMPONENT_KAMELET_REIFY) != null) { - return Response.ok().build(); - } - LOG.warnf("Could not load [%s] from the Camel context", COMPONENT_KAMELET_REIFY); - return Response.status(500, COMPONENT_KAMELET_REIFY + " could not be loaded from the Camel context").build(); - } -} diff --git a/integration-tests-jvm/kamelet-reify/src/test/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyTest.java b/integration-tests-jvm/kamelet-reify/src/test/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyTest.java deleted file mode 100644 index 5b1cd62..0000000 --- a/integration-tests-jvm/kamelet-reify/src/test/java/org/apache/camel/quarkus/component/kamelet/reify/it/KameletReifyTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.kamelet.reify.it; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class KameletReifyTest { - - @Test - public void loadComponentKameletReify() { - /* A simple autogenerated test */ - RestAssured.get("/kamelet-reify/load/component/kamelet-reify") - .then() - .statusCode(200); - } - -} diff --git a/integration-tests-jvm/pom.xml b/integration-tests-jvm/pom.xml index 6f26e22..54d904c 100644 --- a/integration-tests-jvm/pom.xml +++ b/integration-tests-jvm/pom.xml @@ -88,7 +88,6 @@ <module>json-patch</module> <module>jsonapi</module> <module>jt400</module> - <module>kamelet-reify</module> <module>kotlin-dsl</module> <module>ldap</module> <module>ldif</module> diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/DataformatRoute.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/DataformatRoute.java index df0a9d0..de4aeb8 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/DataformatRoute.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/DataformatRoute.java @@ -25,10 +25,10 @@ public class DataformatRoute extends RouteBuilder { @Override public void configure() throws Exception { from("direct:snakeyaml-dataformat-component-marshal") - .to("dataformat:yaml-snakeyaml:marshal"); + .to("dataformat:snakeYaml:marshal"); from("direct:snakeyaml-dataformat-component-unmarshal") - .to("dataformat:yaml-snakeyaml:unmarshal?unmarshalType=org.apache.camel.quarkus.component.dataformat.it.model.TestPojo"); + .to("dataformat:snakeYaml:unmarshal?unmarshalType=org.apache.camel.quarkus.component.dataformat.it.model.TestPojo"); from("direct:snakeyaml-dsl-marshal") .marshal().yaml(YAMLLibrary.SnakeYAML); diff --git a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlRoute.java b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlRoute.java index cbcac13..98f82c3 100644 --- a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlRoute.java +++ b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlRoute.java @@ -51,7 +51,7 @@ public class JacksonXmlRoute extends RouteBuilder { JacksonXMLDataFormat marshalContentTypeformat = new JacksonXMLDataFormat(); from("direct:jacksonxml-marshal-ct-yes").marshal(marshalContentTypeformat); - from("direct:jacksonxml-marshal-ct-yes2").marshal().jacksonxml(); + from("direct:jacksonxml-marshal-ct-yes2").marshal().jacksonXml(); JacksonXMLDataFormat marshalContentTypeFormatNoHeader = new JacksonXMLDataFormat(); marshalContentTypeFormatNoHeader.setContentTypeHeader(false); from("direct:jacksonxml-marshal-ct-no").marshal(marshalContentTypeFormatNoHeader); @@ -77,9 +77,9 @@ public class JacksonXmlRoute extends RouteBuilder { jacksonXmlMarshalModuleformat.setModuleClassNames("org.apache.camel.quarkus.component.dataformats.json.model.MyModule"); from("direct:jacksonxml-marshal-module").marshal(jacksonXmlMarshalModuleformat).to("mock:jacksonxml-marshal-module"); - from("direct:jacksonxml-marshal-concurrent-start").marshal().jacksonxml().to("log:marshalled") + from("direct:jacksonxml-marshal-concurrent-start").marshal().jacksonXml().to("log:marshalled") .to("direct:jacksonxml-marshal-concurrent-marshalled"); - from("direct:jacksonxml-marshal-concurrent-marshalled").unmarshal().jacksonxml(TestPojo.class) + from("direct:jacksonxml-marshal-concurrent-marshalled").unmarshal().jacksonXml(TestPojo.class) .to("mock:jacksonxml-marshal-concurrent-result"); this.getContext().getGlobalOptions().put(JacksonXMLConstants.ENABLE_TYPE_CONVERTER, "true"); from("direct:jacksonxml-marshal-conversion").convertBodyTo(TestPojo.class); @@ -96,11 +96,11 @@ public class JacksonXmlRoute extends RouteBuilder { from("direct:jacksonxml-jaxbannotation-backPojo").unmarshal(jacksonXmlJaxbAnnotationformatPojo) .to("mock:jacksonxml-jaxbannotation-reversePojo"); - from("direct:jacksonxml-jsonview-inPojoAgeView").marshal().jacksonxml(TestPojoView.class, Views.Age.class); - from("direct:jacksonxml-jsonview-backPojoAgeView").unmarshal().jacksonxml(TestPojoView.class) + from("direct:jacksonxml-jsonview-inPojoAgeView").marshal().jacksonXml(TestPojoView.class, Views.Age.class); + from("direct:jacksonxml-jsonview-backPojoAgeView").unmarshal().jacksonXml(TestPojoView.class) .to("mock:jacksonxml-jsonview-reversePojoAgeView"); - from("direct:jacksonxml-jsonview-inPojoWeightView").marshal().jacksonxml(TestPojoView.class, Views.Weight.class); - from("direct:jacksonxml-jsonview-backPojoWeightView").unmarshal().jacksonxml(TestPojoView.class) + from("direct:jacksonxml-jsonview-inPojoWeightView").marshal().jacksonXml(TestPojoView.class, Views.Weight.class); + from("direct:jacksonxml-jsonview-backPojoWeightView").unmarshal().jacksonXml(TestPojoView.class) .to("mock:jacksonxml-jsonview-reversePojoWeightView"); this.getContext().getRegistry().bind("myJacksonModule", new MyModule()); diff --git a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/JsonDataformatsRoute.java b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/JsonDataformatsRoute.java index dedb55c..b5bc061 100644 --- a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/JsonDataformatsRoute.java +++ b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/JsonDataformatsRoute.java @@ -86,11 +86,11 @@ public class JsonDataformatsRoute extends RouteBuilder { from("direct:jacksonxml-marshal") .marshal() - .jacksonxml(true); + .jacksonXml(true); from("direct:jacksonxml-unmarshal") .unmarshal() - .jacksonxml(PojoA.class); + .jacksonXml(PojoA.class); } diff --git a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml index d0a240a..b1d4846 100644 --- a/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml +++ b/integration-tests/dataformats-json/src/main/resources/routes/jackson-routes.xml @@ -42,53 +42,53 @@ <route> <from uri="direct:jacksonxml-unmarshal-spring-list-backPojo"/> - <unmarshal><jacksonxml useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> + <unmarshal><jacksonXml useList="true" unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> <to uri="mock:jacksonxml-unmarshal-spring-list-reversePojo"/> </route> <route> <from uri="direct:jacksonxml-marshal-spring-enablefeature"/> <marshal> - <jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" + <jacksonXml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo" enableFeatures="WRAP_ROOT_VALUE"/> </marshal> </route> <route> <from uri="direct:jacksonxml-xml-in"/> - <marshal><jacksonxml/></marshal> + <marshal><jacksonXml/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-inPretty"/> - <marshal><jacksonxml prettyPrint="true"/></marshal> + <marshal><jacksonXml prettyPrint="true"/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-back"/> - <unmarshal><jacksonxml/></unmarshal> + <unmarshal><jacksonXml/></unmarshal> <to uri="mock:jacksonxml-xml-reverse"/> </route> <route> <from uri="direct:jacksonxml-xml-inPojo"/> - <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal> + <marshal><jacksonXml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-backPojo"/> - <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> + <unmarshal><jacksonXml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojo"/></unmarshal> <to uri="mock:jacksonxml-xml-reversePojo"/> </route> <route> <from uri="direct:jacksonxml-xml-inAgeView"/> - <marshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal> + <marshal><jacksonXml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></marshal> </route> <route> <from uri="direct:jacksonxml-xml-backAgeView"/> - <unmarshal><jacksonxml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal> + <unmarshal><jacksonXml unmarshalType="org.apache.camel.quarkus.component.dataformats.json.model.TestPojoView" jsonView="org.apache.camel.quarkus.component.dataformats.json.model.Views$Age"/></unmarshal> <to uri="mock:jacksonxml-xml-reverseAgeView"/> </route> diff --git a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java index 85b2dfa..e460fbc 100644 --- a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java +++ b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java @@ -22,7 +22,7 @@ import javax.inject.Named; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kafka.KafkaConstants; -import org.apache.camel.component.kafka.KafkaManualCommit; +import org.apache.camel.component.kafka.consumer.KafkaManualCommit; import org.apache.camel.processor.idempotent.kafka.KafkaIdempotentRepository; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -78,7 +78,7 @@ public class CamelKafkaRoutes extends RouteBuilder { if (counter % 2 != 0) { KafkaManualCommit manual = e.getMessage().getHeader(KafkaConstants.MANUAL_COMMIT, KafkaManualCommit.class); - manual.commitSync(); + manual.commit(); } }); diff --git a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml index b246556..fd1f1b6 100644 --- a/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml +++ b/integration-tests/main-yaml/src/main/resources/routes/my-rests.yaml @@ -22,7 +22,8 @@ to: "direct:rest" - route: id: "rest-route" - from: "direct:rest" - steps: - - set-body: - constant: "Hello World!!!" + from: + uri: "direct:rest" + steps: + - set-body: + constant: "Hello World!!!" diff --git a/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml b/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml index e6ae42f..d0a6f53 100644 --- a/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml +++ b/integration-tests/main-yaml/src/main/resources/routes/my-routes.yaml @@ -17,8 +17,9 @@ - route: id: "my-yaml-route" - from: "timer:from-xml?period=3000" - steps: - - set-body: - constant: "Hello World!!!" - - to: "log:from-yaml" + from: + uri: "timer:from-xml?period=3000" + steps: + - set-body: + constant: "Hello World!!!" + - to: "log:from-yaml" diff --git a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java index 8e5a135..23c0cb3 100644 --- a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java +++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/LivenessCheck.java @@ -30,6 +30,7 @@ public class LivenessCheck extends AbstractHealthCheck { @Override protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) { builder.up(); + builder.detail("isLive", "true"); } @Override diff --git a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java index 0f913d6..f5392e6 100644 --- a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java +++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java @@ -50,9 +50,15 @@ public class MicroProfileHealthResource { @POST public void healthCheckEnabled(@PathParam("healthCheckId") String healthCheckId, @QueryParam("healthCheckEnabled") boolean isHealthCheckEnabled) { - camelContext.getExtension(HealthCheckRegistry.class) - .getCheck(healthCheckId) - .ifPresent(healthCheck -> healthCheck.getConfiguration().setEnabled(isHealthCheckEnabled)); + HealthCheckRegistry registry = camelContext.getExtension(HealthCheckRegistry.class); + registry.getCheck(healthCheckId).ifPresent(healthCheck -> { + healthCheck.getConfiguration().setEnabled(isHealthCheckEnabled); + if (isHealthCheckEnabled) { + registry.register(healthCheck); + } else { + registry.unregister(healthCheck); + } + }); } @Path("/{healthCheckId}/return/status") diff --git a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java index 4aaf863..c9d1406 100644 --- a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java +++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/ReadinessCheck.java @@ -30,6 +30,7 @@ public class ReadinessCheck extends AbstractHealthCheck { @Override protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) { builder.up(); + builder.detail("isReady", "true"); } @Override diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java index f757a58..db79af1 100644 --- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java +++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthTest.java @@ -23,12 +23,14 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.path.json.JsonPath; +import org.apache.camel.ServiceStatus; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; @QuarkusTest class MicroProfileHealthTest { @@ -39,12 +41,11 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("UP"), - "checks.status", containsInAnyOrder("UP", "UP"), - "checks.name", - containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks"), - "checks.data.context", containsInAnyOrder(null, "UP"), - "checks.data.'route:healthyRoute'", containsInAnyOrder(null, "UP"), - "checks.data.always-up", containsInAnyOrder("UP", "UP")); + "checks.status.findAll().unique()", contains("UP"), + "checks.find { it.name == 'camel-routes' }", notNullValue(), + "checks.find { it.name == 'camel-consumers' }", notNullValue(), + "checks.find { it.name == 'context' }", notNullValue(), + "checks.find { it.name == 'context' }.data.'context.name'", notNullValue()); } @Test @@ -60,10 +61,8 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("DOWN"), - "checks.status", containsInAnyOrder("DOWN", "DOWN"), - "checks.name", - containsInAnyOrder("camel-readiness-checks", "camel-liveness-checks"), - "checks.data.context", containsInAnyOrder(null, "UP")); + "checks.findAll { it.name == 'failing-check' }.status", contains("DOWN", "DOWN"), + "checks.findAll { it.name != 'failing-check' }.status.unique()", contains("UP")); } finally { RestAssured.given() .queryParam("healthCheckEnabled", "false") @@ -79,10 +78,8 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("UP"), - "checks.status", containsInAnyOrder("UP"), - "checks.name", containsInAnyOrder("camel-liveness-checks"), - "checks.data.test", containsInAnyOrder("UP"), - "checks.data.test-liveness", containsInAnyOrder("UP")); + "checks.status.findAll().unique()", contains("UP"), + "checks.find { it.name == 'test-liveness' }.data.isLive as Boolean", is(true)); } @Test @@ -98,11 +95,8 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("DOWN"), - "checks.status", containsInAnyOrder("DOWN"), - "checks.name", containsInAnyOrder("camel-liveness-checks"), - "checks.data.test", containsInAnyOrder("UP"), - "checks.data.test-liveness", containsInAnyOrder("UP"), - "checks.data.failing-check", containsInAnyOrder("DOWN")); + "checks.find { it.name == 'failing-check' }.status", is("DOWN"), + "checks.findAll { it.name != 'failing-check' }.status.unique()", contains("UP")); } finally { RestAssured.given() .queryParam("healthCheckEnabled", "false") @@ -118,10 +112,8 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("UP"), - "checks.status", containsInAnyOrder("UP"), - "checks.name", containsInAnyOrder("camel-readiness-checks"), - "checks.data.context", containsInAnyOrder("UP"), - "checks.data.test-readiness", containsInAnyOrder("UP")); + "checks.status.findAll().unique()", contains("UP"), + "checks.find { it.name == 'test-readiness' }.data.isReady as Boolean", is(true)); } @Test @@ -137,10 +129,8 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("DOWN"), - "checks.status", containsInAnyOrder("DOWN"), - "checks.name", containsInAnyOrder("camel-readiness-checks"), - "checks.data.context", containsInAnyOrder("UP"), - "checks.data.test-readiness", containsInAnyOrder("UP")); + "checks.find { it.name == 'failing-check' }.status", is("DOWN"), + "checks.findAll { it.name != 'failing-check' }.status.unique()", contains("UP")); } finally { RestAssured.given() .queryParam("healthCheckEnabled", "false") @@ -161,7 +151,14 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("DOWN"), - "checks.data.'route:healthyRoute'", containsInAnyOrder(null, "DOWN")); + "checks.find { it.name == 'camel-routes' }.status", is("DOWN"), + "checks.find { it.name == 'camel-routes' }.data.'route.id'", is("healthyRoute"), + "checks.find { it.name == 'camel-routes' }.data.'route.status'", + is(ServiceStatus.Stopped.toString()), + "checks.find { it.name == 'camel-consumers' }.status", is("DOWN"), + "checks.find { it.name == 'camel-consumers' }.data.'route.id'", is("healthyRoute"), + "checks.find { it.name == 'camel-consumers' }.data.'route.status'", + is(ServiceStatus.Stopped.toString())); } finally { RestAssured.post("/microprofile-health/route/healthyRoute/start") .then() @@ -183,7 +180,7 @@ class MicroProfileHealthTest { .contentType(ContentType.JSON) .header("Content-Type", containsString("charset=UTF-8")) .body("status", is("UP"), - "checks.data.failure-threshold", containsInAnyOrder("UP", "UP")); + "checks.findAll { it.name == 'failure-threshold' }.status.unique()", contains("UP")); // Poll the health endpoint until the threshold / interval is exceeded and the health state transitions to DOWN Awaitility.await().atMost(10, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> { @@ -194,7 +191,7 @@ class MicroProfileHealthTest { .jsonPath(); String status = result.getString("status"); - List<String> routeStatus = result.getList("checks.data.failure-threshold"); + List<String> routeStatus = result.getList("checks.findAll { it.name == 'failure-threshold' }.status.unique()"); return status.equals("DOWN") && routeStatus.contains("DOWN"); }); @@ -213,7 +210,7 @@ class MicroProfileHealthTest { .jsonPath(); String status = result.getString("status"); - List<String> routeStatus = result.getList("checks.data.failure-threshold"); + List<String> routeStatus = result.getList("checks.findAll { it.name == 'failure-threshold' }.status.unique()"); return status.equals("UP") && routeStatus.contains("UP"); }); } finally { diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java index cba2462..e6b7383 100644 --- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java +++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java @@ -50,7 +50,6 @@ import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult; import org.apache.camel.component.salesforce.api.dto.GlobalObjects; import org.apache.camel.component.salesforce.api.dto.Limits; import org.apache.camel.component.salesforce.api.dto.RecentItem; -import org.apache.camel.component.salesforce.api.dto.RestResources; import org.apache.camel.component.salesforce.api.dto.SObjectBasicInfo; import org.apache.camel.component.salesforce.api.dto.SObjectDescription; import org.apache.camel.component.salesforce.api.dto.Version; @@ -213,9 +212,9 @@ public class SalesforceResource { @Path("resources") @GET @Produces(MediaType.APPLICATION_JSON) - public String getListResources() { - RestResources restResources = template.to("salesforce:getResources").request(RestResources.class); - return restResources.getSobjects(); + @SuppressWarnings("unchecked") + public Map<String, String> getListResources() { + return template.to("salesforce:getResources").request(Map.class); } @Path("basic-info/account") diff --git a/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTest.java b/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTest.java index d991c41..97b280d 100644 --- a/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTest.java +++ b/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTest.java @@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.IsNot.not; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -168,11 +167,19 @@ class SalesforceTest { @Test void testGetRestResources() { - RestAssured.given() + JsonPath resources = RestAssured.given() .get("/salesforce/resources") .then() .statusCode(200) - .body(matchesPattern("/services/data/.*/sobjects")); + .extract() + .body() + .jsonPath(); + + resources.getMap("$.") + .values() + .stream() + .map(Object::toString) + .forEach(value -> assertTrue(value.matches("/services/data/.*/.*"))); } @Test diff --git a/integration-tests/soap/src/main/java/org/apache/camel/quarkus/component/soap/it/SoapRoutes.java b/integration-tests/soap/src/main/java/org/apache/camel/quarkus/component/soap/it/SoapRoutes.java index d413e3d..4e172b3 100644 --- a/integration-tests/soap/src/main/java/org/apache/camel/quarkus/component/soap/it/SoapRoutes.java +++ b/integration-tests/soap/src/main/java/org/apache/camel/quarkus/component/soap/it/SoapRoutes.java @@ -21,7 +21,7 @@ import javax.xml.namespace.QName; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.dataformat.soap.SoapJaxbDataFormat; +import org.apache.camel.dataformat.soap.SoapDataFormat; import org.apache.camel.dataformat.soap.name.QNameStrategy; import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy; import org.apache.camel.dataformat.soap.name.TypeNameStrategy; @@ -62,26 +62,26 @@ public class SoapRoutes extends RouteBuilder { .marshal("soapDataFormatWithServiceInterfaceStrategy"); from("direct:marshalQnameStrategy") - .marshal().soapjaxb(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new QNameStrategy( + .marshal().soap(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new QNameStrategy( new QName("http://service.it.soap.component.quarkus.camel.apache.org/", "getCustomersByName"))); from("direct:unmarshalQnameStrategy") - .unmarshal().soapjaxb(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new QNameStrategy( + .unmarshal().soap(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new QNameStrategy( new QName("http://service.it.soap.component.quarkus.camel.apache.org/", "getCustomersByName"))); from("direct:marshal-soap1.2") - .marshal().soapjaxb12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); + .marshal().soap12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); from("direct:unmarshal-soap1.2") - .unmarshal().soapjaxb12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); + .unmarshal().soap12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); from("direct:unmarshal-fault-soap1.2") - .unmarshal().soapjaxb12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); + .unmarshal().soap12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE); from("direct:marshal-fault-soap1.2") .onException(Exception.class) .handled(true) - .marshal().soapjaxb12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE) + .marshal().soap12(SERVICE_CUSTOMERS_BY_NAME_PACKAGE) .end() .process(createSoapFaultProcessor()); @@ -93,22 +93,22 @@ public class SoapRoutes extends RouteBuilder { } @Named("soapDataFormat") - public SoapJaxbDataFormat soapJaxbDataFormat() { - SoapJaxbDataFormat soapJaxbDataFormat = new SoapJaxbDataFormat(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, + public SoapDataFormat soapJaxbDataFormat() { + SoapDataFormat soapJaxbDataFormat = new SoapDataFormat(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new TypeNameStrategy()); soapJaxbDataFormat.setSchema("classpath:/schema/CustomerService.xsd,classpath:/soap.xsd"); return soapJaxbDataFormat; } @Named("soapDataFormatWithServiceInterfaceStrategy") - public SoapJaxbDataFormat soapJaxbDataFormatServiceInterfaceStrategy() { - return new SoapJaxbDataFormat(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, + public SoapDataFormat soapJaxbDataFormatServiceInterfaceStrategy() { + return new SoapDataFormat(SERVICE_CUSTOMERS_BY_NAME_PACKAGE, new ServiceInterfaceStrategy(CustomerService.class, true)); } @Named("soapJaxbDataFormatMultipart") - public SoapJaxbDataFormat soapJaxbDataFormatMultipart() { - return new SoapJaxbDataFormat(MULTIPART_CUSTOMERS_BY_NAME_PACKAGE, + public SoapDataFormat soapJaxbDataFormatMultipart() { + return new SoapDataFormat(MULTIPART_CUSTOMERS_BY_NAME_PACKAGE, new ServiceInterfaceStrategy(MultiPartCustomerService.class, true)); } diff --git a/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatMarshalRoute.java b/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatMarshalRoute.java index 585e420..17f9d01 100644 --- a/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatMarshalRoute.java +++ b/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatMarshalRoute.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.dataformat.univocity.UniVocityFixedWidthDataFormat; +import org.apache.camel.dataformat.univocity.UniVocityFixedDataFormat; import org.apache.camel.spi.DataFormat; public class UniVocityFixedWidthDataFormatMarshalRoute extends RouteBuilder { @@ -30,16 +30,16 @@ public class UniVocityFixedWidthDataFormatMarshalRoute extends RouteBuilder { final Map<String, DataFormat> testsDataformat = new HashMap<>(); // Default writing of fixed-width - testsDataformat.put("default", new UniVocityFixedWidthDataFormat() + testsDataformat.put("default", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3, 5 })); // Write a fixed-width with specific headers - testsDataformat.put("header", new UniVocityFixedWidthDataFormat() + testsDataformat.put("header", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 5 }) .setHeaders(new String[] { "A", "C" })); // Write a fixed-width with an advanced configuration - testsDataformat.put("advanced", new UniVocityFixedWidthDataFormat() + testsDataformat.put("advanced", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 5, 5 }) .setNullValue("N/A") .setEmptyValue("empty") diff --git a/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatUnmarshalRoute.java b/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatUnmarshalRoute.java index d83e94a..1866850 100644 --- a/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatUnmarshalRoute.java +++ b/integration-tests/univocity-parsers/src/main/java/org/apache/camel/quarkus/component/univocity/parsers/it/UniVocityFixedWidthDataFormatUnmarshalRoute.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.dataformat.univocity.UniVocityFixedWidthDataFormat; +import org.apache.camel.dataformat.univocity.UniVocityFixedDataFormat; import org.apache.camel.spi.DataFormat; public class UniVocityFixedWidthDataFormatUnmarshalRoute extends RouteBuilder { @@ -30,28 +30,28 @@ public class UniVocityFixedWidthDataFormatUnmarshalRoute extends RouteBuilder { final Map<String, DataFormat> testsDataformat = new HashMap<>(); // Default reading of fixed-width - testsDataformat.put("default", new UniVocityFixedWidthDataFormat() + testsDataformat.put("default", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3, 5 })); // Reading fixed-width as Map - testsDataformat.put("map", new UniVocityFixedWidthDataFormat() + testsDataformat.put("map", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3, 5 }) .setAsMap(true) .setHeaderExtractionEnabled(true)); // Reading fixed-width as Map with specific headers - testsDataformat.put("mapWithHeaders", new UniVocityFixedWidthDataFormat() + testsDataformat.put("mapWithHeaders", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3, 5 }) .setAsMap(true) .setHeaders(new String[] { "A", "B", "C" })); // Reading fixed-width using an iterator - testsDataformat.put("lazy", new UniVocityFixedWidthDataFormat() + testsDataformat.put("lazy", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3, 5 }) .setLazyLoad(true)); // Reading fixed-width using advanced configuration - testsDataformat.put("advanced", new UniVocityFixedWidthDataFormat() + testsDataformat.put("advanced", new UniVocityFixedDataFormat() .setFieldLengths(new int[] { 3, 3 }) .setNullValue("N/A") .setPadding('_') diff --git a/integration-tests/xmlsecurity/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityRoutes.java b/integration-tests/xmlsecurity/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityRoutes.java index 95378bf..9e5c860 100644 --- a/integration-tests/xmlsecurity/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityRoutes.java +++ b/integration-tests/xmlsecurity/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityRoutes.java @@ -83,15 +83,15 @@ public class XmlsecurityRoutes extends RouteBuilder { .to("xmlsecurity-verify:transformsXsltXPath?keySelector=#selector&secureValidation=false"); from("direct:marshal") - .marshal().secureXML(key.getEncoded()); + .marshal().xmlSecurity(key.getEncoded()); from("direct:unmarshal") - .unmarshal().secureXML(key.getEncoded()); + .unmarshal().xmlSecurity(key.getEncoded()); from("direct:marshal-partial") - .marshal().secureXML("//root/test:child-2", namespaces, true, key.getEncoded()); + .marshal().xmlSecurity("//root/test:child-2", namespaces, true, key.getEncoded()); from("direct:unmarshal-partial") - .unmarshal().secureXML("//root/test:child-2", namespaces, true, key.getEncoded()); + .unmarshal().xmlSecurity("//root/test:child-2", namespaces, true, key.getEncoded()); } } diff --git a/pom.xml b/pom.xml index 30fa249..096da97 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.14.0</version> + <version>3.15.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -39,8 +39,8 @@ <properties> <!-- Primary dependencies - maintained manually --> - <camel.major.minor>3.14</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.major.minor>3.15</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> + <camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version> <camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5bd8d9b..ce9d867 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1527,11 +1527,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-kamelet-reify</artifactId> - <version>${camel.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-kotlin-dsl</artifactId> <version>${camel.version}</version> </dependency> @@ -4145,16 +4140,6 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-kamelet-reify-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-kotlin</artifactId> <version>${camel-quarkus.version}</version> </dependency>