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 12:43:16 UTC
[tomee] branch tomee-7.1.x 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 tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new 5db25b2 Update to ActiveMQ 5.15.12
5db25b2 is described below
commit 5db25b2850b7bd29d3311c623c7ee2ed5cbb5749
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 ae5fc43..2905d14 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;
@@ -185,6 +186,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 ee8f022..1f67075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
<commons-net.version>3.3</commons-net.version>
<bval.version>1.1.2</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>