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:59 UTC

[camel] 03/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 144e84780492509db5cda5da0f8c3d7eb60fccbc
Merge: 41142503893 585c6554e0b
Author: Croway <fe...@gmail.com>
AuthorDate: Tue Mar 7 14:12:34 2023 +0100

    Merge branch 'main' of github.com:apache/camel

 camel-dependencies/pom.xml                         |   2 +-
 components/camel-asn1/pom.xml                      |   1 +
 components/camel-atom/pom.xml                      |   1 +
 .../camel-avro-rpc-component/pom.xml               |   1 +
 components/camel-avro/pom.xml                      |   1 +
 .../camel-aws/camel-aws2-eventbridge/pom.xml       |   1 +
 components/camel-aws/camel-aws2-sns/pom.xml        |   1 +
 components/camel-aws/camel-aws2-sqs/pom.xml        |   1 +
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |   1 +
 .../camel-azure/camel-azure-eventhubs/pom.xml      |   1 +
 .../camel-azure/camel-azure-key-vault/pom.xml      |   1 +
 .../camel-azure/camel-azure-servicebus/pom.xml     |   1 +
 .../camel-azure/camel-azure-storage-blob/pom.xml   |   1 +
 .../camel-azure-storage-datalake/pom.xml           |   1 +
 .../camel-azure/camel-azure-storage-queue/pom.xml  |   1 +
 components/camel-datasonnet/pom.xml                |   1 +
 components/camel-hashicorp-vault/pom.xml           |   1 +
 components/camel-jetty/pom.xml                     |   1 +
 .../apache/camel/language/joor/JoorCompiler.java   |   2 +-
 components/camel-mail/pom.xml                      |   1 +
 components/camel-netty-http/pom.xml                |   1 +
 components/camel-oaipmh/pom.xml                    |   1 +
 components/camel-olingo4/camel-olingo4-api/pom.xml |   1 +
 .../http/vertx/VertxPlatformHttpConsumer.java      |  10 +-
 .../VertxPlatformMultipleContentTypeTest.java      | 205 +++++++++++++++++++++
 components/camel-protobuf/pom.xml                  |   1 +
 components/camel-rss/pom.xml                       |   1 +
 .../camel-salesforce-component/pom.xml             |   1 +
 .../camel-salesforce-maven-plugin/pom.xml          |   1 +
 .../camel-servicenow-maven-plugin/pom.xml          |   1 +
 components/camel-servlet/pom.xml                   |   1 +
 components/camel-solr/pom.xml                      |   1 +
 components/camel-thrift/pom.xml                    |   1 +
 components/camel-xj/pom.xml                        |   1 +
 core/camel-core-engine/pom.xml                     |   7 +
 .../src/main/docs/modules/eips/pages/saga-eip.adoc |  11 +-
 core/camel-core/pom.xml                            |   7 +
 core/camel-management-api/pom.xml                  |  14 ++
 core/camel-xml-jaxp/pom.xml                        |   7 +
 dsl/camel-jbang/camel-jbang-core/pom.xml           |   1 +
 .../dsl/jbang/core/commands/ExportBaseCommand.java |  44 ++++-
 .../dsl/jbang/core/commands/ExportCamelMain.java   |  11 +-
 .../dsl/jbang/core/commands/ExportQuarkus.java     |   5 +-
 .../dsl/jbang/core/commands/ExportSpringBoot.java  |   5 +-
 .../core/commands/catalog/CatalogBaseCommand.java  |   2 +-
 parent/pom.xml                                     |  54 +-----
 test-infra/camel-test-infra-ftp/pom.xml            |   2 +
 tests/camel-itest/pom.xml                          |   2 +
 tooling/maven/bom-generator-maven-plugin/pom.xml   |   1 +
 tooling/maven/camel-package-maven-plugin/pom.xml   |   1 +
 tooling/maven/sync-properties-maven-plugin/pom.xml |   1 +
 51 files changed, 344 insertions(+), 80 deletions(-)