You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/02/01 10:16:25 UTC
[camel-k-runtime] branch release-1.15.x updated: Backport: Set jolokia dependency version in camel-k-runtime-bom to avoid declaring the hard-coded dependency in camel-k-operator
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.15.x by this push:
new 0484b483 Backport: Set jolokia dependency version in camel-k-runtime-bom to avoid declaring the hard-coded dependency in camel-k-operator
0484b483 is described below
commit 0484b4838705c64e7f710e769212456bafd4c61e
Author: Claudio Miranda <cl...@claudius.com.br>
AuthorDate: Tue Jan 31 17:46:52 2023 -0300
Backport: Set jolokia dependency version in camel-k-runtime-bom to avoid declaring the hard-coded dependency in camel-k-operator
---
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 11 -----------
support/camel-k-runtime-bom/pom.xml | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 11 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 4c30700f..85eafbce 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
@@ -348,17 +348,6 @@ 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) {
diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml
index 9ceb39b8..2142a9d1 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -36,6 +36,7 @@
<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>1667984005</project.build.outputTimestamp>
+ <jolokia-version>1.7.1</jolokia-version>
<maven-enforcer-plugin-version>3.1.0</maven-enforcer-plugin-version>
<maven-version>3.6.3</maven-version>
<quarkus-platform-version>2.13.4.Final</quarkus-platform-version>
@@ -217,6 +218,21 @@
<artifactId>camel-k-resume-kafka</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <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>