This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit f2ca28a0f3a786b5f4257288224384745179ddbe Merge: 5fe95614769 7449e7b0a65 Author: Croway <[email protected]> AuthorDate: Mon May 15 12:51:50 2023 +0200 Merge branch 'camel-3.x' of github.com:apache/camel into camel-3.x .github/actions/install-mvnd/action.yml | 4 +- Jenkinsfile.deploy | 2 + bom/camel-bom/pom.xml | 5 + camel-dependencies/pom.xml | 42 +- .../org/apache/camel/catalog/components/as2.json | 6 +- .../apache/camel/catalog/components/aws2-ec2.json | 2 +- .../apache/camel/catalog/components/aws2-s3.json | 2 + .../camel/catalog/components/azure-cosmosdb.json | 10 +- .../catalog/components/azure-storage-datalake.json | 26 +- .../apache/camel/catalog/components/graphql.json | 2 +- .../org/apache/camel/catalog/components/hdfs.json | 4 +- .../org/apache/camel/catalog/components/jpa.json | 6 +- .../org/apache/camel/catalog/components/kudu.json | 5 +- .../camel/catalog/components/netty-http.json | 2 + .../org/apache/camel/catalog/components/netty.json | 2 + .../org/apache/camel/catalog/components/plc4x.json | 2 +- .../apache/camel/catalog/components/pulsar.json | 1 + .../org/apache/camel/catalog/components/solr.json | 2 +- .../apache/camel/catalog/components/solrCloud.json | 2 +- .../org/apache/camel/catalog/components/solrs.json | 2 +- .../org/apache/camel/catalog/components/sql.json | 2 + .../camel/catalog/components/vertx-websocket.json | 4 +- .../main/camel-main-configuration-metadata.json | 2 + .../apache/camel/catalog/main/sensitive-keys.json | 3 + .../camel/catalog/models/deadLetterChannel.json | 4 +- .../camel/catalog/models/defaultErrorHandler.json | 4 +- .../catalog/models/jtaTransactionErrorHandler.json | 4 +- .../apache/camel/catalog/models/onException.json | 4 +- .../models/springTransactionErrorHandler.json | 4 +- .../catalog/releases/camel-quarkus-releases.json | 18 +- .../camel/catalog/releases/camel-releases.json | 27 + .../apache/camel/catalog/schemas/camel-spring.xsd | 112 ++-- .../org/apache/camel/catalog/CamelCatalogTest.java | 2 +- .../component/as2/api/AS2ClientConnection.java | 38 +- .../camel/component/as2/api/AS2ClientManager.java | 32 +- .../camel/component/as2/api/AS2MediaType.java | 4 + .../camel/component/as2/api/AS2MimeType.java | 4 + .../component/as2/api/AS2ServerConnection.java | 25 +- .../api/entity/ApplicationEDIConsentEntity.java | 2 +- .../as2/api/entity/ApplicationEDIFACTEntity.java | 2 +- .../as2/api/entity/ApplicationEDIX12Entity.java | 2 +- ...cationEDIEntity.java => ApplicationEntity.java} | 6 +- ...EDIX12Entity.java => ApplicationXMLEntity.java} | 8 +- .../component/as2/api/entity/EntityParser.java | 21 +- .../camel/component/as2/api/util/AS2Utils.java | 4 +- .../camel/component/as2/api/util/EntityUtils.java | 9 +- .../component/as2/api/util/HttpMessageUtils.java | 47 +- .../camel/component/as2/api/AS2MessageTest.java | 14 +- .../component/as2/api/util/EntityUtilsTest.java | 20 +- components/camel-as2/camel-as2-component/pom.xml | 8 + ...ientManagerEndpointConfigurationConfigurer.java | 14 + .../component/as2/AS2ConfigurationConfigurer.java | 14 + .../camel/component/as2/AS2EndpointConfigurer.java | 14 + .../camel/component/as2/AS2EndpointUriFactory.java | 4 +- ...rverManagerEndpointConfigurationConfigurer.java | 14 + .../org/apache/camel/component/as2/as2.json | 6 +- .../camel/component/as2/AS2Configuration.java | 42 +- .../apache/camel/component/as2/AS2Consumer.java | 4 +- .../apache/camel/component/as2/AS2Endpoint.java | 10 + .../as2/internal/AS2ConnectionHelper.java | 5 +- .../camel/component/as2/AS2ClientManagerIT.java | 136 +++- .../camel/component/as2/AS2ServerManagerIT.java | 157 ++++- .../as2/CreateEndpointManualIssueTest.java | 1 - .../camel/component/as2/MendelsonCertLoader.java | 195 ++++++ .../as2/MendelsonSslEndpointManualTest.java | 128 ++++ .../src/test/resources/jsse/client-keystore.jks | Bin 0 -> 2183 bytes .../src/test/resources/jsse/client-truststore.jks | Bin 0 -> 921 bytes .../src/test/resources/jsse/localhost.p12 | Bin 0 -> 2533 bytes .../src/test/resources/jsse/server-keystore.jks | Bin 0 -> 2214 bytes .../src/test/resources/jsse/server-truststore.jks | Bin 0 -> 927 bytes .../src/test/resources/mendelson/key3.pfx | Bin 0 -> 2757 bytes .../src/test/resources/mendelson/key4.cer | 21 + .../src/test/resources/test-server.properties | 46 ++ .../cloudtrail/CloudtrailConsumerHealthCheck.java | 3 +- .../main/docs/aws-secrets-manager-component.adoc | 18 + .../aws/secretsmanager/SecretsDevConsole.java | 4 + .../SecretsManagerClientHealthCheck.java | 4 +- .../SecretsManagerPropertiesFunction.java | 46 +- .../vault/CloudTrailReloadTriggerTask.java | 17 + .../aws2/athena/Athena2ClientHealthCheck.java | 3 +- .../component/aws2/cw/Cw2ClientHealthCheck.java | 4 +- .../component/aws2/ddb/Ddb2ClientHealthCheck.java | 4 +- .../apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +- .../component/aws2/ec2/AWS2EC2HealthCheck.java | 4 +- .../component/aws2/ecs/ECS2ClientHealthCheck.java | 3 +- .../component/aws2/eks/EKS2ClientHealthCheck.java | 4 +- .../eventbridge/EventbridgeClientHealthCheck.java | 4 +- .../camel/component/aws2/iam/IAM2HealthCheck.java | 4 +- .../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 33 +- .../aws2/lambda/Lambda2ClientHealthCheck.java | 4 +- .../component/aws2/mq/MQ2ClientHealthCheck.java | 4 +- .../camel/component/aws2/msk/MSK2HealthCheck.java | 5 +- .../aws2/s3/AWS2S3ComponentConfigurer.java | 6 + .../aws2/s3/AWS2S3EndpointConfigurer.java | 6 + .../aws2/s3/AWS2S3EndpointUriFactory.java | 3 +- .../apache/camel/component/aws2/s3/aws2-s3.json | 2 + .../component/aws2/s3/AWS2S3Configuration.java | 13 + .../aws2/s3/AWS2S3ConsumerHealthCheck.java | 3 +- .../client/impl/AWS2S3ClientIAMOptimizedImpl.java | 3 + .../s3/client/impl/AWS2S3ClientStandardImpl.java | 3 + .../camel/component/aws2/ses/Ses2HealthCheck.java | 4 +- .../camel/component/aws2/sns/Sns2HealthCheck.java | 5 +- .../aws2/sqs/Sqs2ConsumerHealthCheck.java | 4 +- .../translate/Translate2ClientHealthCheck.java | 4 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 4 + .../cosmosdb/CosmosDbComponentConfigurer.java | 10 +- .../azure/cosmosdb/CosmosDbEndpointConfigurer.java | 10 +- .../azure/cosmosdb/CosmosDbEndpointUriFactory.java | 3 +- .../component/azure/cosmosdb/azure-cosmosdb.json | 10 +- .../src/main/docs/azure-cosmosdb-component.adoc | 2 +- .../azure/cosmosdb/CosmosDbComponent.java | 3 - .../azure/cosmosdb/CosmosDbConfiguration.java | 23 +- .../CosmosDbConfigurationOptionsProxy.java | 5 +- .../cosmosdb/client/CosmosDbClientFactory.java | 10 +- .../azure/servicebus/ServiceBusConsumer.java | 22 +- .../servicebus/client/ServiceBusClientFactory.java | 7 +- .../blob/BlobConfigurationOptionsProxy.java | 8 +- .../storage/blob/integration/BlobConsumerIT.java | 35 ++ .../datalake/DataLakeComponentConfigurer.java | 18 + .../datalake/DataLakeEndpointConfigurer.java | 18 + .../datalake/DataLakeEndpointUriFactory.java | 13 +- .../storage/datalake/azure-storage-datalake.json | 26 +- .../azure/storage/datalake/DataLakeComponent.java | 9 +- .../storage/datalake/DataLakeConfiguration.java | 37 +- .../DataLakeConfigurationOptionsProxy.java | 9 + .../azure/storage/datalake/DataLakeConstants.java | 4 + .../storage/datalake/DataLakeExchangeHeaders.java | 13 + .../datalake/client/DataLakeClientFactory.java | 48 +- .../datalake/client/DataLakeFileClientWrapper.java | 5 +- .../operations/DataLakeDirectoryOperations.java | 6 +- .../operations/DataLakeFileOperations.java | 63 +- .../operations/DataLakeFileOperationTest.java | 28 + .../component/cassandra/CassandraEndpoint.java | 10 +- .../component/couchbase/CouchbaseConsumer.java | 2 +- .../dhis2/api/{Dhis2Post.java => Dhis2Delete.java} | 19 +- .../apache/camel/component/dhis2/api/Dhis2Get.java | 25 +- .../camel/component/dhis2/api/Dhis2Post.java | 3 - .../dhis2/api/{Dhis2Post.java => Dhis2Put.java} | 20 +- .../component/dhis2/api/RootJunctionEnum.java} | 16 +- ...2PostTestCase.java => Dhis2DeleteTestCase.java} | 24 +- .../component/dhis2/api/Dhis2GetTestCase.java | 122 +++- .../component/dhis2/api/Dhis2PostTestCase.java | 4 +- ...his2PostTestCase.java => Dhis2PutTestCase.java} | 24 +- .../camel-dhis2/camel-dhis2-component/pom.xml | 19 + .../signatures/file-sig-api.txt | 4 +- ....java => Dhis2DeleteEndpointConfiguration.java} | 8 +- ...his2DeleteEndpointConfigurationConfigurer.java} | 43 +- .../component/dhis2/Dhis2EndpointUriFactory.java | 3 +- .../dhis2/Dhis2GetEndpointConfiguration.java | 15 +- .../Dhis2GetEndpointConfigurationConfigurer.java | 7 + .../dhis2/Dhis2PostEndpointConfiguration.java | 2 +- ...ion.java => Dhis2PutEndpointConfiguration.java} | 8 +- ...> Dhis2PutEndpointConfigurationConfigurer.java} | 43 +- .../dhis2/internal/Dhis2ApiCollection.java | 20 +- .../component/dhis2/internal/Dhis2ApiName.java | 6 +- ...GetApiMethod.java => Dhis2DeleteApiMethod.java} | 23 +- .../dhis2/internal/Dhis2GetApiMethod.java | 2 + ...is2GetApiMethod.java => Dhis2PutApiMethod.java} | 23 +- ...omponent.dhis2.Dhis2DeleteEndpointConfiguration | 2 + ...l.component.dhis2.Dhis2PutEndpointConfiguration | 2 + .../org/apache/camel/component/dhis2/dhis2.json | 12 +- .../src/main/docs/dhis2-component.adoc | 128 ++++ .../camel/component/dhis2/Dhis2Endpoint.java | 17 +- .../camel/component/dhis2/Dhis2Producer.java | 14 + .../dhis2/{Dhis2PostIT.java => Dhis2DeleteIT.java} | 40 +- .../apache/camel/component/dhis2/Dhis2GetIT.java | 2 +- .../apache/camel/component/dhis2/Dhis2PostIT.java | 23 +- .../dhis2/{Dhis2PostIT.java => Dhis2PutIT.java} | 43 +- .../component/dhis2/Dhis2ResourceTablesIT.java | 1 - .../apache/camel/component/dhis2/Environment.java | 10 +- components/camel-dhis2/pom.xml | 22 +- .../dynamicrouter/DynamicRouterProcessor.java | 1 + .../dynamicrouter/DynamicRouterProcessorTest.java | 33 +- .../DynamicRouterSingleRouteTwoParticipantsIT.java | 37 +- .../support/DynamicRouterTestSupport.java | 13 +- .../camel/component/ehcache/EhcacheEndpoint.java | 14 +- .../camel/component/ehcache/EhcacheManager.java | 25 +- .../graphql/GraphqlEndpointUriFactory.java | 2 +- .../apache/camel/component/graphql/graphql.json | 2 +- .../src/main/docs/graphql-component.adoc | 2 +- .../camel/component/graphql/GraphqlComponent.java | 12 + .../camel/component/graphql/GraphqlEndpoint.java | 7 +- .../component/graphql/GraphqlComponentTest.java | 23 + .../camel/language/groovy/GroovyExpression.java | 20 +- .../camel/language/groovy/GroovyShellFactory.java | 12 + .../language/groovy/GroovyShellFactoryTest.java | 28 + .../org/apache/camel/component/hdfs/hdfs.json | 4 +- .../camel-hdfs/src/main/docs/hdfs-component.adoc | 1 + .../camel/component/hdfs/DefaultHdfsFile.java | 3 + .../component/hdfs/HdfsWritableFactories.java | 20 + .../apache/camel/component/hdfs/WritableType.java | 8 + .../camel/component/hdfs/HdfsProducerTest.java | 21 + .../camel/http/common/DefaultHttpBinding.java | 17 +- .../org/apache/camel/http/common/HttpBinding.java | 9 +- .../org/apache/camel/http/common/HttpMessage.java | 2 +- .../apache/camel/component/jdbc/JdbcProducer.java | 96 ++- .../component/jetty/JettyRestHttpBinding.java | 4 +- .../component/jetty9/AttachmentHttpBinding.java | 6 +- .../jira/consumer/AbstractJiraConsumer.java | 22 +- .../jira/consumer/NewCommentsConsumer.java | 2 +- .../component/jira/consumer/NewIssuesConsumer.java | 14 +- .../jira/consumer/WatchUpdatesConsumer.java | 2 +- .../jira/consumer/NewCommentsConsumerTest.java | 14 +- .../jira/consumer/NewIssuesConsumerTest.java | 108 +++- .../jira/consumer/WatchUpdatesConsumerTest.java | 36 +- .../camel/component/jpa/JpaEndpointConfigurer.java | 12 + .../camel/component/jpa/JpaEndpointUriFactory.java | 4 +- .../org/apache/camel/component/jpa/jpa.json | 6 +- .../apache/camel/component/jpa/JpaConstants.java | 6 + .../apache/camel/component/jpa/JpaEndpoint.java | 27 + .../apache/camel/component/jpa/JpaProducer.java | 31 +- .../component/jpa/AbstractJpaMethodSupport.java | 92 +++ .../camel/component/jpa/AbstractJpaMethodTest.java | 63 +- .../component/jpa/AdditionalQueryParameters.java} | 18 +- .../camel/component/jpa/JpaOutputTypeTest.java | 140 +++++ .../apache/camel/component/jpa/JpaPagingTest.java | 116 ++++ .../component/jpa/JpaWithOptionsTestSupport.java | 119 ++++ components/camel-jq/pom.xml | 5 + .../apache/camel/component/jslt/JsltEndpoint.java | 43 +- .../component/jslt/JsltSafeSerializationTest.java | 67 ++ .../org/apache/camel/component/jslt/SafeBean.java} | 13 +- .../apache/camel/component/jslt/UnsafeBean.java} | 19 +- .../camel/component/jslt/serialization/input.json | 1 + .../camel/component/jslt/serialization/output.json | 1 + .../jslt/serialization/transformation.jslt | 7 + .../camel-kafka/src/main/docs/kafka-component.adoc | 1 + .../kafka/consumer/SyncCommitManager.java | 6 +- .../kafka/KafkaIdempotentRepository.java | 48 +- .../kafka/integration/KafkaConsumerAuthIT.java | 7 + .../integration/KafkaConsumerAuthInvalidIT.java | 7 + .../KafkaConsumerAuthInvalidWithReconnectIT.java | 7 + .../org/apache/camel/component/kudu/kudu.json | 5 +- .../apache/camel/component/kudu/KuduConstants.java | 6 + .../apache/camel/component/kudu/KuduProducer.java | 8 +- .../org/apache/camel/component/kudu/KuduUtils.java | 33 +- .../apache/camel/component/kudu/KuduScanTest.java | 82 +++ .../component/micrometer/MicrometerConstants.java | 24 +- .../main/docs/microprofile-metrics-component.adoc | 24 + .../camel/component/minio/MinioEndpoint.java | 4 - .../http/NettyHttpConfigurationConfigurer.java | 6 + .../netty/http/NettyHttpEndpointUriFactory.java | 3 +- .../camel/component/netty/http/netty-http.json | 2 + .../component/netty/NettyComponentConfigurer.java | 6 + .../netty/NettyConfigurationConfigurer.java | 6 + .../component/netty/NettyEndpointConfigurer.java | 6 + .../component/netty/NettyEndpointUriFactory.java | 3 +- .../org/apache/camel/component/netty/netty.json | 2 + .../camel/component/netty/NettyProducer.java | 28 +- .../netty/NettyServerBootstrapConfiguration.java | 20 + .../SingleTCPNettyServerBootstrapFactory.java | 35 +- .../camel/component/netty/NettyTCPSyncUDSTest.java | 58 ++ .../MicrometerObservationSpanAdapter.java | 13 +- .../observation/MicrometerObservationTracer.java | 6 +- .../org/apache/camel/observation/ABCRouteTest.java | 21 +- .../CamelMicrometerObservationTestSupport.java | 9 +- .../observation/ClientRecipientListRouteTest.java | 19 +- .../apache/camel/observation/CurrentSpanTest.java | 23 +- .../observation/CustomComponentNameRouteTest.java | 20 +- .../observation/MulticastParallelRouteTest.java | 22 +- .../camel/observation/MulticastRouteTest.java | 22 +- .../camel/observation/RouteConcurrentTest.java | 11 +- .../camel/observation/SpanProcessorsTest.java | 22 +- .../apache/camel/observation/TwoServiceTest.java | 13 +- .../observation/TwoServiceWithExcludeTest.java | 5 +- .../camel/component/olingo2/Olingo2Endpoint.java | 3 +- .../camel/component/olingo4/Olingo4Endpoint.java | 3 +- .../camel/component/olingo4/Olingo4RouteTest.java | 20 +- .../apache/camel/opentelemetry/ABCRouteTest.java | 19 +- .../ClientRecipientListRouteTest.java | 17 +- .../camel/opentelemetry/CurrentSpanTest.java | 10 +- .../CustomComponentNameRouteTest.java | 17 +- .../opentelemetry/MulticastParallelRouteTest.java | 19 +- .../camel/opentelemetry/MulticastRouteTest.java | 19 +- .../camel/opentelemetry/RouteConcurrentTest.java | 11 +- .../camel/opentelemetry/SpanProcessorsTest.java | 19 +- .../apache/camel/opentelemetry/TwoServiceTest.java | 7 + .../opentelemetry/TwoServiceWithExcludeTest.java | 4 + components/camel-opentracing/pom.xml | 2 + .../src/main/docs/platform-http-component.adoc | 26 +- .../component/platform/http/HttpEndpointModel.java | 13 +- .../platform/http/PlatformHttpComponent.java | 67 +- .../platform/http/PlatformHttpEndpoint.java | 2 +- .../platform/http/PlatformHttpListener.java} | 20 +- .../component/plc4x/Plc4XEndpointConfigurer.java | 2 +- .../component/plc4x/Plc4XEndpointUriFactory.java | 4 +- .../org/apache/camel/component/plc4x/plc4x.json | 2 +- .../camel-plc4x/src/main/docs/plc4x-component.adoc | 14 +- .../camel/component/plc4x/Plc4XComponent.java | 17 +- .../camel/component/plc4x/Plc4XConsumer.java | 19 +- .../camel/component/plc4x/Plc4XEndpoint.java | 55 +- ...mponentTest.java => Plc4XComponentTagTest.java} | 11 +- .../camel/component/plc4x/Plc4XComponentTest.java | 2 +- .../org/apache/camel/component/pulsar/pulsar.json | 1 + .../camel/component/pulsar/PulsarProducer.java | 5 + .../pulsar/utils/message/PulsarMessageHeaders.java | 6 + .../integration/PulsarProducerHeadersInIT.java | 10 + .../component/servlet/AttachmentHttpBinding.java | 4 +- .../component/servlet/ServletRestHttpBinding.java | 4 +- components/camel-solr/pom.xml | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../org/apache/camel/component/solr/solr.json | 2 +- .../org/apache/camel/component/solr/solrCloud.json | 2 +- .../org/apache/camel/component/solr/solrs.json | 2 +- .../camel-solr/src/main/docs/solr-component.adoc | 5 +- .../component/springldap/SpringLdapProducer.java | 12 +- .../component/sql/SqlComponentConfigurer.java | 8 +- .../camel/component/sql/SqlEndpointConfigurer.java | 6 + .../camel/component/sql/SqlEndpointUriFactory.java | 3 +- .../org/apache/camel/component/sql/sql.json | 2 + .../component/sql/DefaultRowMapperFactory.java} | 23 +- .../camel/component/sql/DefaultSqlEndpoint.java | 36 +- .../camel/component/sql/RowMapperFactory.java} | 24 +- .../apache/camel/component/sql/SqlComponent.java | 18 + .../main/java/org/apache/camel/tracing/Tracer.java | 3 +- .../VertxWebsocketComponentConfigurer.java | 12 + .../component/vertx/websocket/vertx-websocket.json | 4 +- .../vertx/websocket/VertxWebsocketComponent.java | 41 +- .../websocket/VertxWebsocketConfiguration.java | 5 +- .../vertx/websocket/VertxWebsocketEndpoint.java | 15 +- .../vertx/websocket/VertxWebsocketHelper.java | 51 ++ .../vertx/websocket/VertxWebsocketHost.java | 16 +- .../vertx/websocket/VertxWebsocketProducer.java | 7 +- .../vertx/websocket/VertxWebSocketTestSupport.java | 2 + .../VertxWebsocketComponentConfigurationTest.java | 36 ++ .../vertx/websocket/VertxWebsocketHelperTest.java | 130 ++++ .../websocket/VertxWebsocketMultiConsumerTest.java | 14 + .../vertx/websocket/VertxWebsocketTest.java | 134 +++- .../camel-zeebe/src/main/docs/zeebe-component.adoc | 48 ++ .../camel/component/zeebe/ZeebeComponent.java | 4 +- .../camel/component/zeebe/ZeebeComponentTest.java} | 20 +- .../apache/camel/spi/ContextReloadStrategy.java | 25 +- .../org/apache/camel/spi/PropertiesComponent.java | 5 + ...dStrategy.java => PropertiesSourceFactory.java} | 38 +- ...textReloadStrategy.java => ReloadStrategy.java} | 11 +- .../apache/camel/spi/ResourceReloadStrategy.java | 20 +- .../java/org/apache/camel/spi/RoutesLoader.java | 14 +- .../apache/camel/spi/StreamCachingStrategy.java | 10 + .../apache/camel/vault/AwsVaultConfiguration.java | 26 + .../camel/impl/engine/DefaultRoutesLoader.java | 51 +- .../impl/engine/DefaultStreamCachingStrategy.java | 8 +- .../camel/impl/engine/DefaultUnitOfWork.java | 6 + .../properties/DefaultPropertiesSourceFactory.java | 44 ++ .../component/properties/PropertiesComponent.java | 7 + .../services/org/apache/camel/dev-console/bean | 2 + .../services/org/apache/camel/dev-console/reload | 2 + .../apache/camel/impl/console/BeanDevConsole.java | 62 ++ .../apache/camel/impl/console/ConsoleHelper.java | 48 +- .../camel/impl/console/ContextDevConsole.java | 24 +- .../camel/impl/console/ReloadDevConsole.java | 79 +++ .../main/docs/modules/eips/pages/intercept.adoc | 8 +- .../java/org/apache/camel/impl/DefaultModel.java | 19 +- .../modules/languages/pages/simple-language.adoc | 6 + .../language/simple/SimpleExpressionBuilder.java | 50 +- .../simple/ast/SimpleFunctionExpression.java | 11 + .../model/errorhandler/deadLetterChannel.json | 4 +- .../model/errorhandler/defaultErrorHandler.json | 4 +- .../errorhandler/jtaTransactionErrorHandler.json | 4 +- .../springTransactionErrorHandler.json | 4 +- .../org/apache/camel/model/onException.json | 4 +- .../apache/camel/builder/AdviceWithBuilder.java | 3 +- .../builder/LegacyDefaultErrorHandlerBuilder.java | 10 + .../apache/camel/model/AggregateDefinition.java | 2 +- .../apache/camel/model/OnCompletionDefinition.java | 14 + .../apache/camel/model/OnExceptionDefinition.java | 10 + .../DefaultErrorHandlerDefinition.java | 20 + .../processor/aggregate/AggregateProcessor.java | 16 +- .../apache/camel/reifier/OnExceptionReifier.java | 5 - .../java/org/apache/camel/LanguageTestSupport.java | 8 +- .../builder/ExpressionBuilderConcurrencyTest.java | 97 +++ .../apache/camel/converter/EnumConverterTest.java | 47 +- .../org/apache/camel/converter/MyTypeEnum.java | 20 +- .../apache/camel/language/simple/SimpleTest.java | 52 +- .../OnExceptionUseOriginalMessageStreamTest.java | 172 ++++++ .../main/AwsVaultConfigurationConfigurer.java | 12 + .../AwsVaultConfigurationPropertiesConfigurer.java | 12 + .../camel-main-configuration-metadata.json | 2 + core/camel-main/src/main/docs/main.adoc | 4 +- .../main/AwsVaultConfigurationProperties.java | 16 + .../apache/camel/main/DefaultRoutesCollector.java | 65 +- .../apache/camel/main/MainPropertiesReload.java | 5 +- .../org/apache/camel/main/RoutesConfigurer.java | 56 +- .../java/org/apache/camel/main/MainVaultTest.java | 59 ++ .../support/DefaultContextReloadStrategy.java | 5 + .../support/FileWatcherResourceReloadStrategy.java | 30 +- .../org/apache/camel/support/ResourceHelper.java | 19 +- .../camel/support/RouteOnDemandReloadStrategy.java | 113 ++++ .../camel/support/RouteWatcherReloadStrategy.java | 88 ++- .../camel/support/builder/ExpressionBuilder.java | 115 +++- .../main/java/org/apache/camel/util/IOHelper.java | 13 + .../java/org/apache/camel/util/SensitiveUtils.java | 6 + .../java/org/apache/camel/util/URISupport.java | 13 + .../java/org/apache/camel/xml/in/BaseParser.java | 4 + .../org/apache/camel/xml/in/ModelParserTest.java | 41 ++ .../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 95 ++- .../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc | 68 ++ .../modules/ROOT/pages/camel-jbang.adoc | 133 ++++ docs/user-manual/modules/ROOT/pages/security.adoc | 34 + .../camel/cli/connector/LocalCliConnector.java | 41 +- .../component/ComponentsBuilderFactory.java | 3 + .../dsl/Aws2S3ComponentBuilderFactory.java | 17 + .../dsl/AzureCosmosdbComponentBuilderFactory.java | 25 +- ...zureStorageDatalakeComponentBuilderFactory.java | 150 +++-- .../dsl/NettyComponentBuilderFactory.java | 19 + .../dsl/NettyHttpComponentBuilderFactory.java | 19 + .../component/dsl/SolrComponentBuilderFactory.java | 1 + .../dsl/SolrcloudComponentBuilderFactory.java | 1 + .../dsl/SolrsComponentBuilderFactory.java | 1 + .../component/dsl/SqlComponentBuilderFactory.java | 17 + .../dsl/VertxWebsocketComponentBuilderFactory.java | 33 + .../src/generated/resources/metadata.json | 8 +- .../builder/endpoint/StaticEndpointBuilders.java | 2 + .../endpoint/dsl/AS2EndpointBuilderFactory.java | 212 ++++++- .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 103 ++++ .../dsl/CosmosDbEndpointBuilderFactory.java | 129 +++- .../dsl/DataLakeEndpointBuilderFactory.java | 683 ++++++++++++++------- .../endpoint/dsl/JpaEndpointBuilderFactory.java | 91 +++ .../endpoint/dsl/KuduEndpointBuilderFactory.java | 39 ++ .../endpoint/dsl/NettyEndpointBuilderFactory.java | 54 ++ .../dsl/NettyHttpEndpointBuilderFactory.java | 54 ++ .../endpoint/dsl/Plc4XEndpointBuilderFactory.java | 128 +--- .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 19 + .../endpoint/dsl/SolrEndpointBuilderFactory.java | 5 + .../endpoint/dsl/SqlEndpointBuilderFactory.java | 96 +++ .../dsl/VertxWebsocketEndpointBuilderFactory.java | 18 +- .../camel-jbang/camel-jbang-console}/pom.xml | 34 +- .../services/org/apache/camel/dev-console/jbang | 2 + .../org/apache/camel/dev-console/source-dir | 2 + .../services/org/apache/camel/other.properties | 7 + .../src/generated/resources/jbang-console.json | 15 + .../camel/jbang/console/JBangDevConsole.java | 53 ++ .../camel/jbang/console/SourceDirDevConsole.java | 163 +++++ .../apache/camel/jbang/console/VersionHelper.java | 27 +- dsl/camel-jbang/camel-jbang-core/pom.xml | 4 + .../dsl/jbang/core/commands/CodeRestGenerator.java | 6 +- .../dsl/jbang/core/commands/DependencyCopy.java | 12 +- .../dsl/jbang/core/commands/DependencyList.java | 8 +- .../camel/dsl/jbang/core/commands/Export.java | 9 + .../dsl/jbang/core/commands/ExportBaseCommand.java | 229 ++++++- .../dsl/jbang/core/commands/ExportCamelMain.java | 110 +++- .../dsl/jbang/core/commands/ExportQuarkus.java | 151 +++-- .../dsl/jbang/core/commands/ExportSpringBoot.java | 139 ++++- .../apache/camel/dsl/jbang/core/commands/Init.java | 6 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 95 ++- .../commands/action/RouteControllerAction.java | 1 + .../core/commands/catalog/CatalogBaseCommand.java | 2 +- .../jbang/core/commands/catalog/CatalogDoc.java | 2 +- .../core/commands/catalog/CatalogKamelet.java | 2 +- .../dsl/jbang/core/commands/process/Hawtio.java | 9 +- .../jbang/core/commands/version/VersionList.java | 61 +- .../gradle-wrapper/gradle-wrapper.properties | 2 +- .../src/main/resources/templates/groovy.tmpl | 1 - .../src/main/resources/templates/java.tmpl | 2 +- .../src/main/resources/templates/js.tmpl | 1 - .../src/main/resources/templates/jsh.tmpl | 1 - .../src/main/resources/templates/kts.tmpl | 1 - .../templates/run-custom-camel-version.tmpl | 2 +- .../src/main/resources/templates/xml.tmpl | 2 +- .../src/main/resources/templates/yaml.tmpl | 2 +- .../camel-jbang-main/dist/CamelJBang.java | 6 +- .../src/main/jbang/main/CamelJBang.java | 6 +- dsl/camel-jbang/pom.xml | 1 + .../java/org/apache/camel/main/KameletMain.java | 16 + .../main/download/DependencyDownloaderKamelet.java | 2 +- .../download/DependencyDownloaderRoutesLoader.java | 3 +- .../main/download/MavenDependencyDownloader.java | 8 +- .../apache/camel/main/http/VertxHttpServer.java | 98 ++- .../org/apache/camel/routes-loader/camel.xml | 2 + .../dsl/xml/io/CamelXmlRoutesBuilderLoader.java | 16 +- .../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 14 +- .../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 6 +- .../org/apache/camel/routes-loader/camel.xml | 2 + .../xml/jaxb/CamelJaxbXmlRoutesBuilderLoader.java | 18 +- .../dsl/xml/jaxb/JaxbXmlRoutesBuilderLoader.java | 26 +- parent/pom.xml | 49 +- pom.xml | 4 +- .../kafka/services/ContainerLocalKafkaService.java | 6 +- .../infra/kafka/services/KafkaServiceFactory.java | 4 +- .../zookeeper/services/ZooKeeperContainer.java | 2 +- .../main/java/org/apache/camel/maven/RunMojo.java | 2 +- .../camel/maven/packaging/SchemaGeneratorMojo.java | 2 +- .../maven/generator/openapi/GenerateMojo.java | 8 + 481 files changed, 9428 insertions(+), 2142 deletions(-)
