From ba2701a7a962ffd4a6da6d4cfaf92990199c89a8 Mon Sep 17 00:00:00 2001
From: Paul Gale <paul.gale@coxautoinc.om>
Date: Wed, 20 Nov 2024 15:42:23 -0500
Subject: [PATCH] Upgrade to Jolokia 2.1.2. Remove json-simple 1.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-author: JB Onofré <jbonofre@apache.org>

(cherry picked from commit 453d41da06a0afad676f80888f81c6a23cc72292)
---
 assembly/pom.xml                             | 5 -----
 assembly/src/main/descriptors/common-bin.xml | 2 +-
 pom.xml                                      | 4 +---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index aee7653f6f0..804df50b8ca 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -505,11 +505,6 @@
       <artifactId>jolokia-service-serializer</artifactId>
       <version>${jolokia-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>${json-simple-version}</version>
-    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.url</groupId>
       <artifactId>pax-url-aether</artifactId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 81ea92c9673..ae1b8d91b6d 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -313,9 +313,9 @@
 
         <!-- REST API -->
         <include>org.jolokia:jolokia-server-core</include>
+        <include>org.jolokia:jolokia-json</include>
         <include>org.jolokia:jolokia-service-jmx</include>
         <include>org.jolokia:jolokia-service-serializer</include>
-        <include>com.googlecode.json-simple:json-simple</include>
       </includes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
diff --git a/pom.xml b/pom.xml
index 327970a0df9..9caf7936f35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,10 +76,8 @@
     <tomcat-api-version>9.0.65</tomcat-api-version>
     <jettison-version>1.5.4</jettison-version>
     <jmock-version>2.13.1</jmock-version>
-    <jolokia-version>2.0.3</jolokia-version>
+    <jolokia-version>2.1.2</jolokia-version>
     <josql-version>1.5_5</josql-version>
-    <!-- for json-simple use same version as jolokia uses -->
-    <json-simple-version>1.1.1</json-simple-version>
     <junit-version>4.13.2</junit-version>
     <hamcrest-version>1.3</hamcrest-version>
     <karaf-version>4.3.7</karaf-version>