This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit cae2ae3e534c16a08cb451bad9b9b98e58cd58ae Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Mon May 18 21:53:01 2020 +0200 Upgrade to Camel 3.4.0 - WIP --- docs/modules/ROOT/pages/extensions/ahc-ws.adoc | 4 +- docs/modules/ROOT/pages/extensions/ahc.adoc | 2 +- .../modules/ROOT/pages/extensions/attachments.adoc | 2 +- docs/modules/ROOT/pages/extensions/avro-rpc.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-ec2.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-ecs.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-eks.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-iam.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-kms.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-sns.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-sqs.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws-swf.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ec2.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ecs.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-eks.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-iam.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-kms.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-msk.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-ses.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sns.adoc | 2 +- docs/modules/ROOT/pages/extensions/aws2-sqs.adoc | 2 +- docs/modules/ROOT/pages/extensions/gson.adoc | 2 +- docs/modules/ROOT/pages/extensions/jackson.adoc | 2 +- docs/modules/ROOT/pages/extensions/johnzon.adoc | 2 +- docs/modules/ROOT/pages/extensions/xstream.adoc | 2 +- .../pages/list-of-camel-quarkus-extensions.adoc | 72 +++++++++++----------- extensions-core/core/runtime/pom.xml | 4 ++ .../camel/quarkus/core/FastCamelContext.java | 5 -- .../component/qute/QuteEndpointConfigurer.java | 5 ++ .../org/apache/camel/component/qute/qute.json | 1 + .../apache/camel/component/qute/QuteEndpoint.java | 2 +- .../camel/component/qute/QuteEndpointTest.java | 1 + .../org/apache/camel/component/qute/QuteTest.java | 2 +- pom.xml | 2 +- poms/bom/pom.xml | 5 ++ 35 files changed, 81 insertions(+), 70 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc index 429eeb9..c362831 100644 --- a/docs/modules/ROOT/pages/extensions/ahc-ws.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc-ws.adoc @@ -11,8 +11,8 @@ Exchange data with external Websocket servers using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-wss-component.html[AHC Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` -* https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket component], URI syntax: `ahc-ws:httpUri` +* https://camel.apache.org/components/latest/ahc-wss-component.html[Async HTTP Client (AHC) Secure Websocket (Secure) component], URI syntax: `ahc-wss:httpUri` +* https://camel.apache.org/components/latest/ahc-ws-component.html[Async HTTP Client (AHC) Websocket component], URI syntax: `ahc-ws:httpUri` Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/ahc.adoc b/docs/modules/ROOT/pages/extensions/ahc.adoc index fe8e992..23afcf1 100644 --- a/docs/modules/ROOT/pages/extensions/ahc.adoc +++ b/docs/modules/ROOT/pages/extensions/ahc.adoc @@ -11,7 +11,7 @@ Call external HTTP services using Async Http Client. == What's inside -* https://camel.apache.org/components/latest/ahc-component.html[AHC component], URI syntax: `ahc:httpUri` +* https://camel.apache.org/components/latest/ahc-component.html[Async HTTP Client (AHC) component], URI syntax: `ahc:httpUri` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/attachments.adoc b/docs/modules/ROOT/pages/extensions/attachments.adoc index d47fc26..2555da8 100644 --- a/docs/modules/ROOT/pages/extensions/attachments.adoc +++ b/docs/modules/ROOT/pages/extensions/attachments.adoc @@ -7,7 +7,7 @@ [.badges] [.badge-key]##Since Camel Quarkus##[.badge-version]##0.3.0## [.badge-key]##JVM##[.badge-supported]##supported## [.badge-key]##Native##[.badge-supported]##supported## -Java Attachments support for Camel Message +Support for attachments on Camel messages == What's inside diff --git a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc index b915289..8d601be 100644 --- a/docs/modules/ROOT/pages/extensions/avro-rpc.adoc +++ b/docs/modules/ROOT/pages/extensions/avro-rpc.adoc @@ -11,7 +11,7 @@ Produce or consume Apache Avro RPC services. == What's inside -* https://camel.apache.org/components/latest/avro-component.html[Avro component], URI syntax: `avro:transport:host:port/messageName` +* https://camel.apache.org/components/latest/avro-component.html[Avro RPC component], URI syntax: `avro:transport:host:port/messageName` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-ec2.adoc b/docs/modules/ROOT/pages/extensions/aws-ec2.adoc index 0525814..9ceba2e 100644 --- a/docs/modules/ROOT/pages/extensions/aws-ec2.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-ec2.adoc @@ -11,7 +11,7 @@ Manage AWS EC2 instances. == What's inside -* https://camel.apache.org/components/latest/aws-ec2-component.html[AWS EC2 component], URI syntax: `aws-ec2:label` +* https://camel.apache.org/components/latest/aws-ec2-component.html[AWS Elastic Compute Cloud (EC2) component], URI syntax: `aws-ec2:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-ecs.adoc b/docs/modules/ROOT/pages/extensions/aws-ecs.adoc index 36d7905..4cf1f35 100644 --- a/docs/modules/ROOT/pages/extensions/aws-ecs.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-ecs.adoc @@ -11,7 +11,7 @@ Manage AWS ECS cluster instances. == What's inside -* https://camel.apache.org/components/latest/aws-ecs-component.html[AWS ECS component], URI syntax: `aws-ecs:label` +* https://camel.apache.org/components/latest/aws-ecs-component.html[AWS Elastic Container Service (ECS) component], URI syntax: `aws-ecs:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-eks.adoc b/docs/modules/ROOT/pages/extensions/aws-eks.adoc index ed6ea7d..d374ecc 100644 --- a/docs/modules/ROOT/pages/extensions/aws-eks.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-eks.adoc @@ -11,7 +11,7 @@ Manage AWS EKS cluster instances. == What's inside -* https://camel.apache.org/components/latest/aws-eks-component.html[AWS EKS component], URI syntax: `aws-eks:label` +* https://camel.apache.org/components/latest/aws-eks-component.html[AWS Elastic Kubernetes Service (EKS) component], URI syntax: `aws-eks:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-iam.adoc b/docs/modules/ROOT/pages/extensions/aws-iam.adoc index be93f23..3b6ba3d 100644 --- a/docs/modules/ROOT/pages/extensions/aws-iam.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-iam.adoc @@ -11,7 +11,7 @@ Manage AWS IAM instances. == What's inside -* https://camel.apache.org/components/latest/aws-iam-component.html[AWS IAM component], URI syntax: `aws-iam:label` +* https://camel.apache.org/components/latest/aws-iam-component.html[AWS Identity and Access Management (IAM) component], URI syntax: `aws-iam:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-kms.adoc b/docs/modules/ROOT/pages/extensions/aws-kms.adoc index 0d95717..3fe35d7 100644 --- a/docs/modules/ROOT/pages/extensions/aws-kms.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-kms.adoc @@ -11,7 +11,7 @@ Manage keys stored in AWS KMS instances. == What's inside -* https://camel.apache.org/components/latest/aws-kms-component.html[AWS KMS component], URI syntax: `aws-kms:label` +* https://camel.apache.org/components/latest/aws-kms-component.html[AWS Key Management Service (KMS) component], URI syntax: `aws-kms:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-sns.adoc b/docs/modules/ROOT/pages/extensions/aws-sns.adoc index d461aab..c919872 100644 --- a/docs/modules/ROOT/pages/extensions/aws-sns.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-sns.adoc @@ -11,7 +11,7 @@ Send messages to an AWS Simple Notification Topic. == What's inside -* https://camel.apache.org/components/latest/aws-sns-component.html[AWS Simple Notification System component], URI syntax: `aws-sns:topicNameOrArn` +* https://camel.apache.org/components/latest/aws-sns-component.html[AWS Simple Notification System (SNS) component], URI syntax: `aws-sns:topicNameOrArn` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-sqs.adoc b/docs/modules/ROOT/pages/extensions/aws-sqs.adoc index 20dee90..6b39932 100644 --- a/docs/modules/ROOT/pages/extensions/aws-sqs.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-sqs.adoc @@ -11,7 +11,7 @@ Sending and receive messages to/from AWS SQS service. == What's inside -* https://camel.apache.org/components/latest/aws-sqs-component.html[AWS Simple Queue Service component], URI syntax: `aws-sqs:queueNameOrArn` +* https://camel.apache.org/components/latest/aws-sqs-component.html[AWS Simple Queue Service (SQS) component], URI syntax: `aws-sqs:queueNameOrArn` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws-swf.adoc b/docs/modules/ROOT/pages/extensions/aws-swf.adoc index 0736166..accfefe 100644 --- a/docs/modules/ROOT/pages/extensions/aws-swf.adoc +++ b/docs/modules/ROOT/pages/extensions/aws-swf.adoc @@ -11,7 +11,7 @@ Manage workflows in the AWS Simple Workflow service. == What's inside -* https://camel.apache.org/components/latest/aws-swf-component.html[AWS Simple Workflow component], URI syntax: `aws-swf:type` +* https://camel.apache.org/components/latest/aws-swf-component.html[AWS Simple Workflow (SWF) component], URI syntax: `aws-swf:type` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-ec2.adoc b/docs/modules/ROOT/pages/extensions/aws2-ec2.adoc index de0447b..1d46214 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-ec2.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-ec2.adoc @@ -11,7 +11,7 @@ Manage AWS EC2 instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-ec2-component.html[AWS 2 EC2 component], URI syntax: `aws2-ec2:label` +* https://camel.apache.org/components/latest/aws2-ec2-component.html[AWS 2 Elastic Compute Cloud (EC2) component], URI syntax: `aws2-ec2:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-ecs.adoc b/docs/modules/ROOT/pages/extensions/aws2-ecs.adoc index 1ecb986..e513b14 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-ecs.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-ecs.adoc @@ -11,7 +11,7 @@ Manage AWS ECS cluster instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-ecs-component.html[AWS 2 ECS component], URI syntax: `aws2-ecs:label` +* https://camel.apache.org/components/latest/aws2-ecs-component.html[AWS 2 Elastic Container Service (ECS) component], URI syntax: `aws2-ecs:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-eks.adoc b/docs/modules/ROOT/pages/extensions/aws2-eks.adoc index bc6406d..4bf0fd3 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-eks.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-eks.adoc @@ -11,7 +11,7 @@ Manage AWS EKS cluster instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-eks-component.html[AWS 2 EKS component], URI syntax: `aws2-eks:label` +* https://camel.apache.org/components/latest/aws2-eks-component.html[AWS 2 Elastic Kubernetes Service (EKS) component], URI syntax: `aws2-eks:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-iam.adoc b/docs/modules/ROOT/pages/extensions/aws2-iam.adoc index 024b329..28784f3 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-iam.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-iam.adoc @@ -11,7 +11,7 @@ Manage AWS IAM instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 IAM component], URI syntax: `aws2-iam:label` +* https://camel.apache.org/components/latest/aws2-iam-component.html[AWS 2 Identity and Access Management (IAM) component], URI syntax: `aws2-iam:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-kms.adoc b/docs/modules/ROOT/pages/extensions/aws2-kms.adoc index 8027e68..cfb558d 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-kms.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-kms.adoc @@ -11,7 +11,7 @@ Manage keys stored in AWS KMS instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 KMS component], URI syntax: `aws2-kms:label` +* https://camel.apache.org/components/latest/aws2-kms-component.html[AWS 2 Key Management Service (KMS) component], URI syntax: `aws2-kms:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-msk.adoc b/docs/modules/ROOT/pages/extensions/aws2-msk.adoc index 5bc9462..9163386 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-msk.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-msk.adoc @@ -11,7 +11,7 @@ Manage AWS MSK instances using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-msk-component.html[AWS 2 MSK component], URI syntax: `aws2-msk:label` +* https://camel.apache.org/components/latest/aws2-msk-component.html[AWS 2 Managed Streaming for Apache Kafka (MSK) component], URI syntax: `aws2-msk:label` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-ses.adoc b/docs/modules/ROOT/pages/extensions/aws2-ses.adoc index 0a33726..fbec5bf 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-ses.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-ses.adoc @@ -11,7 +11,7 @@ Send e-mails through AWS SES service using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service component], URI syntax: `aws2-ses:from` +* https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service (SES) component], URI syntax: `aws2-ses:from` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-sns.adoc b/docs/modules/ROOT/pages/extensions/aws2-sns.adoc index cd3f958..fd293d4 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-sns.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-sns.adoc @@ -11,7 +11,7 @@ Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System component], URI syntax: `aws2-sns:topicNameOrArn` +* https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System (SNS) component], URI syntax: `aws2-sns:topicNameOrArn` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/aws2-sqs.adoc b/docs/modules/ROOT/pages/extensions/aws2-sqs.adoc index 0db293d..babe9d8 100644 --- a/docs/modules/ROOT/pages/extensions/aws2-sqs.adoc +++ b/docs/modules/ROOT/pages/extensions/aws2-sqs.adoc @@ -11,7 +11,7 @@ Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. == What's inside -* https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service component], URI syntax: `aws2-sqs:queueNameOrArn` +* https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service (SQS) component], URI syntax: `aws2-sqs:queueNameOrArn` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/gson.adoc b/docs/modules/ROOT/pages/extensions/gson.adoc index f3899bc..17bf8c8 100644 --- a/docs/modules/ROOT/pages/extensions/gson.adoc +++ b/docs/modules/ROOT/pages/extensions/gson.adoc @@ -11,7 +11,7 @@ Marshal POJOs to JSON and back. == What's inside -* https://camel.apache.org/components/latest/dataformats/json-gson-dataformat.html[JSon GSon data format] +* https://camel.apache.org/components/latest/dataformats/json-gson-dataformat.html[JSON Gson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/jackson.adoc b/docs/modules/ROOT/pages/extensions/jackson.adoc index e5bc86d..e5cd468 100644 --- a/docs/modules/ROOT/pages/extensions/jackson.adoc +++ b/docs/modules/ROOT/pages/extensions/jackson.adoc @@ -11,7 +11,7 @@ Marshal POJOs to JSON and back. == What's inside -* https://camel.apache.org/components/latest/dataformats/json-jackson-dataformat.html[JSon Jackson data format] +* https://camel.apache.org/components/latest/dataformats/json-jackson-dataformat.html[JSON Jackson data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/johnzon.adoc b/docs/modules/ROOT/pages/extensions/johnzon.adoc index 9850877..a2ef0a7 100644 --- a/docs/modules/ROOT/pages/extensions/johnzon.adoc +++ b/docs/modules/ROOT/pages/extensions/johnzon.adoc @@ -11,7 +11,7 @@ Marshal POJOs to JSON and back. == What's inside -* https://camel.apache.org/components/latest/dataformats/json-johnzon-dataformat.html[JSon Johnzon data format] +* https://camel.apache.org/components/latest/dataformats/json-johnzon-dataformat.html[JSON Johnzon data format] Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/extensions/xstream.adoc b/docs/modules/ROOT/pages/extensions/xstream.adoc index 09b4fe5..252c9aa 100644 --- a/docs/modules/ROOT/pages/extensions/xstream.adoc +++ b/docs/modules/ROOT/pages/extensions/xstream.adoc @@ -11,7 +11,7 @@ Marshal and unmarshal POJOs to/from XML or JSON using XStream library. == What's inside -* https://camel.apache.org/components/latest/dataformats/json-xstream-dataformat.html[JSon XStream data format] +* https://camel.apache.org/components/latest/dataformats/json-xstream-dataformat.html[JSON XStream data format] * https://camel.apache.org/components/latest/dataformats/xstream-dataformat.html[XStream data format] Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 174d08a..7f657c5 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -29,19 +29,19 @@ Level | Since | Description `activemq:destinationType:destinationName` | Native + Stable | 1.0.0-M5 | Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. -| xref:extensions/ahc.adoc[AHC] (camel-quarkus-ahc) + +| xref:extensions/amqp.adoc[AMQP] (camel-quarkus-amqp) + +`amqp:destinationType:destinationName` | Native + + Stable | 1.0.0-M6 | Messaging with AMQP protocol using Apache QPid Client. + +| xref:extensions/ahc.adoc[Async HTTP Client (AHC)] (camel-quarkus-ahc) + `ahc:httpUri` | Native + Stable | 1.0.0-M3 | Call external HTTP services using Async Http Client. -| xref:extensions/ahc-ws.adoc[AHC Websocket] (camel-quarkus-ahc-ws) + +| xref:extensions/ahc-ws.adoc[Async HTTP Client (AHC) Websocket] (camel-quarkus-ahc-ws) + `ahc-ws:httpUri` | Native + Stable | 1.0.0-M3 | Exchange data with external Websocket servers using Async Http Client. -| xref:extensions/amqp.adoc[AMQP] (camel-quarkus-amqp) + -`amqp:destinationType:destinationName` | Native + - Stable | 1.0.0-M6 | Messaging with AMQP protocol using Apache QPid Client. - -| xref:extensions/avro-rpc.adoc[Avro] (camel-quarkus-avro-rpc) + +| xref:extensions/avro-rpc.adoc[Avro RPC] (camel-quarkus-avro-rpc) + `avro:transport:host:port/messageName` | JVM + Preview | 1.0.0-M6 | Produce or consume Apache Avro RPC services. @@ -57,47 +57,47 @@ Level | Since | Description `aws2-ddbstream:tableName` | JVM + Preview | 1.0.0-M6 | Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x. -| xref:extensions/aws2-ec2.adoc[AWS 2 EC2] (camel-quarkus-aws2-ec2) + +| xref:extensions/aws2-ec2.adoc[AWS 2 Elastic Compute Cloud (EC2)] (camel-quarkus-aws2-ec2) + `aws2-ec2:label` | JVM + Preview | 1.0.0-M6 | Manage AWS EC2 instances using AWS SDK version 2.x. -| xref:extensions/aws2-ecs.adoc[AWS 2 ECS] (camel-quarkus-aws2-ecs) + +| xref:extensions/aws2-ecs.adoc[AWS 2 Elastic Container Service (ECS)] (camel-quarkus-aws2-ecs) + `aws2-ecs:label` | JVM + Preview | 1.0.0-M6 | Manage AWS ECS cluster instances using AWS SDK version 2.x. -| xref:extensions/aws2-eks.adoc[AWS 2 EKS] (camel-quarkus-aws2-eks) + +| xref:extensions/aws2-eks.adoc[AWS 2 Elastic Kubernetes Service (EKS)] (camel-quarkus-aws2-eks) + `aws2-eks:label` | JVM + Preview | 1.0.0-M6 | Manage AWS EKS cluster instances using AWS SDK version 2.x. -| xref:extensions/aws2-iam.adoc[AWS 2 IAM] (camel-quarkus-aws2-iam) + +| xref:extensions/aws2-iam.adoc[AWS 2 Identity and Access Management (IAM)] (camel-quarkus-aws2-iam) + `aws2-iam:label` | JVM + Preview | 1.0.0-M6 | Manage AWS IAM instances using AWS SDK version 2.x. -| xref:extensions/aws2-kms.adoc[AWS 2 KMS] (camel-quarkus-aws2-kms) + +| xref:extensions/aws2-kms.adoc[AWS 2 Key Management Service (KMS)] (camel-quarkus-aws2-kms) + `aws2-kms:label` | JVM + Preview | 1.0.0-M6 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x. +| xref:extensions/aws2-msk.adoc[AWS 2 Managed Streaming for Apache Kafka (MSK)] (camel-quarkus-aws2-msk) + +`aws2-msk:label` | JVM + + Preview | 1.0.0-M6 | Manage AWS MSK instances using AWS SDK version 2.x. + | xref:extensions/aws2-mq.adoc[AWS 2 MQ] (camel-quarkus-aws2-mq) + `aws2-mq:label` | JVM + Preview | 1.0.0-M6 | Manage AWS MQ instances using AWS SDK version 2.x. -| xref:extensions/aws2-msk.adoc[AWS 2 MSK] (camel-quarkus-aws2-msk) + -`aws2-msk:label` | JVM + - Preview | 1.0.0-M6 | Manage AWS MSK instances using AWS SDK version 2.x. - | xref:extensions/aws2-s3.adoc[AWS 2 S3 Storage Service] (camel-quarkus-aws2-s3) + `aws2-s3://bucketNameOrArn` | Native + Stable | 1.0.0-M7 | Store and retrie objects from AWS S3 Storage Service using AWS SDK version 2.x. -| xref:extensions/aws2-ses.adoc[AWS 2 Simple Email Service] (camel-quarkus-aws2-ses) + +| xref:extensions/aws2-ses.adoc[AWS 2 Simple Email Service (SES)] (camel-quarkus-aws2-ses) + `aws2-ses:from` | JVM + Preview | 1.0.0-M6 | Send e-mails through AWS SES service using AWS SDK version 2.x. -| xref:extensions/aws2-sns.adoc[AWS 2 Simple Notification System] (camel-quarkus-aws2-sns) + +| xref:extensions/aws2-sns.adoc[AWS 2 Simple Notification System (SNS)] (camel-quarkus-aws2-sns) + `aws2-sns:topicNameOrArn` | Native + Stable | 1.0.0-M6 | Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x. -| xref:extensions/aws2-sqs.adoc[AWS 2 Simple Queue Service] (camel-quarkus-aws2-sqs) + +| xref:extensions/aws2-sqs.adoc[AWS 2 Simple Queue Service (SQS)] (camel-quarkus-aws2-sqs) + `aws2-sqs:queueNameOrArn` | Native + Stable | 1.0.0-M6 | Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. @@ -105,22 +105,26 @@ Level | Since | Description `aws2-translate:label` | JVM + Preview | 1.0.0-M6 | Translate texts using AWS Translate and AWS SDK version 2.x. -| xref:extensions/aws-ec2.adoc[AWS EC2] (camel-quarkus-aws-ec2) + +| xref:extensions/aws-ec2.adoc[AWS Elastic Compute Cloud (EC2)] (camel-quarkus-aws-ec2) + `aws-ec2:label` | Native + Stable | 1.0.0-M3 | Manage AWS EC2 instances. -| xref:extensions/aws-ecs.adoc[AWS ECS] (camel-quarkus-aws-ecs) + +| xref:extensions/aws-ecs.adoc[AWS Elastic Container Service (ECS)] (camel-quarkus-aws-ecs) + `aws-ecs:label` | Native + Stable | 1.0.0-M1 | Manage AWS ECS cluster instances. -| xref:extensions/aws-eks.adoc[AWS EKS] (camel-quarkus-aws-eks) + +| xref:extensions/aws-eks.adoc[AWS Elastic Kubernetes Service (EKS)] (camel-quarkus-aws-eks) + `aws-eks:label` | Native + Stable | 0.2.0 | Manage AWS EKS cluster instances. -| xref:extensions/aws-iam.adoc[AWS IAM] (camel-quarkus-aws-iam) + +| xref:extensions/aws-iam.adoc[AWS Identity and Access Management (IAM)] (camel-quarkus-aws-iam) + `aws-iam:label` | Native + Stable | 1.1.0 | Manage AWS IAM instances. +| xref:extensions/aws-kms.adoc[AWS Key Management Service (KMS)] (camel-quarkus-aws-kms) + +`aws-kms:label` | Native + + Stable | 1.0.0-M1 | Manage keys stored in AWS KMS instances. + | xref:extensions/aws-kinesis.adoc[AWS Kinesis] (camel-quarkus-aws-kinesis) + `aws-kinesis:streamName` | Native + Stable | 1.0.0-M3 | Consume and produce records from AWS Kinesis Streams. @@ -129,10 +133,6 @@ Level | Since | Description `aws-kinesis-firehose:streamName` | Native + Stable | 1.0.0-M3 | Consume data from AWS Kinesis Firehose streams. -| xref:extensions/aws-kms.adoc[AWS KMS] (camel-quarkus-aws-kms) + -`aws-kms:label` | Native + - Stable | 1.0.0-M1 | Manage keys stored in AWS KMS instances. - | xref:extensions/aws-lambda.adoc[AWS Lambda] (camel-quarkus-aws-lambda) + `aws-lambda:function` | Native + Stable | 1.0.0-M3 | Manage and invoke AWS Lambda functions. @@ -141,15 +141,15 @@ Level | Since | Description `aws-s3://bucketNameOrArn` | Native + Stable | 0.2.0 | Store and retrie objects from AWS S3 Storage Service. -| xref:extensions/aws-sns.adoc[AWS Simple Notification System] (camel-quarkus-aws-sns) + +| xref:extensions/aws-sns.adoc[AWS Simple Notification System (SNS)] (camel-quarkus-aws-sns) + `aws-sns:topicNameOrArn` | Native + Stable | 0.2.0 | Send messages to an AWS Simple Notification Topic. -| xref:extensions/aws-sqs.adoc[AWS Simple Queue Service] (camel-quarkus-aws-sqs) + +| xref:extensions/aws-sqs.adoc[AWS Simple Queue Service (SQS)] (camel-quarkus-aws-sqs) + `aws-sqs:queueNameOrArn` | Native + Stable | 0.2.0 | Sending and receive messages to/from AWS SQS service. -| xref:extensions/aws-swf.adoc[AWS Simple Workflow] (camel-quarkus-aws-swf) + +| xref:extensions/aws-swf.adoc[AWS Simple Workflow (SWF)] (camel-quarkus-aws-swf) + `aws-swf:type` | Native + Stable | 1.0.0-M6 | Manage workflows in the AWS Simple Workflow service. @@ -666,16 +666,16 @@ Level | Since | Description | xref:extensions/jaxb.adoc[JAXB] (camel-quarkus-jaxb) | Native + Stable | 1.0.0-M5 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard. -| xref:extensions/gson.adoc[JSon GSon] (camel-quarkus-gson) | Native + +| xref:extensions/gson.adoc[JSON Gson] (camel-quarkus-gson) | Native + Stable | 1.0.0-M4 | Marshal POJOs to JSON and back. -| xref:extensions/jackson.adoc[JSon Jackson] (camel-quarkus-jackson) | Native + +| xref:extensions/jackson.adoc[JSON Jackson] (camel-quarkus-jackson) | Native + Stable | 0.3.0 | Marshal POJOs to JSON and back. -| xref:extensions/johnzon.adoc[JSon Johnzon] (camel-quarkus-johnzon) | Native + +| xref:extensions/johnzon.adoc[JSON Johnzon] (camel-quarkus-johnzon) | Native + Stable | 1.0.0-M5 | Marshal POJOs to JSON and back. -| xref:extensions/xstream.adoc[JSon XStream] (camel-quarkus-xstream) | Native + +| xref:extensions/xstream.adoc[JSON XStream] (camel-quarkus-xstream) | Native + Stable | 1.0.0-M5 | Marshal POJOs to JSON and back. | xref:extensions/lzf.adoc[LZF Deflate Compression] (camel-quarkus-lzf) | Native + @@ -771,7 +771,7 @@ Number of miscellaneous extensions: 13 in 13 JAR artifacts (0 deprecated) | Extension | Target Level | Since | Description | xref:extensions/attachments.adoc[camel-quarkus-attachments] | Native + - Stable | 0.3.0 | Java Attachments support for Camel Message + Stable | 0.3.0 | Support for attachments on Camel messages | xref:extensions/caffeine-lrucache.adoc[camel-quarkus-caffeine-lrucache] | Native + Stable | 1.0.0-M5 | An LRUCacheFactory implementation based on Caffeine @@ -789,7 +789,7 @@ Number of miscellaneous extensions: 13 in 13 JAR artifacts (0 deprecated) Stable | 1.0.0-M3 | Write Camel integration routes in Kotlin | xref:extensions/microprofile-fault-tolerance.adoc[camel-quarkus-microprofile-fault-tolerance] | Native + - Stable | 1.0.0-M8 | Circuit Breaker EIP using Microprofile Fault Tolerance + Stable | 1.0.0-M8 | Circuit Breaker EIP using MicroProfile Fault Tolerance | xref:extensions/microprofile-health.adoc[camel-quarkus-microprofile-health] | Native + Stable | 0.3.0 | Bridging Eclipse MicroProfile Health with Camel health checks diff --git a/extensions-core/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml index 96baf06..31c31c2 100644 --- a/extensions-core/core/runtime/pom.xml +++ b/extensions-core/core/runtime/pom.xml @@ -103,6 +103,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-microprofile-config</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-health</artifactId> + </dependency> <dependency> <groupId>org.graalvm.nativeimage</groupId> diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java index bfe39a7..cfc7c8e 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java @@ -356,11 +356,6 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam } @Override - protected SupervisingRouteController createSupervisingRouteController() { - return new DefaultSupervisingRouteController(); - } - - @Override public void setTypeConverterRegistry(TypeConverterRegistry typeConverterRegistry) { super.setTypeConverterRegistry(typeConverterRegistry); diff --git a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java index f4ca33c..22e72c7 100644 --- a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java +++ b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointConfigurer.java @@ -19,6 +19,8 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { QuteEndpoint target = (QuteEndpoint) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "allowcontextmapall": + case "allowContextMapAll": target.setAllowContextMapAll(property(camelContext, boolean.class, value)); return true; case "allowtemplatefromheader": case "allowTemplateFromHeader": target.setAllowTemplateFromHeader(property(camelContext, boolean.class, value)); return true; case "basicpropertybinding": @@ -36,6 +38,7 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements @Override public Map<String, Object> getAllOptions(Object target) { Map<String, Object> answer = new CaseInsensitiveMap(); + answer.put("allowContextMapAll", boolean.class); answer.put("allowTemplateFromHeader", boolean.class); answer.put("basicPropertyBinding", boolean.class); answer.put("contentCache", boolean.class); @@ -49,6 +52,8 @@ public class QuteEndpointConfigurer extends PropertyConfigurerSupport implements public Object getOptionValue(Object obj, String name, boolean ignoreCase) { QuteEndpoint target = (QuteEndpoint) obj; switch (ignoreCase ? name.toLowerCase() : name) { + case "allowcontextmapall": + case "allowContextMapAll": return target.isAllowContextMapAll(); case "allowtemplatefromheader": case "allowTemplateFromHeader": return target.isAllowTemplateFromHeader(); case "basicpropertybinding": diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json index 6642da3..8a28402 100644 --- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json @@ -28,6 +28,7 @@ }, "properties": { "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a [...] + "allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context Map All", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a [...] "allowTemplateFromHeader": { "kind": "parameter", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the h [...] "contentCache": { "kind": "parameter", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether to use resource content cache or not" }, "encoding": { "kind": "parameter", "displayName": "Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Character encoding of the resource content." }, diff --git a/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java b/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java index 9da90a3..615f9c6 100644 --- a/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java +++ b/extensions/qute/component/src/main/java/org/apache/camel/component/qute/QuteEndpoint.java @@ -194,7 +194,7 @@ public class QuteEndpoint extends ResourceEndpoint { instance = template.instance(); } - ExchangeHelper.createVariableMap(exchange).forEach(instance::data); + ExchangeHelper.createVariableMap(exchange, isAllowContextMapAll()).forEach(instance::data); Map<String, Object> map = exchange.getIn().getHeader(QuteConstants.QUTE_TEMPLATE_DATA, Map.class); if (map != null) { diff --git a/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteEndpointTest.java b/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteEndpointTest.java index 0e3c8f1..b59ac99 100644 --- a/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteEndpointTest.java +++ b/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteEndpointTest.java @@ -27,6 +27,7 @@ public class QuteEndpointTest extends QuteTest { public void configure() throws Exception { QuteEndpoint endpoint = new QuteEndpoint(); endpoint.setCamelContext(context); + endpoint.setAllowContextMapAll(true); endpoint.setResourceUri("org/apache/camel/component/qute/example.txt"); context.addEndpoint("qut", endpoint); diff --git a/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteTest.java b/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteTest.java index fcaffc9..81d4752 100644 --- a/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteTest.java +++ b/extensions/qute/component/src/test/java/org/apache/camel/component/qute/QuteTest.java @@ -44,7 +44,7 @@ public class QuteTest extends QuteTestBase { protected RoutesBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("direct:a").to("qute:org/apache/camel/component/qute/example.txt"); + from("direct:a").to("qute:org/apache/camel/component/qute/example.txt?allowContextMapAll=true"); } }; } diff --git a/pom.xml b/pom.xml index be6393d..6915d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ <awssdk1.version>1.11.714</awssdk1.version> <awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version> <awssdk2.version>2.13.8</awssdk2.version> - <camel.version>3.3.0</camel.version> + <camel.version>3.4.0-SNAPSHOT</camel.version> <debezium.version>1.1.0.Final</debezium.version> <elasticsearch.version>7.6.1</elasticsearch.version> <freemarker.version>2.3.30</freemarker.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 79361a7..74a9cae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -578,6 +578,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-health</artifactId> + <version>${camel.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId> <version>${camel.version}</version> <exclusions>