[camel-k-runtime] branch main updated: Move jolokia exclusions from generate-catalog maven plugin to the camel-k-runtime-bom/pom.xml

[pcongiusti]

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

pcongiusti 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 f5a15cac Move jolokia exclusions from generate-catalog maven plugin to 
the camel-k-runtime-bom/pom.xml
f5a15cac is described below

commit f5a15cac6b032534d15224ddd346ccfe41127c98
Author: Claudio Miranda <clau...@claudius.com.br>
AuthorDate: Tue Jan 31 17:58:21 2023 -0300

    Move jolokia exclusions from generate-catalog maven plugin to the 
camel-k-runtime-bom/pom.xml
---
 .../apache/camel/k/tooling/maven/GenerateCatalogMojo.java    | 12 ------------
 support/camel-k-runtime-bom/pom.xml                          | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

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 1d598aec..cf902a42 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,7 +39,6 @@ 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;
@@ -338,17 +337,6 @@ public class GenerateCatalogMojo extends AbstractMojo {
         processLoaders(specBuilder);
 
         specBuilder.putAllArtifacts(artifacts);
-
-        // 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) {
diff --git a/support/camel-k-runtime-bom/pom.xml 
b/support/camel-k-runtime-bom/pom.xml
index d6619118..1182c411 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -201,6 +201,16 @@
                 <groupId>org.jolokia</groupId>
                 <artifactId>jolokia-jvm</artifactId>
                 <version>${jolokia-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.jolokia</groupId>
+                        <artifactId>jolokia-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.googlecode.json-simple</groupId>
+                        <artifactId>json-simple</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>