Skip to content

Commit

Permalink
Upgrade to Jolokia 2.1.2. Remove json-simple 1.1.1
Browse files Browse the repository at this point in the history
Co-author: JB Onofré <jbonofre@apache.org>

(cherry picked from commit 453d41d)
  • Loading branch information
Paul Gale authored and jbonofre committed Jan 8, 2025
1 parent aaa6632 commit ba2701a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
5 changes: 0 additions & 5 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion assembly/src/main/descriptors/common-bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit ba2701a

Please sign in to comment.