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:47 UTC
[camel-k] branch master updated (91074b9 -> cbda8e0)
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 91074b9 Fix typo
new 7adfff1 fix: Make Jolokia trait compatible with Quarkus runtime
new cbda8e0 fix: Jolokia trait adds JAXB dependency that required by Hawtio
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pkg/trait/jolokia.go | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
[camel-k] 02/02: fix: Jolokia trait adds JAXB dependency that
required by Hawtio
Posted by as...@apache.org.
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
[camel-k] 01/02: fix: Make Jolokia trait compatible with Quarkus
runtime
Posted by as...@apache.org.
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 7adfff1e9ca7a8a07f8455b3119159454b054350
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Wed Sep 30 17:25:58 2020 +0200
fix: Make Jolokia trait compatible with Quarkus runtime
---
pkg/trait/jolokia.go | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 8363bbb..f002c36 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -85,9 +85,17 @@ 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
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel/camel-management")
+
+ switch e.CamelCatalog.Runtime.Provider {
+ case v1.RuntimeProviderQuarkus:
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.quarkus/camel-quarkus-management")
+ case v1.RuntimeProviderMain:
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel/camel-management")
+ }
+
// TODO: We may want to make the Jolokia version configurable
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.jolokia/jolokia-jvm:jar:agent:1.6.2")
+
return nil
}