AMQ-5091: Upgrade to jolokia 1.2

This commit is contained in:
Claus Ibsen 2014-03-10 13:58:33 +01:00
parent da5d0d819e
commit d793db4440
2 changed files with 4 additions and 11 deletions

View File

@ -30,15 +30,6 @@
<name>ActiveMQ :: Assembly</name>
<description>Puts together the ActiveMQ distribution</description>
<!-- Maven repository hosting Jolokia -->
<repositories>
<repository>
<id>labs-consol-release</id>
<name>ConSol* Labs Repository (Releases)</name>
<url>http://labs.consol.de/maven/repository</url>
</repository>
</repositories>
<dependencies>
<!-- activemq -->
@ -416,7 +407,7 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
<version>${json-simple-version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.insight</groupId>

View File

@ -80,8 +80,10 @@
<jstl-version>1.1.2</jstl-version>
<jettison-version>1.3.5</jettison-version>
<jmock-version>2.5.1</jmock-version>
<jolokia-version>1.1.5</jolokia-version>
<jolokia-version>1.2.0</jolokia-version>
<josql-version>1.5_5</josql-version>
<!-- for json-simple use same version as jolokia uses -->
<json-simple-version>1.1</json-simple-version>
<junit-version>4.11</junit-version>
<hamcrest-version>1.3</hamcrest-version>
<jxta-version>2.0</jxta-version>