Skip to content

Commit 14064ff

Browse files
committed
This closes #1356
2 parents 0475367 + 453d41d commit 14064ff

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

assembly/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,6 @@
505505
<artifactId>jolokia-service-serializer</artifactId>
506506
<version>${jolokia-version}</version>
507507
</dependency>
508-
<dependency>
509-
<groupId>com.googlecode.json-simple</groupId>
510-
<artifactId>json-simple</artifactId>
511-
<version>${json-simple-version}</version>
512-
</dependency>
513508
<dependency>
514509
<groupId>org.ops4j.pax.url</groupId>
515510
<artifactId>pax-url-aether</artifactId>

assembly/src/main/descriptors/common-bin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,9 @@
313313

314314
<!-- REST API -->
315315
<include>org.jolokia:jolokia-server-core</include>
316+
<include>org.jolokia:jolokia-json</include>
316317
<include>org.jolokia:jolokia-service-jmx</include>
317318
<include>org.jolokia:jolokia-service-serializer</include>
318-
<include>com.googlecode.json-simple:json-simple</include>
319319
</includes>
320320
<fileMode>0644</fileMode>
321321
<directoryMode>0755</directoryMode>

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@
7676
<tomcat-api-version>9.0.65</tomcat-api-version>
7777
<jettison-version>1.5.4</jettison-version>
7878
<jmock-version>2.13.1</jmock-version>
79-
<jolokia-version>2.0.3</jolokia-version>
79+
<jolokia-version>2.1.2</jolokia-version>
8080
<josql-version>1.5_5</josql-version>
81-
<!-- for json-simple use same version as jolokia uses -->
82-
<json-simple-version>1.1.1</json-simple-version>
8381
<junit-version>4.13.2</junit-version>
8482
<hamcrest-version>1.3</hamcrest-version>
8583
<karaf-version>4.3.7</karaf-version>

0 commit comments

Comments
 (0)