You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2021/12/21 15:11:06 UTC
[camel] 06/09: Merge branch 'main' of github.com:apache/camel into main
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58225fcde58d459b9d7b93cd5128c3fc6bb78a9a
Merge: de13352 e653b81
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Nov 9 14:27:38 2021 -0500
Merge branch 'main' of github.com:apache/camel into main
camel-dependencies/pom.xml | 8 +-
.../catalog/components/atmosphere-websocket.json | 1 +
.../org/apache/camel/catalog/components/jetty.json | 1 +
.../main/camel-main-configuration-metadata.json | 1 +
components/camel-as2/camel-as2-api/pom.xml | 24 +++-
.../atmosphere/websocket/atmosphere-websocket.json | 1 +
.../camel/component/aws2/ddb/Ddb2Endpoint.java | 50 ++++---
.../camel-cbor/src/main/docs/cbor-dataformat.adoc | 2 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 2 +-
.../apache/camel/component/hl7/HL7DataFormat.java | 2 +-
.../src/main/docs/avro-jackson-dataformat.adoc | 2 +-
.../src/main/docs/protobuf-jackson-dataformat.adoc | 2 +-
.../jackson/AbstractJacksonDataFormat.java | 4 +-
.../camel/component/jackson/JacksonDataFormat.java | 2 +-
.../src/main/docs/jacksonxml-dataformat.adoc | 8 +-
.../component/jacksonxml/JacksonXMLDataFormat.java | 8 +-
.../jetty9/JettyHttpComponent9Configurer.java | 6 +
.../org/apache/camel/component/jetty9/jetty.json | 1 +
...t.java => JettyComponentMuteExceptionTest.java} | 10 +-
.../component/jetty/JettyMuteExceptionTest.java | 2 +-
.../src/main/docs/mongodb-component.adoc | 6 +-
.../component/optaplanner/OptaPlannerProducer.java | 69 ++++++----
.../camel/component/rabbitmq/RabbitConsumer.java | 73 ++++++----
.../camel/component/rabbitmq/RabbitMQConsumer.java | 46 +++++--
.../camel/component/rabbitmq/RabbitMQEndpoint.java | 9 ++
.../apache/camel/component/smpp/SmppConsumer.java | 83 ++++++------
.../component/SoroushBotAbstractConsumer.java | 19 +--
.../soroushbot/component/SoroushBotEndpoint.java | 103 ++++++++------
.../component/SoroushBotSendMessageProducer.java | 70 ++++++----
.../utils/ExponentialBackOffStrategy.java | 21 +--
.../soroushbot/utils/FixedBackOffStrategy.java | 13 +-
.../soroushbot/utils/LinearBackOffStrategy.java | 19 +--
.../component/splunk/support/SplunkDataReader.java | 28 ++--
.../zookeeper/cluster/ZooKeeperClusterView.java | 20 +--
...AtmosphereWebsocketComponentBuilderFactory.java | 18 +++
.../dsl/JettyComponentBuilderFactory.java | 17 +++
.../camel/support/cache/DefaultProducerCache.java | 40 +++---
.../apache/camel/support/task/BackgroundTask.java | 26 +++-
.../apache/camel/support/task/ForegroundTask.java | 4 +-
.../apache/camel/support/task/budget/Budget.java | 14 ++
.../apache/camel/support/task/budget/Budgets.java | 6 +
.../task/budget/IterationBoundedBudget.java | 17 ++-
.../task/budget/IterationBoundedBudgetBuilder.java | 15 ++-
.../camel/support/task/budget/IterationBudget.java | 16 +--
.../task/budget/IterationTimeBoundedBudget.java | 20 +--
.../budget/IterationTimeBoundedBudgetBuilder.java | 6 +
.../support/task/budget/TimeBoundedBudget.java | 22 +++
.../task/budget/backoff}/BackOffStrategy.java | 15 ++-
.../task/budget/backoff/FixedBackOffStrategy.java | 19 ++-
.../task/BackgroundIterationTimeTaskTest.java | 148 +++++++++++++++++++++
.../apache/camel/support/task/TaskTestSupport.java | 1 -
parent/pom.xml | 8 +-
.../test/infra/aws2/services/AWSContainer.java | 2 +-
.../nats/services/NatsLocalContainerService.java | 2 +-
.../solr/services/SolrLocalContainerService.java | 2 +-
55 files changed, 779 insertions(+), 355 deletions(-)