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 2020/10/02 12:36:49 UTC
[camel-k] 02/02: fix: Jolokia trait adds JAXB dependency that
required by Hawtio
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cbda8e0dd738f6a16b78e7ac14e29e34392479f2
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Wed Sep 30 17:50:06 2020 +0200
fix: Jolokia trait adds JAXB dependency that required by Hawtio
---
pkg/trait/jolokia.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index f002c36..f48b8df 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -85,12 +85,15 @@ func (t *jolokiaTrait) Configure(e *Environment) (bool, error) {
func (t *jolokiaTrait) Apply(e *Environment) (err error) {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
// Add the Camel management and Jolokia agent dependencies
+ // Also add the Camel JAXB dependency, that's required by Hawtio
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")
case v1.RuntimeProviderMain:
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel/camel-management")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:jaxb")
}
// TODO: We may want to make the Jolokia version configurable