You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/28 17:20:09 UTC
[1/2] activemq-artemis git commit: This closes #3 Jolokia update
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9972624ba -> eb4355a62
This closes #3 Jolokia update
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/eb4355a6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/eb4355a6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/eb4355a6
Branch: refs/heads/master
Commit: eb4355a62e8102aa6ecf738fc399f5ab7fd8ff58
Parents: 9972624 a9b6753
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu May 28 11:19:43 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 28 11:19:43 2015 -0400
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-117: Upgrade to Jolokia
1.3.1
Posted by cl...@apache.org.
ARTEMIS-117: Upgrade to Jolokia 1.3.1
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a9b6753d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a9b6753d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a9b6753d
Branch: refs/heads/master
Commit: a9b6753d93156b57c01a3f6e8a0193ed546911e3
Parents: 9972624
Author: Claus Ibsen <cl...@gmail.com>
Authored: Thu May 28 11:59:46 2015 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 28 11:19:43 2015 -0400
----------------------------------------------------------------------
.../activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9b6753d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index 790cda3..66468dc 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,4 +1,4 @@
<!-- The web server is only bound to loalhost by default -->
<web bind="http://localhost:${http.port}" path="web">
- <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+ <app url="jolokia" war="jolokia-war-1.3.1.war"/>
</web>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9b6753d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 103ddba..f6083d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,7 +450,7 @@
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>
<type>war</type>
- <version>1.2.3</version>
+ <version>1.3.1</version>
<!-- License: Apache 2.0 -->
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->