This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new c530f19242 Upgrade jolokia to 2.0.2 c530f19242 is described below commit c530f1924252e7a66a980f3b72c16c9cedc64907 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon May 20 13:47:53 2024 +0100 Upgrade jolokia to 2.0.2 --- pom.xml | 2 +- poms/bom/pom.xml | 5 +++-- poms/bom/src/main/generated/flattened-full-pom.xml | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 19f9375483..4749057b98 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ <jakarta.jms-api.version>${jakarta-jms-api-version}</jakarta.jms-api.version> <java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch --> <jodatime.version>${jodatime2-version}</jodatime.version><!-- Mess in transitive dependencies of Splunk --> - <jolokia.version>1.7.2</jolokia.version><!-- For camel-k --> + <jolokia.version>2.0.2</jolokia.version><!-- For camel-k --> <jaxen.version>1.2.0</jaxen.version> <javassist.version>${javassist-version}</javassist.version><!-- debezium --> <jetty.version>${jetty-version}</jetty.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 35c4d279d6..ac2cf8f9e6 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -7043,12 +7043,13 @@ </dependency> <dependency> <groupId>org.jolokia</groupId> - <artifactId>jolokia-jvm</artifactId> + <artifactId>jolokia-agent-jvm</artifactId> <version>${jolokia.version}</version> + <classifier>javaagent</classifier> <exclusions> <exclusion> <groupId>org.jolokia</groupId> - <artifactId>jolokia-core</artifactId> + <artifactId>jolokia-server-core</artifactId> </exclusion> <exclusion> <groupId>com.googlecode.json-simple</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 48c53d5a67..e65dfb0f1b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6964,12 +6964,13 @@ </dependency> <dependency> <groupId>org.jolokia</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>jolokia-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.7.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jolokia-agent-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <classifier>javaagent</classifier><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.jolokia</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>jolokia-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jolokia-server-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> <exclusion> <groupId>com.googlecode.json-simple</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->