You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2023/03/07 17:23:58 UTC
[camel] 02/10: Merge branch 'main' of github.com:apache/camel
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch jbang-user-config
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41142503893b22530e243d3e04e81a5893d283bf
Merge: e390430d372 ce1fb3749ff
Author: Croway <fe...@gmail.com>
AuthorDate: Mon Mar 6 15:45:21 2023 +0100
Merge branch 'main' of github.com:apache/camel
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../run-it/archetype.properties | 0
.../run-it/goal.txt | 0
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../run-it/archetype.properties | 0
.../run-it/goal.txt | 0
.../build-it/archetype.properties | 0
.../build-it/goal.txt | 0
.../run-it/archetype.properties | 0
.../run-it/goal.txt | 0
camel-dependencies/pom.xml | 8 +-
catalog/camel-csimple-maven-plugin/pom.xml | 1 +
catalog/camel-report-maven-plugin/pom.xml | 1 +
components/camel-atom/pom.xml | 2 +
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 6 -
.../SecretsManagerClientHealthCheck.java | 6 -
.../aws2/athena/Athena2ClientHealthCheck.java | 6 -
.../component/aws2/cw/Cw2ClientHealthCheck.java | 6 -
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 6 -
.../ddbstream/Ddb2StreamConsumerHealthCheck.java | 6 -
.../component/aws2/ec2/AWS2EC2HealthCheck.java | 6 -
.../component/aws2/ecs/ECS2ClientHealthCheck.java | 6 -
.../component/aws2/eks/EKS2ClientHealthCheck.java | 6 -
.../eventbridge/EventbridgeClientHealthCheck.java | 6 -
.../camel/component/aws2/iam/IAM2HealthCheck.java | 6 -
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 6 -
.../aws2/lambda/Lambda2ClientHealthCheck.java | 6 -
.../component/aws2/mq/MQ2ClientHealthCheck.java | 6 -
.../camel/component/aws2/msk/MSK2HealthCheck.java | 6 -
.../aws2/s3/AWS2S3ConsumerHealthCheck.java | 6 -
.../camel/component/aws2/ses/Ses2HealthCheck.java | 6 -
.../camel/component/aws2/sns/Sns2HealthCheck.java | 6 -
.../aws2/sqs/Sqs2ConsumerHealthCheck.java | 6 -
.../translate/Translate2ClientHealthCheck.java | 6 -
.../GoogleCloudStorageConsumerHealthCheck.java | 6 -
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 99 ++++-----------
components/camel-jpa/pom.xml | 1 +
.../component/kafka/KafkaConsumerHealthCheck.java | 6 -
.../component/kafka/KafkaProducerHealthCheck.java | 6 -
.../src/main/docs/micrometer-component.adoc | 18 +++
.../DistributionStatisticConfigFilter.java | 7 +-
.../component/micrometer/MicrometerConstants.java | 1 +
.../routepolicy/MicrometerRoutePolicy.java | 134 +++++++++++++++------
.../MicrometerRoutePolicyConfiguration.java | 107 ++++++++++++++++
.../routepolicy/MicrometerRoutePolicyFactory.java | 10 ++
.../MicrometerRoutePolicyNamingStrategy.java | 14 +--
.../messagehistory/ManagedMessageHistoryTest.java | 15 ++-
.../AbstractMicrometerRoutePolicyTest.java | 7 +-
.../MicrometerRoutePolicyConfigrationTest.java | 80 ++++++++++++
.../SharedMicrometerRoutePolicyTest.java | 70 +++++++++++
components/camel-quartz/pom.xml | 1 +
components/camel-zendesk/pom.xml | 1 +
.../java/org/apache/camel/health/HealthCheck.java | 8 +-
.../impl/health/ReadinessAndLivenessTest.java | 20 +++
.../camel/impl/health/ContextHealthCheck.java | 4 +-
.../apache/camel/impl/health/RouteHealthCheck.java | 6 -
.../support/ScheduledPollConsumerHealthCheck.java | 2 +-
.../apache/camel/util/xml/XmlPrettyPrinter.java | 3 +
.../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc | 7 ++
.../ROOT/pages/camel-4-migration-guide.adoc | 8 ++
parent/pom.xml | 49 +-------
pom.xml | 2 +-
tooling/maven/camel-maven-plugin/pom.xml | 1 +
71 files changed, 500 insertions(+), 325 deletions(-)