This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 50a0947262d [create-pull-request] automated change
50a0947262d is described below
commit 50a0947262d4dd321398021d5b63893898a531d2
Author: oscerd <[email protected]>
AuthorDate: Fri Feb 10 01:06:26 2023 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/spring-rabbitmq.json | 6 ++++--
.../camel/springboot/catalog/components/vertx-websocket.json | 4 +++-
components-starter/camel-google-pubsub-starter/pom.xml | 8 --------
core/camel-spring-boot/src/main/docs/spring-boot.json | 5 +++++
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
index 4cfe8747e67..20302044760 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-rabbitmq.json
@@ -76,7 +76,7 @@
"noLocal": { "kind": "parameter", "displayName": "No Local", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Set to true for an no-local
consumer" },
"queues": { "kind": "parameter", "displayName": "Queues", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The queue(s) to use for consuming messages.
Multiple queue names can be separated by comma. If none has been configured
then Camel will generate an unique id as the queue name for the consumer." },
"rejectAndDontRequeue": { "kind": "parameter", "displayName": "Reject And
Dont Requeue", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether a
Rabbitmq consumer should reject the message without requeuing. This enables
failed messages to be sent to a Dead Letter Exchange\/Queue, if the broker is
so configured." },
- "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in msec a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
+ "retryDelay": { "kind": "parameter", "displayName": "Retry Delay",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1000, "description": "Delay in millis a Rabbitmq consumer will
wait before redelivering a message that Camel failed to process" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "integer", "javaType": "java.lang.Integer",
"deprecated": false, "autowired": false, "secret": false, "description": "The
number of consumers" },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
@@ -85,7 +85,9 @@
"messageListenerContainerType": { "kind": "parameter", "displayName":
"Message Listener Container Type", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "DMLC", "SMLC" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "DMLC", "description":
"The type of the MessageListenerContainer" },
"prefetchCount": { "kind": "parameter", "displayName": "Prefetch Count",
"group": "consumer (advanced)", "label": "consumer,advanced", "required":
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "description": "Tell the broker how many
messages to send in a single request. Often this can be set quite high to
improve throughput." },
"retry": { "kind": "parameter", "displayName": "Retry", "group": "consumer
(advanced)", "label": "consumer,advanced", "required": false, "type": "object",
"javaType": "org.springframework.retry.interceptor.RetryOperationsInterceptor",
"deprecated": false, "autowired": false, "secret": false, "description":
"Custom retry configuration to use. If this is configured then the other
settings such as maximumRetryAttempts for retry are not in use." },
- "replyTimeout": { "kind": "parameter", "displayName": "Reply Timeout",
"group": "producer", "label": "producer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "5000", "description": "Specify the timeout in
milliseconds to be used when waiting for a reply message when doing
request\/reply messaging. The default value is 5 seconds. A negative value
indicates an indefinite timeout." },
+ "confirm": { "kind": "parameter", "displayName": "Confirm", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "auto", "enabled", "disabled" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"auto", "description": "Controls whether to wait for confirms. The connection
factory must be configured for publisher confirms and this method. auto = Camel
detects if the connection factory uses con [...]
+ "confirmTimeout": { "kind": "parameter", "displayName": "Confirm Timeout",
"group": "producer", "label": "producer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "5000", "description": "Specify the timeout in
milliseconds to be used when waiting for a message sent to be confirmed by
RabbitMQ when doing send only messaging (InOnly). The default value is 5
seconds. A negative value indicates an inde [...]
+ "replyTimeout": { "kind": "parameter", "displayName": "Reply Timeout",
"group": "producer", "label": "producer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "5000", "description": "Specify the timeout in
milliseconds to be used when waiting for a reply message when doing
request\/reply (InOut) messaging. The default value is 5 seconds. A negative
value indicates an indefinite timeout." },
"usePublisherConnection": { "kind": "parameter", "displayName": "Use
Publisher Connection", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "Use
a separate connection for publishers and consumers" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer (advanced)", "label": "producer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether the producer should be started lazy (on the first
message). By starting lazy you can use this to allow CamelContext and routes to
startup in situations where a producer may other [...]
"args": { "kind": "parameter", "displayName": "Args", "group": "advanced",
"label": "advanced", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "prefix": "arg.",
"multiValue": true, "deprecated": false, "autowired": false, "secret": false,
"description": "Specify arguments for configuring the different RabbitMQ
concepts, a different prefix is required for each element: arg.consumer.
arg.exchange. arg.queue. arg.binding. arg.dlq.ex [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
index b5efbb675b3..1c3c6bb45f4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
@@ -33,7 +33,8 @@
"headers": {
"CamelVertxWebsocket.connectionKey": { "kind": "header", "displayName":
"", "group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Sends the message to the client with the given
connection key. You can use a comma separated list of keys to send a message to
multiple clients", "constantName":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#CONNECTION_KEY"
},
"CamelVertxWebsocket.sendToAll": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Sends the message to all clients which are
currently connected. You can use the sendToAll option on the endpoint instead
of using this header.", "constantName":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#SEND_T [...]
- "CamelVertxWebsocket.remoteAddress": { "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"io.vertx.core.net.SocketAddress", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The remote address.",
"constantName":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#REMOTE_ADDRESS"
}
+ "CamelVertxWebsocket.remoteAddress": { "kind": "header", "displayName":
"", "group": "consumer", "label": "consumer", "required": false, "javaType":
"io.vertx.core.net.SocketAddress", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The remote address.",
"constantName":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#REMOTE_ADDRESS"
},
+ "CamelVertxWebsocket.event": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"org.apache.camel.component.vertx.websocket.VertxWebsocketEvent", "enum": [
"CLOSE", "ERROR", "MESSAGE", "OPEN" ], "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "The WebSocket event
that triggered the message exchange.", "constantName":
"org.apache.camel.component.vertx.websocket.VertxWebsocketCo [...]
},
"properties": {
"host": { "kind": "path", "displayName": "Host", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket hostname, such
as localhost or a remote host when in client mode." },
@@ -41,6 +42,7 @@
"path": { "kind": "path", "displayName": "Path", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket path to use."
},
"allowedOriginPattern": { "kind": "parameter", "displayName": "Allowed
Origin Pattern", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Regex pattern to match
the origin header sent by WebSocket clients" },
"consumeAsClient": { "kind": "parameter", "displayName": "Consume As
Client", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When set to true, the
consumer acts as a WebSocket client, creating exchang [...]
+ "fireWebSocketConnectionEvents": { "kind": "parameter", "displayName":
"Fire Web Socket Connection Events", "group": "consumer", "label": "consumer",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Whether the server
consumer will create a mes [...]
"maxReconnectAttempts": { "kind": "parameter", "displayName": "Max
Reconnect Attempts", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the maximum number of allow [...]
"reconnectInitialDelay": { "kind": "parameter", "displayName": "Reconnect
Initial Delay", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 0, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the initial delay in mill [...]
"reconnectInterval": { "kind": "parameter", "displayName": "Reconnect
Interval", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1000, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the interval in milliseconds at [...]
diff --git a/components-starter/camel-google-pubsub-starter/pom.xml
b/components-starter/camel-google-pubsub-starter/pom.xml
index 67aba874033..219262ceac2 100644
--- a/components-starter/camel-google-pubsub-starter/pom.xml
+++ b/components-starter/camel-google-pubsub-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index 92cd01c701b..f8bf8659a7d 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -519,6 +519,11 @@
"sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
"defaultValue": false
},
+ {
+ "name": "camel.springboot.backlog-tracing-standby",
+ "type": "java.lang.Boolean",
+ "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
+ },
{
"name": "camel.springboot.bean-introspection-extended-statistics",
"type": "java.lang.Boolean",
