You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2020/05/11 11:01:53 UTC
[tomee] branch master updated: Update to ActiveMQ 5.15.12
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 17168ad Update to ActiveMQ 5.15.12
17168ad is described below
commit 17168ad95e35f1758e16364c2398dea10a4034d8
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon May 11 11:22:35 2020 +0100
Update to ActiveMQ 5.15.12
---
.../java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java | 5 +++++
pom.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
index ab70a9f..2743df6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
@@ -21,6 +21,7 @@ import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerFactoryHandler;
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.network.DiscoveryNetworkConnector;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.ra.ActiveMQResourceAdapter;
@@ -186,6 +187,10 @@ public class ActiveMQ5Factory implements BrokerFactoryHandler {
broker.setStartAsync(false);
+ final ManagementContext managementContext = new ManagementContext();
+ managementContext.setCreateConnector(false);
+ broker.setManagementContext(managementContext);
+
final BrokerService bs = broker;
final Thread start = new Thread("ActiveMQFactory start and checkpoint") {
diff --git a/pom.xml b/pom.xml
index 167af97..63665d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
<commons-net.version>3.3</commons-net.version>
<bval.version>2.0.3</bval.version>
- <org.apache.activemq.version>5.15.10</org.apache.activemq.version>
+ <org.apache.activemq.version>5.15.12</org.apache.activemq.version>
<org.springframework.version>3.1.4.RELEASE</org.springframework.version>
<junit.version>4.12</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>