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 2017/09/29 15:35:31 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1439 remove duplicated
jolokia version
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9b4e8420d -> a3041511b
ARTEMIS-1439 remove duplicated jolokia version
As per review comment, removing duplicatation of version declaration of jolokia.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d34dbbd3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d34dbbd3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d34dbbd3
Branch: refs/heads/master
Commit: d34dbbd349fc43b3f4f7bbb8cebf631cd1336169
Parents: 9b4e842
Author: Michael Andre Pearce <Mi...@me.com>
Authored: Fri Sep 29 08:06:03 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 29 11:35:25 2017 -0400
----------------------------------------------------------------------
artemis-hawtio/pom.xml | 1 -
pom.xml | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d34dbbd3/artemis-hawtio/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index 0b174d3..677f9b2 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -40,7 +40,6 @@
<hawtio.version>1.5.4</hawtio.version>
<jline.version>3.2.0</jline.version>
- <jolokia-version>1.3.7</jolokia-version>
<junit-version>4.11</junit-version>
<log4j-version>1.2.17</log4j-version>
<maven-version>3.0.4</maven-version>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d34dbbd3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bdc4110..5ff0ee6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
<johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>
+ <jolokia.version>1.3.7</jolokia.version>
<hawtbuff.version>1.11</hawtbuff.version>
<jb.logmanager.version>2.0.3.Final</jb.logmanager.version>
<jb.slf4j-jboss-logmanager.version>1.0.3.GA</jb.slf4j-jboss-logmanager.version>
@@ -596,7 +597,7 @@
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>
<type>war</type>
- <version>1.3.7</version>
+ <version>${jolokia.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->
[2/2] activemq-artemis git commit: This closes #1564
Posted by cl...@apache.org.
This closes #1564
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a3041511
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a3041511
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a3041511
Branch: refs/heads/master
Commit: a3041511b030c42f4d01962827647bd173d507f5
Parents: 9b4e842 d34dbbd
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 29 11:35:26 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 29 11:35:26 2017 -0400
----------------------------------------------------------------------
artemis-hawtio/pom.xml | 1 -
pom.xml | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------