From f77eadc1e90fc5d4d726bc5c8c0d3c8e4463d0ac Mon Sep 17 00:00:00 2001
From: Tadayoshi Sato <sato.tadayoshi@gmail.com>
Date: Wed, 22 Nov 2023 14:03:46 +0900
Subject: [PATCH] camel-quarkus - Switch to Jolokia 2.0.0-M4

---
 camel-quarkus/pom.xml | 5 +++--
 pom.xml               | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/camel-quarkus/pom.xml b/camel-quarkus/pom.xml
index 7370b82..f960001 100644
--- a/camel-quarkus/pom.xml
+++ b/camel-quarkus/pom.xml
@@ -31,7 +31,7 @@
     <quarkus.container-image.tag>latest</quarkus.container-image.tag>
     <!-- Jolokia agent settings -->
     <quarkus.jib.jvm-additional-arguments>
-      -javaagent:lib/main/org.jolokia.jolokia-jvm-${jolokia-version}.jar=protocol=${jolokia.protocol}\,host=${jolokia.host}\,port=${jolokia.port}\,useSslClientAuthentication=${jolokia.useSslClientAuthentication}\,caCert=${jolokia.caCert}\,clientPrincipal.1=cn=hawtio-online.hawtio.svc\,extendedClientCheck=${jolokia.extendedClientCheck}\,discoveryEnabled=${jolokia.discoveryEnabled}
+      -javaagent:lib/main/org.jolokia.jolokia-agent-jvm-${jolokia-version}-agent.jar=protocol=${jolokia.protocol}\,host=${jolokia.host}\,port=${jolokia.port}\,useSslClientAuthentication=${jolokia.useSslClientAuthentication}\,caCert=${jolokia.caCert}\,clientPrincipal.1=cn=hawtio-online.hawtio.svc\,extendedClientCheck=${jolokia.extendedClientCheck}\,discoveryEnabled=${jolokia.discoveryEnabled}
     </quarkus.jib.jvm-additional-arguments>
     <quarkus.kubernetes.ports.jolokia.container-port>8778</quarkus.kubernetes.ports.jolokia.container-port>
     <quarkus.kubernetes.image-pull-policy>always</quarkus.kubernetes.image-pull-policy>
@@ -100,8 +100,9 @@
 
     <dependency>
       <groupId>org.jolokia</groupId>
-      <artifactId>jolokia-jvm</artifactId>
+      <artifactId>jolokia-agent-jvm</artifactId>
       <version>${jolokia-version}</version>
+      <classifier>agent</classifier>
     </dependency>
 
     <!-- Quarkus -->
diff --git a/pom.xml b/pom.xml
index 88610d3..1b58ecc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,7 @@
     <spring-version>6.0.13</spring-version>
     <spring-boot-version>3.1.5</spring-boot-version>
 
-    <!-- TODO: <jolokia-version>2.0.0-M4</jolokia-version> -->
-    <jolokia-version>1.7.2</jolokia-version>
+    <jolokia-version>2.0.0-M4</jolokia-version>
     <prometheus-jmx-exporter-version>0.20.0</prometheus-jmx-exporter-version>
 
     <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>