This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kin-shard in repository https://gitbox.apache.org/repos/asf/camel.git
discard b75436b7ac7 CAMEL-20958: camel-aws - Kinesis consumer loops on closed shards discard d4ade8a1761 CAMEL-20958: camel-aws - Kinesis consumer loops on closed shards omit b5b95c723c0 Less noisy logging omit dd5b97c5b8e Polished omit a1a7d275261 OpenTelemetry testing improvements (#15182) omit 495e62f28d5 chore(deps): Bump com.slack.api:slack-api-client from 1.40.3 to 1.41.0 (#15236) omit d85b62a9828 chore(deps): Bump org.apache.commons:commons-compress (#15235) omit f486801dffe CAMEL-21100: Fix azure-eventhubs configuration validation for credential type AZURE_IDENTITY omit 08955b8222a chore(deps): Bump io.github.classgraph:classgraph (#15234) omit f184dd13bde chore(deps): Bump org.springframework.amqp:spring-rabbit (#15233) omit 7c1f6330af7 chore(deps): Bump jython-version from 2.7.3 to 2.7.4 (#15232) omit c0781c299bc Camel 21097 (#15218) omit d6d041b36a3 Update generate-sbom-main.yml omit 37bf775f9da Update generate-sbom-main.yml omit 61a00d5d3f3 CAMEL-20804 - mark classes as deprecated in camel-api o.a.c.cloud package omit 43ec21cd788 chore(deps): Bump spring-security-version from 6.3.1 to 6.3.2 (#15225) omit 497a030045a Upgrade Vert.x to 4.5.9 (#15222) omit ec999c6ca21 CAMEL-21098: prevent incorrectly trying to reuse the same NamespacedHierarchicalStore omit 64f2406acfb CAMEL-21098: prevent double setup execution omit 1e6561ee2c6 chore(deps): Bump hapi-fhir-version from 7.2.2 to 7.4.0 omit fc70dacc14d CAMEL-21094 - Merge multiple PDF files (#15216) omit ef1eadab36a chore(deps): Bump io.github.ascopes:protobuf-maven-plugin omit 0bf732bda1c chore(deps-dev): Bump commons-logging:commons-logging omit 67e4445dcaa chore(deps): Bump aws-java-sdk2-version from 2.27.7 to 2.27.8 (#15224) omit 26a9aa91a2b (chores) convert core/camel-base-engine to use pattern matching for instanceof add 0768aa7ba10 CAMEL-20958: camel-aws - Kinesis consumer loops on closed shards add 783c45a0137 CAMEL-20958: camel-aws - Kinesis consumer loops on closed shards add 02f0d17db3f Regen This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b75436b7ac7) \ N -- N -- N refs/heads/kin-shard (02f0d17db3f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/generate-sbom-main.yml | 2 +- .../org/apache/camel/catalog/components/pdf.json | 5 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 40 +++-- .../camel/component/as2/api/AS2MicAlgorithm.java | 48 ++--- .../component/as2/api/AS2MicAlgorithmTest.java | 59 ------- .../camel/component/as2/api/util/MicUtilsTest.java | 43 +---- .../azure/eventhubs/EventHubsComponent.java | 8 +- .../azure/eventhubs/EventHubsComponentTest.java | 4 +- .../FromFileToFtpDefaultRootRenameStrategyIT.java | 2 + .../integration/FromFtpActivePortRangeIT.java | 2 + .../integration/FromFtpClientConfigRefIT.java | 2 + .../integration/FromFtpClientDataTimeoutIT.java | 2 + .../integration/FromFtpClientSoTimeout2IT.java | 2 + .../integration/FromFtpClientSoTimeoutIT.java | 2 + .../integration/FromFtpConsumerTemplateIT.java | 2 + .../FromFtpConsumerTemplateRollbackIT.java | 2 + .../remote/integration/FromFtpDeleteFileIT.java | 2 + .../FromFtpDoNotDeleteFileIfProcessFailsIT.java | 2 + .../integration/FromFtpKeepLastModifiedIT.java | 2 + .../FromFtpMoveFileAbsoluteFolderRecursiveIT.java | 2 + .../file/remote/integration/FromFtpMoveFileIT.java | 2 + .../integration/FromFtpMoveFilePostfixIT.java | 2 + .../integration/FromFtpMoveFilePrefixIT.java | 2 + .../integration/FromFtpMoveFileRecursiveIT.java | 2 + .../FromFtpMoveFileToHiddenFolderRecursiveIT.java | 2 + ...mFtpNoEndpointPathRelativeMoveToAbsoluteIT.java | 2 + .../file/remote/integration/FromFtpNoopIT.java | 2 + .../integration/FromFtpNoopIdempotentFalseIT.java | 2 + .../remote/integration/FromFtpNotDownloadIT.java | 2 + .../remote/integration/FromFtpPassiveModeIT.java | 2 + .../remote/integration/FromFtpPollFileOnlyIT.java | 2 + .../remote/integration/FromFtpPreMoveDeleteIT.java | 2 + .../FromFtpPreMoveFileExpressionIT.java | 2 + .../integration/FromFtpPreMoveFilePostfixIT.java | 2 + .../integration/FromFtpPreMoveFilePrefixIT.java | 2 + .../remote/integration/FromFtpPreMoveNoopIT.java | 2 + .../remote/integration/FromFtpRecursiveNoopIT.java | 2 + .../FromFtpRecursiveNotStepwiseNoBasePathIT.java | 2 + .../remote/integration/FromFtpRegexPatternIT.java | 2 + .../FromFtpRemoteFileFilterDirectoryIT.java | 2 + .../integration/FromFtpRemoteFileFilterIT.java | 2 + .../FromFtpRemoteFileSortByExpressionIT.java | 2 + ...mFtpRemoteFileSortByIgnoreCaseExpressionIT.java | 6 +- .../FromFtpRemoteFileSortByNestedExpressionIT.java | 2 + .../integration/FromFtpRemoteFileSorterIT.java | 2 + .../FromFtpServerLanguageCodeAndTimeoutIT.java | 2 + .../integration/FromFtpServerLanguageCodeIT.java | 2 + ...mpleNoEndpointPathRelativeMoveToAbsoluteIT.java | 2 + ...mpleNoEndpointPathRelativeMoveToRelativeIT.java | 2 + .../FromFtpSimpleRelativeMoveToAbsoluteIT.java | 2 + .../FromFtpSimpleRelativeMoveToRelativeIT.java | 2 + .../FromFtpStartingDirAndFileNameClashIT.java | 2 + .../remote/integration/FromFtpToAsciiFileIT.java | 2 + .../FromFtpToAsciiFileNoBodyConversionIT.java | 2 + .../remote/integration/FromFtpToBinaryFileIT.java | 2 + .../remote/integration/FromFtpToBinaryFilesIT.java | 2 + .../FromFtpToFileNoFileNameHeaderIT.java | 2 + .../integration/FromFtpTwoSlashesIssueIT.java | 2 + .../FromQueueThenConsumeFtpToMockIT.java | 2 + .../file/remote/integration/FtpAnonymousIT.java | 2 + .../FtpBadLoginMockNoopConnectionLeakIT.java | 2 + .../remote/integration/FtpBrowsableEndpointIT.java | 2 + .../integration/FtpConsumerAbsolutePathIT.java | 2 + .../integration/FtpConsumerAsyncStressIT.java | 2 + .../integration/FtpConsumerBodyAsStringIT.java | 2 + .../FtpConsumerDeleteNoWritePermissionIT.java | 2 + .../FtpConsumerDirectoriesNotMatchedIT.java | 2 + .../integration/FtpConsumerDisconnectIT.java | 2 + .../integration/FtpConsumerExcludeExtIT.java | 2 + .../integration/FtpConsumerExcludeNameIT.java | 2 + .../integration/FtpConsumerIPV6BodyAsStringIT.java | 2 + .../integration/FtpConsumerIncludeExtIT.java | 2 + .../integration/FtpConsumerIncludeNameIT.java | 2 + ...ConsumerLocalWorkDirectoryAsAbsolutePathIT.java | 2 + .../FtpConsumerLocalWorkDirectoryDirectIT.java | 2 + .../FtpConsumerLocalWorkDirectoryIT.java | 2 + .../FtpConsumerMultipleDirectoriesIT.java | 2 + .../FtpConsumerNotEagerMaxMessagesPerPollIT.java | 2 + .../integration/FtpConsumerRelativeFileNameIT.java | 2 + .../integration/FtpConsumerResumeDownloadIT.java | 2 + .../integration/FtpConsumerSkipDotFilesIT.java | 2 + .../remote/integration/FtpConsumerTemplateIT.java | 2 + .../FtpConsumerTemplateUseListFalseIT.java | 2 + .../FtpConsumerUsingFTPClientConfigIT.java | 2 + .../integration/FtpConsumerWithCharsetIT.java | 2 + .../integration/FtpConsumerWithNoFileOptionIT.java | 2 + ...FtpProducerAllowNullBodyFileAlreadyExistIT.java | 2 + .../integration/FtpProducerDisconnectIT.java | 2 + .../FtpProducerDisconnectOnBatchCompleteIT.java | 2 + .../integration/FtpProducerFileExistIgnoreIT.java | 2 + .../FtpProducerFileExistOverrideIT.java | 2 + .../integration/FtpProducerFileWithCharsetIT.java | 2 + .../integration/FtpProducerMoveExistingIT.java | 2 + .../integration/FtpShutdownCompleteAllTasksIT.java | 2 + .../FtpShutdownCompleteCurrentTaskOnlyIT.java | 2 + .../FtpSimpleConsumeStreamingStepwiseIT.java | 2 + .../SftpConsumerLocalWorkDirectoryIT.java | 2 + .../ToFtpTempFileTargetFileExistIT.java | 2 + .../integration/SftpProducerMoveExistingIT.java | 2 + .../SftpSimpleProduceThroughProxyIT.java | 10 +- components/camel-opentelemetry/pom.xml | 12 -- .../src/main/docs/opentelemetry.adoc | 8 +- .../camel/opentelemetry/OpenTelemetryTracer.java | 6 +- .../opentelemetry/CamelOpenTelemetryExtension.java | 195 --------------------- .../CamelOpenTelemetryTestSupport.java | 133 +++++++------- .../OpenTelemetryPropagateContextTest.java | 29 ++- ...lemetryTracingStrategyPropagateContextTest.java | 6 +- .../OpenTelemetryTracingStrategyTest.java | 4 +- .../apache/camel/opentelemetry/SpanTestData.java | 16 +- .../camel/opentelemetry/SpanTreePrinter.java | 99 ----------- .../src/test/resources/log4j2.properties | 19 +- .../org/apache/camel/component/pdf/pdf.json | 5 +- .../camel/component/pdf/PdfHeaderConstants.java | 8 - .../apache/camel/component/pdf/PdfOperation.java | 3 +- .../apache/camel/component/pdf/PdfProducer.java | 28 +-- .../apache/camel/component/pdf/PdfMergeTest.java | 92 ---------- .../test/junit5/util/CamelContextTestHelper.java | 14 +- .../apache/camel/tracing/ActiveSpanManager.java | 49 ++---- .../org/apache/camel/tracing/InjectAdapter.java | 7 - .../java/org/apache/camel/tracing/SpanAdapter.java | 25 +-- .../org/apache/camel/tracing/SpanDecorator.java | 8 +- .../main/java/org/apache/camel/tracing/Tag.java | 5 - .../main/java/org/apache/camel/tracing/Tracer.java | 30 ++-- .../tracing/decorators/AbstractSpanDecorator.java | 2 +- .../propagation/CamelHeadersExtractAdapter.java | 2 +- .../CamelMessagingHeadersExtractAdapter.java | 6 +- .../CamelMessagingHeadersInjectAdapter.java | 6 +- .../camel/tracing/ActiveSpanManagerTest.java | 26 +-- .../org/apache/camel/tracing/MockSpanAdapter.java | 18 +- .../apache/camel/cloud/DiscoverableService.java | 1 - .../apache/camel/cloud/ServiceCallConstants.java | 1 - .../org/apache/camel/cloud/ServiceChooser.java | 1 - .../apache/camel/cloud/ServiceChooserAware.java | 1 - .../apache/camel/cloud/ServiceChooserFactory.java | 1 - .../org/apache/camel/cloud/ServiceDefinition.java | 1 - .../org/apache/camel/cloud/ServiceDiscovery.java | 1 - .../apache/camel/cloud/ServiceDiscoveryAware.java | 1 - .../camel/cloud/ServiceDiscoveryFactory.java | 1 - .../camel/cloud/ServiceExpressionFactory.java | 1 - .../org/apache/camel/cloud/ServiceFactory.java | 1 - .../java/org/apache/camel/cloud/ServiceFilter.java | 1 - .../org/apache/camel/cloud/ServiceFilterAware.java | 1 - .../apache/camel/cloud/ServiceFilterFactory.java | 1 - .../java/org/apache/camel/cloud/ServiceHealth.java | 1 - .../apache/camel/cloud/ServiceLoadBalancer.java | 1 - .../camel/cloud/ServiceLoadBalancerFactory.java | 1 - .../camel/cloud/ServiceLoadBalancerFunction.java | 1 - .../org/apache/camel/cloud/ServiceRegistry.java | 1 - .../camel/impl/engine/AbstractCamelContext.java | 55 +++--- .../camel/impl/engine/AbstractDynamicRegistry.java | 8 +- .../impl/engine/BaseExecutorServiceManager.java | 30 ++-- .../impl/engine/BootstrapConfigurerResolver.java | 4 +- .../camel/impl/engine/CamelInternalProcessor.java | 12 +- .../impl/engine/CamelPostProcessorHelper.java | 11 +- .../impl/engine/DefaultCamelContextExtension.java | 4 +- .../apache/camel/impl/engine/DefaultChannel.java | 3 +- .../impl/engine/DefaultContextPluginManager.java | 4 +- .../camel/impl/engine/DefaultEndpointRegistry.java | 4 +- .../impl/engine/DefaultExecutorServiceManager.java | 5 +- .../impl/engine/DefaultPeriodTaskScheduler.java | 4 +- .../impl/engine/DefaultResourceResolvers.java | 12 +- .../org/apache/camel/impl/engine/DefaultRoute.java | 37 ++-- .../camel/impl/engine/DefaultRouteController.java | 4 +- .../camel/impl/engine/DefaultRoutesLoader.java | 13 +- .../engine/DefaultRuntimeEndpointRegistry.java | 12 +- .../engine/DefaultServiceBootstrapCloseable.java | 16 +- .../camel/impl/engine/DefaultShutdownStrategy.java | 12 +- .../impl/engine/DefaultTransformerRegistry.java | 4 +- .../camel/impl/engine/DefaultUnitOfWork.java | 9 +- .../impl/engine/DeferServiceStartupListener.java | 3 +- .../impl/engine/InternalRouteStartupManager.java | 12 +- .../camel/impl/engine/InternalServiceManager.java | 27 +-- .../camel/impl/engine/IntrospectionSupport.java | 4 +- .../org/apache/camel/impl/engine/RouteService.java | 36 ++-- .../camel/impl/engine/SimpleCamelContext.java | 4 +- .../camel/impl/engine/StreamCachingHelper.java | 3 +- .../dsl/Aws2KinesisComponentBuilderFactory.java | 10 +- .../builder/endpoint/StaticEndpointBuilders.java | 8 +- .../endpoint/dsl/PdfEndpointBuilderFactory.java | 21 +-- parent/pom.xml | 24 ++- 180 files changed, 663 insertions(+), 1037 deletions(-) delete mode 100644 components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MicAlgorithmTest.java delete mode 100644 components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryExtension.java delete mode 100644 components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTreePrinter.java delete mode 100644 components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfMergeTest.java