You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2022/01/24 15:47:18 UTC
[camel-k] branch main updated: fix: Camel Catalog generation fails with empty Maven effective settings
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 82aa5c2 fix: Camel Catalog generation fails with empty Maven effective settings
82aa5c2 is described below
commit 82aa5c2c5baaa59f85331fb2bba281b0778f2f75
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Jan 24 14:16:47 2022 +0100
fix: Camel Catalog generation fails with empty Maven effective settings
---
pkg/util/camel/catalog.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 20cdea5..a873993 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -125,10 +125,10 @@ func GenerateCatalogCommon(
mc.AddSystemProperty("catalog.file", "catalog.yaml")
mc.AddSystemProperty("catalog.runtime", string(runtime.Provider))
- if globalSettings != nil {
+ if len(globalSettings) > 0 {
mc.GlobalSettings = globalSettings
}
- if userSettings != nil {
+ if len(userSettings) > 0 {
mc.UserSettings = userSettings
}