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:24:00 UTC

[camel] 04/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 16bf1bfd80edf50bd0fb12534bfc3f42e0f91d64
Merge: 144e8478049 27e2ce100c3
Author: Croway <fe...@gmail.com>
AuthorDate: Tue Mar 7 15:16:12 2023 +0100

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

 .../org/apache/camel/catalog/CamelCatalog.java     | 10 +++++++
 .../apache/camel/catalog/DefaultCamelCatalog.java  |  6 ++++
 .../org/apache/camel/catalog/CamelCatalogTest.java | 18 ++++++++++++
 .../resources/org/apache/camel/catalog/bar/foo.txt |  1 +
 .../camel/dsl/jbang/core/commands/Export.java      |  1 +
 .../dsl/jbang/core/commands/ExportBaseCommand.java |  4 +++
 .../dsl/jbang/core/commands/ExportSpringBoot.java  | 34 +++++++++++++++++++---
 .../apache/camel/dsl/jbang/core/commands/Run.java  |  1 -
 .../camel/dsl/jbang/core/common/CatalogLoader.java | 14 +++++++--
 parent/pom.xml                                     |  7 -----
 10 files changed, 82 insertions(+), 14 deletions(-)