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:05 UTC
[camel] 05/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 de13352d3f51bac4cbf3d3c8064e3423b8e989f1
Merge: 4878a95 eccd04c
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Nov 5 10:17:50 2021 -0400
Merge branch 'main' of github.com:apache/camel into main
camel-dependencies/pom.xml | 16 ++--
.../camel/catalog/components/netty-http.json | 1 +
.../apache/camel/catalog/components/resteasy.json | 1 +
.../apache/camel/catalog/components/servlet.json | 1 +
.../apache/camel/catalog/components/undertow.json | 2 +-
.../camel/http/common/DefaultHttpBinding.java | 2 +-
.../camel/http/common/HttpCommonComponent.java | 15 ++++
.../apache/camel/component/http/HttpComponent.java | 2 +
.../camel/component/jetty/JettyHttpComponent.java | 2 +
...CamelMicroProfileHealthCheckRepositoryTest.java | 2 +
...va => CamelMicroProfileHealthConsumerTest.java} | 18 +++--
.../camel/component/mllp/MllpCharsetHelper.java | 20 ++---
.../netty/http/NettyHttpComponentConfigurer.java | 6 ++
.../camel/component/netty/http/netty-http.json | 1 +
.../netty/http/DefaultNettyHttpBinding.java | 5 +-
.../component/netty/http/NettyHttpComponent.java | 16 ++++
...va => NettyHttpComponentMuteExceptionTest.java} | 9 ++-
.../netty/http/NettyHttpMuteExceptionTest.java | 2 +-
.../resteasy/ResteasyComponentConfigurer.java | 6 ++
.../apache/camel/component/resteasy/resteasy.json | 1 +
.../servlet/ServletComponentConfigurer.java | 6 ++
.../apache/camel/component/servlet/servlet.json | 1 +
.../camel/component/servlet/ServletComponent.java | 6 +-
.../servlet/ServletCamelRouterTestSupport.java | 16 ++--
...java => ServletComponentMuteExceptionTest.java} | 13 +--
.../servlet/ServletMuteExceptionTest.java | 4 +-
...sumerHealthCheckErrorDisabledConsumerTest.java} | 38 ++++-----
.../TelegramConsumerHealthCheckErrorTest.java | 11 +--
.../TelegramConsumerHealthCheckOkTest.java | 7 +-
.../apache/camel/component/undertow/undertow.json | 2 +-
.../component/undertow/UndertowComponent.java | 5 +-
.../camel/component/undertow/UndertowConsumer.java | 3 +-
.../camel/component/undertow/UndertowEndpoint.java | 3 +-
...ava => UndertowComponentMuteExceptionTest.java} | 13 +--
.../undertow/UndertowMuteExceptionTest.java | 4 +-
.../undertow/rest/RestUndertowContentTypeTest.java | 2 +-
.../camel/impl/engine/DefaultReactiveExecutor.java | 2 +-
.../dsl/NettyHttpComponentBuilderFactory.java | 17 ++++
.../dsl/ResteasyComponentBuilderFactory.java | 17 ++++
.../dsl/ServletComponentBuilderFactory.java | 17 ++++
.../docs/modules/eips/pages/aggregate-eip.adoc | 10 +++
.../processor/aggregate/AggregateProcessor.java | 4 +
.../BodyInPreCompleteSizeAggregatingStrategy.java | 54 +++++++++++++
.../aggregator/AggregatePreCompleteSizeTest.java | 53 ++++++++++++
.../dsl/UndertowEndpointBuilderFactory.java | 94 +++++++++++-----------
.../apache/camel/consumers-health-check-repository | 2 +
.../camel/impl/health/AbstractHealthCheck.java | 15 +++-
.../camel/impl/health/ConsumerHealthCheck.java | 70 ++++++++++++++++
...ry.java => ConsumersHealthCheckRepository.java} | 30 ++++---
.../camel/impl/health/ContextHealthCheck.java | 3 +-
.../apache/camel/impl/health/RouteHealthCheck.java | 51 ++++--------
.../impl/health/RoutesHealthCheckRepository.java | 1 +
.../HealthConfigurationPropertiesConfigurer.java | 6 ++
.../camel-main-configuration-metadata.json | 1 +
core/camel-main/src/main/docs/main.adoc | 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 24 ++++--
.../camel/main/HealthConfigurationProperties.java | 13 +++
.../apache/camel/support/LazyStartProducer.java | 9 ++-
.../apache/camel/converter/jaxp/StaxConverter.java | 33 ++------
.../ROOT/pages/camel-3x-upgrade-guide-3_13.adoc | 7 ++
.../modules/ROOT/pages/health-check.adoc | 37 +++++++--
parent/pom.xml | 31 ++-----
62 files changed, 602 insertions(+), 264 deletions(-)