This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 545dd653583 [create-pull-request] automated change (#1988)
545dd653583 is described below
commit 545dd65358365348b77195952381090de0d73f45
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Sep 19 07:22:03 2026 +0200
[create-pull-request] automated change (#1988)
Co-authored-by: oscerd <[email protected]>
---
.../springboot/catalog/components/elasticsearch.json | 6 +++---
.../camel/springboot/catalog/components/opensearch.json | 6 +++---
.../springboot/catalog/dev-consoles/resilience4j.json | 15 +++++++++++++++
.../src/main/docs/elasticsearch.json | 16 +++++++++-------
.../springboot/ElasticsearchComponentConfiguration.java | 5 +++++
.../src/main/docs/opensearch.json | 16 +++++++++-------
.../springboot/OpensearchComponentConfiguration.java | 5 +++++
.../modules/ROOT/pages/starters/elasticsearch.adoc | 2 +-
.../modules/ROOT/pages/starters/opensearch.adoc | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 8 ++++----
10 files changed, 55 insertions(+), 26 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
index f6bd6fd06fb..21346a4936d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch.json
@@ -28,7 +28,7 @@
"enableDocumentOnlyMode": { "index": 1, "kind": "property", "displayName":
"Enable Document Only Mode", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Indicates whether the body of the message contains only documents. By default,
it is set to false to be able to do the same requests as what the Document API
supports (see https:\/\/www.elasti [...]
"hostAddresses": { "index": 2, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Comma separated list with ip:port
formatted remote transport addresses to use. The ip and port options must be
left blank for hostAddresses to be considered instead." },
"lazyStartProducer": { "index": 3, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "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 otherwise fail [...]
- "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 4, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 5, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 6, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 7, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.elasticsearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured Elasticsearch client, instead of creating a client per endpoint.
This allows customizing the client with specific settings." },
@@ -48,7 +48,7 @@
"CamelElasticsearchIndexName": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of the index to act against",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_INDEX_NAME" },
"CamelElasticsearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_DOCUMENT_CLASS" },
"CamelElasticsearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelElasticsearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which Elasticsearch
will keep the search context alive", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelElasticsearchUseScroll": { "index": 6, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set to true to enable scroll usage",
"constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SCROLL" },
"CamelElasticsearchSize": { "index": 7, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_SIZE" },
"CamelElasticsearchFrom": { "index": 8, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.es.ElasticsearchConstants#PARAM_FROM" },
@@ -62,7 +62,7 @@
"from": { "index": 4, "kind": "parameter", "displayName": "From", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 5, "kind": "parameter", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 6, "kind": "parameter", "displayName": "Index
Name", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 7, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 7, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client and is [...]
"operation": { "index": 8, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType": "org.apache.camel.component.es.ElasticsearchOperation",
"enum": [ "Index", "Update", "Bulk", "GetById", "MultiGet", "MultiSearch",
"Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration", "conf [...]
"scrollKeepAliveMs": { "index": 9, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
elasticsearch will keep search context alive" },
"size": { "index": 10, "kind": "parameter", "displayName": "Size",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.es.ElasticsearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/opensearch.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/opensearch.json
index bd1601b01c2..5459133a277 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/opensearch.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/opensearch.json
@@ -27,7 +27,7 @@
"connectionTimeout": { "index": 0, "kind": "property", "displayName":
"Connection Timeout", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms to wait
before connection will time out." },
"hostAddresses": { "index": 1, "kind": "property", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Comma separated list with ip:port
formatted remote transport addresses to use. The ip and port options must be
left blank for hostAddresses to be considered instead." },
"lazyStartProducer": { "index": 2, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "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 otherwise fail [...]
- "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 3, "kind": "property", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "description": "The time in ms before retry" },
"socketTimeout": { "index": 4, "kind": "property", "displayName": "Socket
Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "description": "The timeout in ms to
wait before the socket will time out." },
"autowiredEnabled": { "index": 5, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"client": { "index": 6, "kind": "property", "displayName": "Client",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.opensearch.client.RestClient", "deprecated": false,
"autowired": true, "secret": false, "description": "To use an existing
configured OpenSearch client, instead of creating a client per endpoint. This
allows customizing the client with specific settings." },
@@ -47,7 +47,7 @@
"CamelOpensearchIndexName": { "index": 2, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the index to act against", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_INDEX_NAME" },
"CamelOpensearchDocumentClass": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Class", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "ObjectNode", "description": "The full
qualified name of the class of the document to unmarshall", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_DOCUMENT_CLASS"
},
"CamelOpensearchWaitForActiveShards": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The index creation waits for the write
consistency number of shards to be available", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_WAIT_FOR_ACTIVE_SHARDS"
},
- "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The starting index of the response.",
"constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
+ "CamelOpensearchScrollKeepAliveMs": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Time in ms during which OpenSearch will
keep the search context alive", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SCROLL_KEEP_ALIVE_MS"
},
"CamelOpensearchUseScroll": { "index": 6, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType": "Boolean",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Set to true to enable scroll usage. When enabled, the
body is returned as a OpensearchScrollRequestIterator. Make sure to use the
stream and close it accordingly to avoid potential resource leaks.",
"constantName": "org.apache.camel.com [...]
"CamelOpensearchSize": { "index": 7, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The size of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_SIZE" },
"CamelOpensearchFrom": { "index": 8, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "Integer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The starting index of the response.", "constantName":
"org.apache.camel.component.opensearch.OpensearchConstants#PARAM_FROM" }
@@ -59,7 +59,7 @@
"from": { "index": 3, "kind": "parameter", "displayName": "From", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Starting index of the
response." },
"hostAddresses": { "index": 4, "kind": "parameter", "displayName": "Host
Addresses", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Comma separated list
with ip:port formatted remote transport addresses to use." },
"indexName": { "index": 5, "kind": "parameter", "displayName": "Index
Name", "group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The name of the index to
act against" },
- "maxRetryTimeout": { "index": 6, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "The time in ms before
retry" },
+ "maxRetryTimeout": { "index": 6, "kind": "parameter", "displayName": "Max
Retry Timeout", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": true, "autowired": false, "secret":
false, "defaultValue": 30000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Deprecated: this option
has no effect. It was used by the old low-level REST client a [...]
"operation": { "index": 7, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": false, "type":
"enum", "javaType":
"org.apache.camel.component.opensearch.OpensearchOperation", "enum": [ "Index",
"Update", "Bulk", "GetById", "MultiGet", "MultiSearch", "Delete",
"DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfigurati [...]
"scrollKeepAliveMs": { "index": 8, "kind": "parameter", "displayName":
"Scroll Keep Alive Ms", "group": "producer", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 60000, "configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Time in ms during which
OpenSearch will keep search context alive" },
"size": { "index": 9, "kind": "parameter", "displayName": "Size", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.opensearch.OpensearchConfiguration",
"configurationField": "configuration", "description": "Size of the response." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/resilience4j.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/resilience4j.json
index 3521b0e1044..375a4ca32ad 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/resilience4j.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dev-consoles/resilience4j.json
@@ -48,6 +48,18 @@
"type": "integer",
"description": "The number of not permitted calls"
},
+ "fallbackCalls": {
+ "type": "integer",
+ "description": "The number of calls answered by the onFallback"
+ },
+ "timedOutCalls": {
+ "type": "integer",
+ "description": "The number of calls that timed out"
+ },
+ "bulkheadRejectedCalls": {
+ "type": "integer",
+ "description": "The number of calls rejected because the
bulkhead was full"
+ },
"failureRate": {
"type": "number",
"description": "The failure rate in percentage"
@@ -127,6 +139,9 @@
"successfulCalls",
"failedCalls",
"notPermittedCalls",
+ "fallbackCalls",
+ "timedOutCalls",
+ "bulkheadRejectedCalls",
"failureRate"
]
},
diff --git
a/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
b/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
index 26e791058ec..0f60c237e43 100644
---
a/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
+++
b/components-starter/camel-elasticsearch-starter/src/main/docs/elasticsearch.json
@@ -84,13 +84,6 @@
"sourceType":
"org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration",
"defaultValue": false
},
- {
- "name": "camel.component.elasticsearch.max-retry-timeout",
- "type": "java.lang.Integer",
- "description": "The time in ms before retry",
- "sourceType":
"org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration",
- "defaultValue": 30000
- },
{
"name": "camel.component.elasticsearch.password",
"type": "java.lang.String",
@@ -136,6 +129,15 @@
"type": "java.lang.String",
"description": "Basic authenticate user",
"sourceType":
"org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration"
+ },
+ {
+ "name": "camel.component.elasticsearch.max-retry-timeout",
+ "type": "java.lang.Integer",
+ "description": "The time in ms before retry",
+ "sourceType":
"org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration",
+ "defaultValue": 30000,
+ "deprecated": true,
+ "deprecation": {}
}
],
"hints": [],
diff --git
a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
index ef0bd01d298..7d297e41465 100644
---
a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
+++
b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentConfiguration.java
@@ -20,6 +20,7 @@ import
org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.elasticsearch.client.RestClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* Send requests to Elasticsearch via Java Client API.
@@ -70,6 +71,7 @@ public class ElasticsearchComponentConfiguration
/**
* The time in ms before retry
*/
+ @Deprecated
private Integer maxRetryTimeout = 30000;
/**
* The timeout in ms to wait before the socket will time out.
@@ -167,10 +169,13 @@ public class ElasticsearchComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ @Deprecated
+ @DeprecatedConfigurationProperty
public Integer getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(Integer maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git
a/components-starter/camel-opensearch-starter/src/main/docs/opensearch.json
b/components-starter/camel-opensearch-starter/src/main/docs/opensearch.json
index 21a2c12198c..b0980bc0ca0 100644
--- a/components-starter/camel-opensearch-starter/src/main/docs/opensearch.json
+++ b/components-starter/camel-opensearch-starter/src/main/docs/opensearch.json
@@ -71,13 +71,6 @@
"sourceType":
"org.apache.camel.component.opensearch.springboot.OpensearchComponentConfiguration",
"defaultValue": false
},
- {
- "name": "camel.component.opensearch.max-retry-timeout",
- "type": "java.lang.Integer",
- "description": "The time in ms before retry",
- "sourceType":
"org.apache.camel.component.opensearch.springboot.OpensearchComponentConfiguration",
- "defaultValue": 30000
- },
{
"name": "camel.component.opensearch.open-search-client",
"type": "org.opensearch.client.opensearch.OpenSearchClient",
@@ -129,6 +122,15 @@
"type": "java.lang.String",
"description": "Basic authenticate user",
"sourceType":
"org.apache.camel.component.opensearch.springboot.OpensearchComponentConfiguration"
+ },
+ {
+ "name": "camel.component.opensearch.max-retry-timeout",
+ "type": "java.lang.Integer",
+ "description": "The time in ms before retry",
+ "sourceType":
"org.apache.camel.component.opensearch.springboot.OpensearchComponentConfiguration",
+ "defaultValue": 30000,
+ "deprecated": true,
+ "deprecation": {}
}
],
"hints": [],
diff --git
a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConfiguration.java
b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConfiguration.java
index bd3018ab5e3..8d0903b4927 100644
---
a/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConfiguration.java
+++
b/components-starter/camel-opensearch-starter/src/main/java/org/apache/camel/component/opensearch/springboot/OpensearchComponentConfiguration.java
@@ -21,6 +21,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.opensearch.client.RestClient;
import org.opensearch.client.opensearch.OpenSearchClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* Send requests to OpenSearch via Java Client API.
@@ -61,6 +62,7 @@ public class OpensearchComponentConfiguration
/**
* The time in ms before retry
*/
+ @Deprecated
private Integer maxRetryTimeout = 30000;
/**
* The timeout in ms to wait before the socket will time out.
@@ -151,10 +153,13 @@ public class OpensearchComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ @Deprecated
+ @DeprecatedConfigurationProperty
public Integer getMaxRetryTimeout() {
return maxRetryTimeout;
}
+ @Deprecated
public void setMaxRetryTimeout(Integer maxRetryTimeout) {
this.maxRetryTimeout = maxRetryTimeout;
}
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/elasticsearch.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/elasticsearch.adoc
index f81c06c030f..c39111bca34 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/elasticsearch.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/elasticsearch.adoc
@@ -38,7 +38,6 @@ The starter supports 18 options, which are listed below.
| camel.component.elasticsearch.enabled | Whether to enable auto configuration
of the elasticsearch component. This is enabled by default. | | Boolean
| camel.component.elasticsearch.host-addresses | Comma separated list with
ip:port formatted remote transport addresses to use. The ip and port options
must be left blank for hostAddresses to be considered instead. | | String
| camel.component.elasticsearch.lazy-start-producer | 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 otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processe [...]
-| camel.component.elasticsearch.max-retry-timeout | The time in ms before
retry | 30000 | Integer
| camel.component.elasticsearch.password | Password for authenticating | |
String
| camel.component.elasticsearch.sniff-after-failure-delay | The delay of a
sniff execution scheduled after a failure (in milliseconds) | 60000 | Integer
| camel.component.elasticsearch.sniffer-interval | The interval between
consecutive ordinary sniff executions in milliseconds. Will be honoured when
sniffOnFailure is disabled or when there are no failures between consecutive
sniff executions | 300000 | Integer
@@ -46,4 +45,5 @@ The starter supports 18 options, which are listed below.
| camel.component.elasticsearch.ssl-context-parameters | To configure security
using SSLContextParameters. When configured, this takes precedence over the
certificatePath option. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | |
SSLContextParameters
| camel.component.elasticsearch.use-global-ssl-context-parameters | Enable
usage of global SSL context parameters. | false | Boolean
| camel.component.elasticsearch.user | Basic authenticate user | | String
+| camel.component.elasticsearch.max-retry-timeout | The time in ms before
retry | 30000 | Integer
|===
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/opensearch.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/opensearch.adoc
index 03012d4aaf9..4deb740b187 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/opensearch.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/opensearch.adoc
@@ -36,7 +36,6 @@ The starter supports 17 options, which are listed below.
| camel.component.opensearch.enabled | Whether to enable auto configuration of
the opensearch component. This is enabled by default. | | Boolean
| camel.component.opensearch.host-addresses | Comma separated list with
ip:port formatted remote transport addresses to use. The ip and port options
must be left blank for hostAddresses to be considered instead. | | String
| camel.component.opensearch.lazy-start-producer | 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
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed t [...]
-| camel.component.opensearch.max-retry-timeout | The time in ms before retry |
30000 | Integer
| camel.component.opensearch.open-search-client | To use a custom configured
OpenSearchClient instance. When set, this takes precedence over the
RestClient-based client option. The option is a
org.opensearch.client.opensearch.OpenSearchClient type. | | OpenSearchClient
| camel.component.opensearch.password | Password for authenticating | | String
| camel.component.opensearch.sniff-after-failure-delay | The delay of a sniff
execution scheduled after a failure (in milliseconds) | 60000 | Integer
@@ -45,4 +44,5 @@ The starter supports 17 options, which are listed below.
| camel.component.opensearch.ssl-context-parameters | To configure security
using SSLContextParameters. When configured, this takes precedence over the
certificatePath option. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | |
SSLContextParameters
| camel.component.opensearch.use-global-ssl-context-parameters | Enable usage
of global SSL context parameters. | false | Boolean
| camel.component.opensearch.user | Basic authenticate user | | String
+| camel.component.opensearch.max-retry-timeout | The time in ms before retry |
30000 | Integer
|===
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index b6b4b470eb1..cb93e7c0096 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>tablestore</artifactId>
- <version>5.17.13</version>
+ <version>5.17.14</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>com.openai</groupId>
<artifactId>openai-java</artifactId>
- <version>4.63.1</version>
+ <version>4.63.2</version>
</dependency>
<dependency>
<groupId>eu.maveniverse.maven.mima.runtime</groupId>
@@ -310,12 +310,12 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.18.13</version>
+ <version>1.18.14</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.18.13</version>
+ <version>1.18.14</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
