Repository: activemq Updated Branches: refs/heads/trunk da5d0d819 -> d793db444
AMQ-5091: Upgrade to jolokia 1.2 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d793db44 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d793db44 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d793db44 Branch: refs/heads/trunk Commit: d793db44404f8fa92246b09b57199443b2351fda Parents: da5d0d8 Author: Claus Ibsen <[email protected]> Authored: Mon Mar 10 13:58:33 2014 +0100 Committer: Claus Ibsen <[email protected]> Committed: Mon Mar 10 13:58:33 2014 +0100 ---------------------------------------------------------------------- assembly/pom.xml | 11 +---------- pom.xml | 4 +++- 2 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/d793db44/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 4c29cf8..2303354 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/activemq/blob/d793db44/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9478b66..27ab4ff 100755 --- a/pom.xml +++ b/pom.xml @@ -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>
