This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-6.1.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-6.1.x by this push:
new ba2701a7a9 Upgrade to Jolokia 2.1.2. Remove json-simple 1.1.1
ba2701a7a9 is described below
commit ba2701a7a962ffd4a6da6d4cfaf92990199c89a8
Author: Paul Gale <[email protected]>
AuthorDate: Wed Nov 20 15:42:23 2024 -0500
Upgrade to Jolokia 2.1.2. Remove json-simple 1.1.1
Co-author: JB Onofré <[email protected]>
(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 aee7653f6f..804df50b8c 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 81ea92c967..ae1b8d91b6 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 327970a0df..9caf7936f3 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
