This is an automated email from the ASF dual-hosted git repository.

tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git


The following commit(s) were added to refs/heads/main by this push:
     new 82ef24b  fix(catalog): add jolokia-jvm with exclusions to 
camel-catalog (#742)
82ef24b is described below

commit 82ef24b8bfa16e1634833fac4021eeaac6b0d107
Author: Tadayoshi Sato <sato.tadayo...@gmail.com>
AuthorDate: Fri Oct 8 10:02:43 2021 +0900

    fix(catalog): add jolokia-jvm with exclusions to camel-catalog (#742)
---
 .../apache/camel/k/tooling/maven/GenerateCatalogMojo.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git 
a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
 
b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
index 17061d0..656503e 100644
--- 
a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
+++ 
b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
@@ -39,6 +39,7 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import org.apache.camel.catalog.DefaultCamelCatalog;
 import org.apache.camel.catalog.quarkus.QuarkusRuntimeProvider;
 import org.apache.camel.impl.engine.AbstractCamelContext;
+import org.apache.camel.k.catalog.model.Artifact;
 import org.apache.camel.k.catalog.model.CamelArtifact;
 import org.apache.camel.k.catalog.model.CamelCapability;
 import org.apache.camel.k.catalog.model.CamelLoader;
@@ -335,6 +336,17 @@ public class GenerateCatalogMojo extends AbstractMojo {
                     .build())
                 .build()
         );
+
+        // required for Jolokia 1.7.1
+        specBuilder.putArtifact(
+            new CamelArtifact.Builder()
+                .groupId("org.jolokia")
+                .artifactId("jolokia-jvm")
+                .addExclusions(
+                    Artifact.from("org.jolokia","jolokia-core"),
+                    Artifact.from("com.googlecode.json-simple","json-simple"))
+                .build()
+        );
     }
 
     private void processLoaders(CamelCatalogSpec.Builder specBuilder) {

Reply via email to