You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2021/04/13 10:02:51 UTC
[camel-k] 02/02: Fix #2170: remove internal usage of camel-quarkus:
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 31e1a10c5ea0d3914ce73cc97ad6c5c5b10bbe52
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Tue Apr 13 10:47:05 2021 +0200
Fix #2170: remove internal usage of camel-quarkus:
---
pkg/cmd/kit_create.go | 2 +-
pkg/trait/jolokia.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/cmd/kit_create.go b/pkg/cmd/kit_create.go
index 0d26e1d..63ab0ea 100644
--- a/pkg/cmd/kit_create.go
+++ b/pkg/cmd/kit_create.go
@@ -138,7 +138,7 @@ func (command *kitCreateCommandOptions) run(_ *cobra.Command, args []string) err
case strings.HasPrefix(item, "file:"):
kit.Spec.Dependencies = append(kit.Spec.Dependencies, item)
case strings.HasPrefix(item, "camel-quarkus-"):
- kit.Spec.Dependencies = append(kit.Spec.Dependencies, "camel-quarkus:"+strings.TrimPrefix(item, "camel-quarkus-"))
+ kit.Spec.Dependencies = append(kit.Spec.Dependencies, "camel:"+strings.TrimPrefix(item, "camel-quarkus-"))
case strings.HasPrefix(item, "camel-"):
kit.Spec.Dependencies = append(kit.Spec.Dependencies, "camel:"+strings.TrimPrefix(item, "camel-"))
}
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index f5fa029..6f42700 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -90,7 +90,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
switch e.CamelCatalog.Runtime.Provider {
case v1.RuntimeProviderQuarkus:
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus:camel-quarkus-management")
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel-quarkus:jaxb")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:jaxb")
}
// TODO: We may want to make the Jolokia version configurable