diff -Nru activemq-5.15.10/activemq-all/pom.xml activemq-5.15.11/activemq-all/pom.xml
--- activemq-5.15.10/activemq-all/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-all/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>
@@ -115,7 +115,7 @@
                   <include>org.fusesource.hawtbuf:hawtbuf</include>
                   <include>org.jasypt:jasypt</include>
                   <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-                  <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+                  <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                   <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
                   <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
                   <include>org.slf4j:slf4j-api</include>
diff -Nru activemq-5.15.10/activemq-amqp/pom.xml activemq-5.15.11/activemq-amqp/pom.xml
--- activemq-5.15.10/activemq-amqp/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-amqp/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-amqp</artifactId>
diff -Nru activemq-5.15.10/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java activemq-5.15.11/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
--- activemq-5.15.10/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java	2019-11-20 16:00:05.000000000 +0000
@@ -52,6 +52,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.jms.JMSException;
@@ -67,7 +68,11 @@
 import org.apache.activemq.command.ActiveMQStreamMessage;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.CommandTypes;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.transport.amqp.AmqpProtocolException;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.TypeConversionSupport;
@@ -333,6 +338,15 @@
                 apMap = new HashMap<>();
             }
             apMap.put(key, value);
+
+            int messageType = message.getDataStructureType();
+            if (messageType == CommandTypes.ACTIVEMQ_MESSAGE) {
+                // Type of command to recognize advisory message
+                Object data = message.getDataStructure();
+                if(data != null) {
+                    apMap.put("ActiveMqDataStructureType", data.getClass().getSimpleName());
+                }
+            }
         }
 
         final AmqpWritableBuffer buffer = new AmqpWritableBuffer();
@@ -376,7 +390,39 @@
 
         int messageType = message.getDataStructureType();
 
-        if (messageType == CommandTypes.ACTIVEMQ_BYTES_MESSAGE) {
+        if (messageType == CommandTypes.ACTIVEMQ_MESSAGE) {
+        	Object data = message.getDataStructure();
+            if (data instanceof ConnectionInfo) {
+    			ConnectionInfo connectionInfo = (ConnectionInfo)data;
+        		final HashMap<String, Object> connectionMap = new LinkedHashMap<String, Object>();
+        		
+        		connectionMap.put("ConnectionId", connectionInfo.getConnectionId().getValue());
+        		connectionMap.put("ClientId", connectionInfo.getClientId());
+        		connectionMap.put("ClientIp", connectionInfo.getClientIp());
+        		connectionMap.put("UserName", connectionInfo.getUserName());
+        		connectionMap.put("BrokerMasterConnector", connectionInfo.isBrokerMasterConnector());
+        		connectionMap.put("Manageable", connectionInfo.isManageable());
+        		connectionMap.put("ClientMaster", connectionInfo.isClientMaster());
+        		connectionMap.put("FaultTolerant", connectionInfo.isFaultTolerant());
+        		connectionMap.put("FailoverReconnect", connectionInfo.isFailoverReconnect());
+        		
+    			body = new AmqpValue(connectionMap);
+            } else if (data instanceof RemoveInfo) {
+    			RemoveInfo removeInfo = (RemoveInfo)message.getDataStructure();
+        		final HashMap<String, Object> removeMap = new LinkedHashMap<String, Object>();
+        		
+            	if (removeInfo.isConnectionRemove()) {
+            		removeMap.put(ConnectionId.class.getSimpleName(), ((ConnectionId)removeInfo.getObjectId()).getValue());
+            	} else if (removeInfo.isConsumerRemove()) {
+            		removeMap.put(ConsumerId.class.getSimpleName(), ((ConsumerId)removeInfo.getObjectId()).getValue());
+            		removeMap.put("SessionId", ((ConsumerId)removeInfo.getObjectId()).getSessionId());
+            		removeMap.put("ConnectionId", ((ConsumerId)removeInfo.getObjectId()).getConnectionId());
+            		removeMap.put("ParentId", ((ConsumerId)removeInfo.getObjectId()).getParentId());
+            	}
+            	
+            	body = new AmqpValue(removeMap);
+            }
+        } else if (messageType == CommandTypes.ACTIVEMQ_BYTES_MESSAGE) {
             Binary payload = getBinaryFromMessageBody((ActiveMQBytesMessage) message);
 
             if (payload == null) {
diff -Nru activemq-5.15.10/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java activemq-5.15.11/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java
--- activemq-5.15.10/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformerTest.java	2019-11-20 16:00:05.000000000 +0000
@@ -39,6 +39,7 @@
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -57,6 +58,9 @@
 import org.apache.activemq.command.ActiveMQTempTopic;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.qpid.proton.amqp.Binary;
 import org.apache.qpid.proton.amqp.Symbol;
@@ -771,6 +775,82 @@
         String contents = new String(data.getArray(), data.getArrayOffset(), data.getLength(), StandardCharsets.UTF_8);
         assertEquals(contentString, contents);
     }
+    
+    @Test 
+    public void testConvertConnectionInfo() throws Exception {
+    	String connectionId = "myConnectionId";
+    	String clientId = "myClientId";
+
+    	ConnectionInfo dataStructure = new ConnectionInfo();
+    	dataStructure.setConnectionId(new ConnectionId(connectionId));
+    	dataStructure.setClientId(clientId);
+    	
+    	ActiveMQMessage outbound = createMessage();
+    	Map<String, String> properties = new HashMap<String, String>();
+    	properties.put("originUrl", "localhost");
+    	outbound.setProperties(properties);
+    	outbound.setDataStructure(dataStructure);
+    	outbound.onSend();
+    	outbound.storeContent();
+    	
+    	JMSMappingOutboundTransformer transformer = new JMSMappingOutboundTransformer();
+
+        EncodedMessage encoded = transformer.transform(outbound);
+        assertNotNull(encoded);
+        
+        Message amqp = encoded.decode();
+
+        assertNotNull(amqp.getApplicationProperties());
+        
+        Map<String, Object> apMap = amqp.getApplicationProperties().getValue();
+        assertEquals(ConnectionInfo.class.getSimpleName(), apMap.get("ActiveMqDataStructureType"));
+        
+        assertNotNull(amqp.getBody());
+        assertTrue(amqp.getBody() instanceof AmqpValue);
+        assertTrue(((AmqpValue) amqp.getBody()).getValue() instanceof Map);
+
+        @SuppressWarnings("unchecked")
+        Map<Object, Object> amqpMap = (Map<Object, Object>) ((AmqpValue) amqp.getBody()).getValue();
+
+        assertTrue(connectionId.equals(amqpMap.get("ConnectionId")));
+        assertTrue(clientId.equals(amqpMap.get("ClientId")));
+    }
+
+    @Test 
+    public void testConvertRemoveInfo() throws Exception {
+    	String connectionId = "myConnectionId";
+
+    	RemoveInfo dataStructure = new RemoveInfo(new ConnectionId(connectionId));
+    	
+    	ActiveMQMessage outbound = createMessage();
+    	Map<String, String> properties = new HashMap<String, String>();
+    	properties.put("originUrl", "localhost");
+    	outbound.setProperties(properties);
+    	outbound.setDataStructure(dataStructure);
+    	outbound.onSend();
+    	outbound.storeContent();
+    	
+    	JMSMappingOutboundTransformer transformer = new JMSMappingOutboundTransformer();
+
+        EncodedMessage encoded = transformer.transform(outbound);
+        assertNotNull(encoded);
+        
+        Message amqp = encoded.decode();
+
+        assertNotNull(amqp.getApplicationProperties());
+        
+        Map<String, Object> apMap = amqp.getApplicationProperties().getValue();
+        assertEquals(RemoveInfo.class.getSimpleName(), apMap.get("ActiveMqDataStructureType"));
+        
+        assertNotNull(amqp.getBody());
+        assertTrue(amqp.getBody() instanceof AmqpValue);
+        assertTrue(((AmqpValue) amqp.getBody()).getValue() instanceof Map);
+
+        @SuppressWarnings("unchecked")
+        Map<Object, Object> amqpMap = (Map<Object, Object>) ((AmqpValue) amqp.getBody()).getValue();
+
+        assertTrue(connectionId.equals(amqpMap.get("ConnectionId")));
+    }
 
     //----- Test JMSDestination Handling -------------------------------------//
 
diff -Nru activemq-5.15.10/activemq-blueprint/pom.xml activemq-5.15.11/activemq-blueprint/pom.xml
--- activemq-5.15.10/activemq-blueprint/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-blueprint/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>
diff -Nru activemq-5.15.10/activemq-broker/pom.xml activemq-5.15.11/activemq-broker/pom.xml
--- activemq-5.15.10/activemq-broker/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-broker/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-broker</artifactId>
diff -Nru activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
--- activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java	2019-11-20 16:00:05.000000000 +0000
@@ -175,7 +175,7 @@
     private TaskRunnerFactory persistenceTaskRunnerFactory;
     private SystemUsage systemUsage;
     private SystemUsage producerSystemUsage;
-    private SystemUsage consumerSystemUsaage;
+    private SystemUsage consumerSystemUsage;
     private PersistenceAdapter persistenceAdapter;
     private PersistenceAdapterFactory persistenceFactory;
     protected DestinationFactory destinationFactory;
@@ -1207,29 +1207,29 @@
      * @throws IOException
      */
     public SystemUsage getConsumerSystemUsage() throws IOException {
-        if (this.consumerSystemUsaage == null) {
+        if (this.consumerSystemUsage == null) {
             if (splitSystemUsageForProducersConsumers) {
-                this.consumerSystemUsaage = new SystemUsage(getSystemUsage(), "Consumer");
+                this.consumerSystemUsage = new SystemUsage(getSystemUsage(), "Consumer");
                 float portion = consumerSystemUsagePortion / 100f;
-                this.consumerSystemUsaage.getMemoryUsage().setUsagePortion(portion);
-                addService(this.consumerSystemUsaage);
+                this.consumerSystemUsage.getMemoryUsage().setUsagePortion(portion);
+                addService(this.consumerSystemUsage);
             } else {
-                consumerSystemUsaage = getSystemUsage();
+                consumerSystemUsage = getSystemUsage();
             }
         }
-        return this.consumerSystemUsaage;
+        return this.consumerSystemUsage;
     }
 
     /**
-     * @param consumerSystemUsaage
+     * @param consumerSystemUsage
      *            the storeSystemUsage to set
      */
-    public void setConsumerSystemUsage(SystemUsage consumerSystemUsaage) {
-        if (this.consumerSystemUsaage != null) {
-            removeService(this.consumerSystemUsaage);
+    public void setConsumerSystemUsage(SystemUsage consumerSystemUsage) {
+        if (this.consumerSystemUsage != null) {
+            removeService(this.consumerSystemUsage);
         }
-        this.consumerSystemUsaage = consumerSystemUsaage;
-        addService(this.consumerSystemUsaage);
+        this.consumerSystemUsage = consumerSystemUsage;
+        addService(this.consumerSystemUsage);
     }
 
     /**
diff -Nru activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
--- activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java	2019-11-20 16:00:05.000000000 +0000
@@ -240,10 +240,10 @@
 
             private void onAcceptError(Exception error, String remoteHost) {
                 if (brokerService != null && brokerService.isStopping()) {
-                    LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error);
+                    LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
                 } else {
-                    LOG.error("Could not accept connection {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error);
-                    LOG.debug("Reason: " + error, error);
+                    LOG.warn("Could not accept connection {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
+                    LOG.debug("Reason: " + error.getMessage(), error);
                 }
             }
         });
diff -Nru activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
--- activemq-5.15.10/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java	2019-11-20 16:00:05.000000000 +0000
@@ -131,8 +131,10 @@
 
     @Override
     public Subscription addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
-        // don't track selectors for advisory topics or temp destinations
-        if (!AdvisorySupport.isAdvisoryTopic(info.getDestination()) && !info.getDestination().isTemporary()) {
+		// don't track selectors for advisory topics, temp destinations or console
+		// related consumers
+		if (!AdvisorySupport.isAdvisoryTopic(info.getDestination()) && !info.getDestination().isTemporary()
+				&& !info.isBrowser()) {
             String destinationName = info.getDestination().getQualifiedName();
             LOG.debug("Caching consumer selector [{}] on  '{}'", info.getSelector(), destinationName);
 
diff -Nru activemq-5.15.10/activemq-camel/pom.xml activemq-5.15.11/activemq-camel/pom.xml
--- activemq-5.15.10/activemq-camel/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-camel/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-camel</artifactId>
diff -Nru activemq-5.15.10/activemq-cf/pom.xml activemq-5.15.11/activemq-cf/pom.xml
--- activemq-5.15.10/activemq-cf/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-cf/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-cf</artifactId>
diff -Nru activemq-5.15.10/activemq-client/pom.xml activemq-5.15.11/activemq-client/pom.xml
--- activemq-5.15.10/activemq-client/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-client/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-client</artifactId>
diff -Nru activemq-5.15.10/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java activemq-5.15.11/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
--- activemq-5.15.10/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java	2019-11-20 16:00:05.000000000 +0000
@@ -1377,7 +1377,7 @@
     }
 
     private void forceCloseOnSecurityException(Throwable exception) {
-        LOG.trace("force close on security exception:" + this + ", transport=" + transport, exception);
+        LOG.trace("force close on security exception:{}, transport={}", this, transport, exception);
         onException(new IOException("Force close due to SecurityException on connect", exception));
     }
 
@@ -1941,8 +1941,8 @@
                     }
                 });
             } else {
-                LOG.debug("Async client internal exception occurred with no exception listener registered: "
-                        + error, error);
+                LOG.debug("Async client internal exception occurred with no exception listener registered: {}",
+                        error, error);
             }
         }
     }
@@ -1969,7 +1969,7 @@
                 });
 
             } else {
-                LOG.debug("Async exception with no exception listener: " + error, error);
+                LOG.debug("Async exception with no exception listener: {}", error, error);
             }
         }
     }
diff -Nru activemq-5.15.10/activemq-console/pom.xml activemq-5.15.11/activemq-console/pom.xml
--- activemq-5.15.10/activemq-console/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-console/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
@@ -125,7 +125,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
+      <artifactId>velocity-engine-core</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
diff -Nru activemq-5.15.10/activemq-http/pom.xml activemq-5.15.11/activemq-http/pom.xml
--- activemq-5.15.10/activemq-http/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-http</artifactId>
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java	2019-11-20 16:00:05.000000000 +0000
@@ -201,7 +201,7 @@
                     }
                     stream.close();
                 }
-            } catch (IOException e) {
+            } catch (Exception e) { // handle RuntimeException from unmarshal
                 onException(IOExceptionSupport.create("Failed to perform GET on: " + remoteUrl + " Reason: " + e.getMessage(), e));
                 break;
             } finally {
@@ -414,4 +414,10 @@
     public WireFormat getWireFormat() {
         return getTextWireFormat();
     }
+
+    @Override
+    protected String getSystemPropertyPrefix() {
+        return "http.";
+    }
+
 }
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java	2019-11-20 16:00:05.000000000 +0000
@@ -48,9 +48,11 @@
             Map<String, Object> jettyOptions = IntrospectionSupport.extractProperties(options, "jetty.");
             Map<String, Object> httpOptions = IntrospectionSupport.extractProperties(options, "http.");
             Map<String, Object> transportOptions = IntrospectionSupport.extractProperties(options, "transport.");
+            Map<String, Object> wireFormatOptions = IntrospectionSupport.extractProperties(options, "wireFormat.");
             result.setJettyOptions(jettyOptions);
             result.setTransportOption(transportOptions);
             result.setHttpOptions(httpOptions);
+            result.setWireFormatOptions(wireFormatOptions);
             return result;
         } catch (URISyntaxException e) {
             throw IOExceptionSupport.create(e);
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java	2019-11-20 16:00:05.000000000 +0000
@@ -18,6 +18,7 @@
 
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.activemq.command.BrokerInfo;
@@ -38,6 +39,7 @@
 
     private TextWireFormat wireFormat;
     private final HttpTransportFactory transportFactory;
+    private Map<String, Object> wireFormatOptions = new HashMap<>();
 
     public HttpTransportServer(URI uri, HttpTransportFactory factory) {
         super(uri);
@@ -93,6 +95,7 @@
         contextHandler.setAttribute("wireFormat", getWireFormat());
         contextHandler.setAttribute("transportFactory", transportFactory);
         contextHandler.setAttribute("transportOptions", transportOptions);
+        contextHandler.setAttribute("wireFormatOptions", wireFormatOptions);
 
         //AMQ-6182 - disabling trace by default
         configureTraceMethod((ConstraintSecurityHandler) contextHandler.getSecurityHandler(),
@@ -171,6 +174,10 @@
         super.setTransportOption(transportOptions);
     }
 
+    public void setWireFormatOptions(Map<String, Object> wireFormatOptions) {
+        this.wireFormatOptions = wireFormatOptions;
+    }
+
     @Override
     public boolean isSslServer() {
         return false;
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java	2019-11-20 16:00:05.000000000 +0000
@@ -27,10 +27,16 @@
  *
  */
 public abstract class HttpTransportSupport extends TransportThreadSupport {
+    private static final int DEFAULT_PROXY_PORT = 8080;
+    private static final String PROPERTY_PROXY_HOST = "proxyHost";
+    private static final String PROPERTY_PROXY_PORT = "proxyPort";
+    private static final String PROPERTY_PROXY_USER = "proxyUser";
+    private static final String PROPERTY_PROXY_PASSWORD = "proxyPassword";
+
     private TextWireFormat textWireFormat;
     private URI remoteUrl;
     private String proxyHost;
-    private int proxyPort = 8080;
+    private Integer proxyPort;
     private String proxyUser;
     private String proxyPassword;
 
@@ -62,7 +68,7 @@
     }
 
     public String getProxyHost() {
-        return proxyHost;
+        return proxyHost != null ? proxyHost : getSystemProperty(PROPERTY_PROXY_HOST);
     }
 
     public void setProxyHost(String proxyHost) {
@@ -70,7 +76,9 @@
     }
 
     public int getProxyPort() {
-        return proxyPort;
+        return proxyPort != null ? proxyPort
+                : (getSystemProperty(PROPERTY_PROXY_PORT) != null
+                        ? Integer.parseInt(getSystemProperty(PROPERTY_PROXY_PORT)) : DEFAULT_PROXY_PORT);
     }
 
     public void setProxyPort(int proxyPort) {
@@ -78,7 +86,7 @@
     }
 
     public String getProxyUser() {
-       return proxyUser;
+       return proxyUser != null ? proxyUser : getSystemProperty(PROPERTY_PROXY_USER);
     }
 
     public void setProxyUser(String proxyUser) {
@@ -86,10 +94,17 @@
     }
 
     public String getProxyPassword() {
-       return proxyPassword;
+       return proxyPassword != null ? proxyPassword : getSystemProperty(PROPERTY_PROXY_PASSWORD);
     }
 
     public void setProxyPassword(String proxyPassword) {
        this.proxyPassword = proxyPassword;
     }
+
+    protected abstract String getSystemPropertyPrefix();
+
+    private String getSystemProperty(String propertyName) {
+        return System.getProperty(getSystemPropertyPrefix() + propertyName);
+    }
+
 }
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java	2019-11-20 16:00:05.000000000 +0000
@@ -60,6 +60,7 @@
     private ConcurrentMap<String, BlockingQueueTransport> clients = new ConcurrentHashMap<String, BlockingQueueTransport>();
     private final long requestTimeout = 30000L;
     private HashMap<String, Object> transportOptions;
+    private HashMap<String, Object> wireFormatOptions;
 
     @SuppressWarnings("unchecked")
     @Override
@@ -74,6 +75,7 @@
             throw new ServletException("No such attribute 'transportFactory' available in the ServletContext");
         }
         transportOptions = (HashMap<String, Object>)getServletContext().getAttribute("transportOptions");
+        wireFormatOptions = (HashMap<String, Object>)getServletContext().getAttribute("wireFormatOptions");
         wireFormat = (TextWireFormat)getServletContext().getAttribute("wireFormat");
         if (wireFormat == null) {
             wireFormat = createWireFormat();
@@ -118,6 +120,10 @@
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
+        if (wireFormatOptions.get("maxFrameSize") != null && request.getContentLength() > Integer.parseInt(wireFormatOptions.get("maxFrameSize").toString())) {
+            throw new ServletException("maxFrameSize exceeded");
+        }
+
         InputStream stream = request.getInputStream();
         String contentType = request.getContentType();
         if (contentType != null && contentType.equals("application/x-gzip")) {
@@ -197,7 +203,7 @@
         // Record the client's transport and ensure that it has not already registered; this is thread-safe and only allows one
         // thread to register the client
         if (clients.putIfAbsent(clientID, answer) != null) {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "A session for clientID '" + clientID + "' has already been established");
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "A session for the given clientID has already been established");
             LOG.warn("A session for clientID '" + clientID + "' has already been established");
             return null;
         }
@@ -237,7 +243,7 @@
 
         // Ensure that the transport was not prematurely disposed.
         if (transport.isDisposed()) {
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "The session for clientID '" + clientID + "' was prematurely disposed");
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "The session for the given clientID was prematurely disposed");
             LOG.warn("The session for clientID '" + clientID + "' was prematurely disposed");
             return null;
         }
diff -Nru activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java
--- activemq-5.15.10/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java	2019-11-20 16:00:05.000000000 +0000
@@ -75,4 +75,10 @@
         }
 
     }
+
+    @Override
+    protected String getSystemPropertyPrefix() {
+        return "https.";
+    }
+
 }
diff -Nru activemq-5.15.10/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java activemq-5.15.11/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java
--- activemq-5.15.10/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java	1970-01-01 00:00:00.000000000 +0000
+++ activemq-5.15.11/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java	2019-11-20 16:00:05.000000000 +0000
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.http;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.commons.lang.StringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+public class HttpMaxFrameSizeTest {
+
+    protected BrokerService brokerService;
+
+    @Before
+    public void setup() throws Exception {
+        brokerService = new BrokerService();
+        brokerService.setPersistent(false);
+        brokerService.setUseJmx(false);
+        brokerService.deleteAllMessages();
+        brokerService.addConnector("http://localhost:8888?wireFormat.maxFrameSize=4000");
+        brokerService.start();
+        brokerService.waitUntilStarted();
+    }
+
+    @After
+    public void teardown() throws Exception {
+        brokerService.stop();
+    }
+
+    @Test
+    public void sendOversizedMessageTest() throws Exception {
+        try {
+            send(5000);
+        } catch (JMSException jmsException) {
+            Assert.assertTrue(jmsException.getMessage().contains("500 Server Error"));
+        }
+    }
+
+    @Test
+    public void sendGoodMessageTest() throws Exception {
+        // no exception expected there
+        send(10);
+    }
+
+    private void send(int size) throws Exception {
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("http://localhost:8888");
+        Connection connection = connectionFactory.createConnection();
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        MessageProducer producer = session.createProducer(new ActiveMQQueue("test"));
+        String payload = StringUtils.repeat("*", size);
+        TextMessage textMessage = session.createTextMessage(payload);
+        producer.send(textMessage);
+    }
+
+}
diff -Nru activemq-5.15.10/activemq-itests-spring31/pom.xml activemq-5.15.11/activemq-itests-spring31/pom.xml
--- activemq-5.15.10/activemq-itests-spring31/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-itests-spring31/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-itests-spring31</artifactId>
diff -Nru activemq-5.15.10/activemq-jaas/pom.xml activemq-5.15.11/activemq-jaas/pom.xml
--- activemq-5.15.10/activemq-jaas/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-jaas/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff -Nru activemq-5.15.10/activemq-jdbc-store/pom.xml activemq-5.15.11/activemq-jdbc-store/pom.xml
--- activemq-5.15.10/activemq-jdbc-store/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-jdbc-store/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-jdbc-store</artifactId>
diff -Nru activemq-5.15.10/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/SqlServerJDBCAdapter.java activemq-5.15.11/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/SqlServerJDBCAdapter.java
--- activemq-5.15.10/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/SqlServerJDBCAdapter.java	1970-01-01 00:00:00.000000000 +0000
+++ activemq-5.15.11/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/SqlServerJDBCAdapter.java	2019-11-20 16:00:05.000000000 +0000
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.store.jdbc.adapter;
+
+import java.sql.Blob;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.activemq.store.jdbc.Statements;
+
+/**
+ * 
+ * @org.apache.xbean.XBean element="sqlServerJDBCAdapter"
+ */
+public class SqlServerJDBCAdapter extends DefaultJDBCAdapter {
+
+    @Override
+    public void setStatements(Statements statements) {
+        String lockCreateStatement = "SELECT * FROM ACTIVEMQ_LOCK WITH (UPDLOCK, ROWLOCK) WHERE ID=1";
+        statements.setLockCreateStatement(lockCreateStatement);
+        statements.setBinaryDataType("VARBINARY(MAX)");
+
+        super.setStatements(statements);
+    }
+
+}
diff -Nru activemq-5.15.10/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java activemq-5.15.11/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java
--- activemq-5.15.10/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java	2019-11-20 16:00:05.000000000 +0000
@@ -115,7 +115,8 @@
                 "ALTER TABLE " + getFullAckTableName() + " " + getDropAckPKAlterStatementEnd(),
                 "ALTER TABLE " + getFullAckTableName() + " ADD PRIMARY KEY (CONTAINER, CLIENT_ID, SUB_NAME, PRIORITY)",
                 "CREATE INDEX " + getFullMessageTableName() + "_XIDX ON " + getFullMessageTableName() + " (XID)",
-                "CREATE INDEX " + getFullAckTableName() + "_XIDX ON " + getFullAckTableName() + " (XID)"
+                "CREATE INDEX " + getFullAckTableName() + "_XIDX ON " + getFullAckTableName() + " (XID)",
+                "CREATE INDEX " + getFullMessageTableName() + "_IIDX ON " + getFullMessageTableName() + " (ID ASC, XID, CONTAINER)"
             };
         }
         getCreateLockSchemaStatements();
diff -Nru activemq-5.15.10/activemq-jms-pool/pom.xml activemq-5.15.11/activemq-jms-pool/pom.xml
--- activemq-5.15.10/activemq-jms-pool/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-jms-pool/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-jms-pool</artifactId>
@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/activemq-kahadb-store/pom.xml activemq-5.15.11/activemq-kahadb-store/pom.xml
--- activemq-5.15.10/activemq-kahadb-store/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-kahadb-store/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-kahadb-store</artifactId>
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff -Nru activemq-5.15.10/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java activemq-5.15.11/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java
--- activemq-5.15.10/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java	2019-11-20 16:00:05.000000000 +0000
@@ -195,6 +195,9 @@
                     }
                     dataFile.closeRandomAccessFile(file);
                 }
+                if (wb != null && wb.buff != null) {
+                    wb.buff.close();
+                }
             } catch (Throwable ignore) {
             }
             shutdownDone.countDown();
diff -Nru activemq-5.15.10/activemq-karaf/pom.xml activemq-5.15.11/activemq-karaf/pom.xml
--- activemq-5.15.10/activemq-karaf/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-karaf/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
diff -Nru activemq-5.15.10/activemq-karaf/src/main/resources/features-core.xml activemq-5.15.11/activemq-karaf/src/main/resources/features-core.xml
--- activemq-5.15.10/activemq-karaf/src/main/resources/features-core.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-karaf/src/main/resources/features-core.xml	2019-11-20 16:00:05.000000000 +0000
@@ -66,7 +66,7 @@
       <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
-      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-version}</bundle>
+      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
       <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
     </feature>
diff -Nru activemq-5.15.10/activemq-karaf-itest/pom.xml activemq-5.15.11/activemq-karaf-itest/pom.xml
--- activemq-5.15.10/activemq-karaf-itest/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-karaf-itest/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-karaf-itest</artifactId>
diff -Nru activemq-5.15.10/activemq-leveldb-store/pom.xml activemq-5.15.11/activemq-leveldb-store/pom.xml
--- activemq-5.15.10/activemq-leveldb-store/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-leveldb-store/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-leveldb-store</artifactId>
diff -Nru activemq-5.15.10/activemq-log4j-appender/pom.xml activemq-5.15.11/activemq-log4j-appender/pom.xml
--- activemq-5.15.10/activemq-log4j-appender/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-log4j-appender/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-log4j-appender</artifactId>
diff -Nru activemq-5.15.10/activemq-mqtt/pom.xml activemq-5.15.11/activemq-mqtt/pom.xml
--- activemq-5.15.10/activemq-mqtt/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-mqtt/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-mqtt</artifactId>
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff -Nru activemq-5.15.10/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java activemq-5.15.11/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
--- activemq-5.15.10/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java	2019-11-20 16:00:05.000000000 +0000
@@ -1642,7 +1642,7 @@
             payload[i] = '2';
         }
 
-        int numberOfRuns = 100;
+        int numberOfRuns = 50;
         int messagesPerRun = 2;
 
         final MQTT mqttPub = createMQTTConnection("MQTT-Pub-Client", true);
diff -Nru activemq-5.15.10/activemq-openwire-generator/pom.xml activemq-5.15.11/activemq-openwire-generator/pom.xml
--- activemq-5.15.10/activemq-openwire-generator/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-openwire-generator/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>
diff -Nru activemq-5.15.10/activemq-openwire-legacy/pom.xml activemq-5.15.11/activemq-openwire-legacy/pom.xml
--- activemq-5.15.10/activemq-openwire-legacy/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-openwire-legacy/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-openwire-legacy</artifactId>
diff -Nru activemq-5.15.10/activemq-osgi/pom.xml activemq-5.15.11/activemq-osgi/pom.xml
--- activemq-5.15.10/activemq-osgi/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-osgi/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-osgi</artifactId>
@@ -170,12 +170,6 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>activemq-all</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -502,8 +496,8 @@
         </dependency>
         <!-- <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-          <version>1.0.1</version>
+          <artifactId>geronimo-jta_1.1_spec</artifactId>
+          <version>1.1.1</version>
           <classifier>sources</classifier>
           <optional>true</optional>
         </dependency> -->
diff -Nru activemq-5.15.10/activemq-osgi/src/main/resources/META-INF/spring.schemas activemq-5.15.11/activemq-osgi/src/main/resources/META-INF/spring.schemas
--- activemq-5.15.10/activemq-osgi/src/main/resources/META-INF/spring.schemas	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-osgi/src/main/resources/META-INF/spring.schemas	2019-11-20 16:00:05.000000000 +0000
@@ -65,6 +65,7 @@
 http\://activemq.apache.org/schema/core/activemq-core-5.15.8.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.9.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.10.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.11.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
 
diff -Nru activemq-5.15.10/activemq-partition/pom.xml activemq-5.15.11/activemq-partition/pom.xml
--- activemq-5.15.10/activemq-partition/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-partition/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-partition</artifactId>
diff -Nru activemq-5.15.10/activemq-pool/pom.xml activemq-5.15.11/activemq-pool/pom.xml
--- activemq-5.15.10/activemq-pool/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-pool/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/activemq-ra/pom.xml activemq-5.15.11/activemq-ra/pom.xml
--- activemq-5.15.10/activemq-ra/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-ra/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff -Nru activemq-5.15.10/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java activemq-5.15.11/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
--- activemq-5.15.10/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java	2019-11-20 16:00:05.000000000 +0000
@@ -129,7 +129,7 @@
         }
         String userName = defaultValue(activationSpec.getUserName(), getInfo().getUserName());
         String password = defaultValue(activationSpec.getPassword(), getInfo().getPassword());
-        String clientId = activationSpec.getClientId();
+        String clientId = defaultValue(activationSpec.getClientId(), getInfo().getClientid());
         if (clientId != null) {
             cf.setClientID(clientId);
         } else {
diff -Nru activemq-5.15.10/activemq-rar/pom.xml activemq-5.15.11/activemq-rar/pom.xml
--- activemq-5.15.10/activemq-rar/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-rar/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
@@ -55,7 +55,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          <artifactId>geronimo-jta_1.1_spec</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
@@ -189,7 +189,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          <artifactId>geronimo-jta_1.1_spec</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/activemq-run/pom.xml activemq-5.15.11/activemq-run/pom.xml
--- activemq-5.15.10/activemq-run/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-run/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>
diff -Nru activemq-5.15.10/activemq-runtime-config/pom.xml activemq-5.15.11/activemq-runtime-config/pom.xml
--- activemq-5.15.10/activemq-runtime-config/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-runtime-config/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-runtime-config</artifactId>
diff -Nru activemq-5.15.10/activemq-shiro/pom.xml activemq-5.15.11/activemq-shiro/pom.xml
--- activemq-5.15.10/activemq-shiro/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-shiro/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-parent</artifactId>
-        <version>5.15.10</version>
+        <version>5.15.11</version>
     </parent>
 
     <artifactId>activemq-shiro</artifactId>
diff -Nru activemq-5.15.10/activemq-spring/pom.xml activemq-5.15.11/activemq-spring/pom.xml
--- activemq-5.15.10/activemq-spring/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-spring/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>
@@ -146,7 +146,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/activemq-spring/src/main/resources/META-INF/spring.schemas activemq-5.15.11/activemq-spring/src/main/resources/META-INF/spring.schemas
--- activemq-5.15.10/activemq-spring/src/main/resources/META-INF/spring.schemas	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-spring/src/main/resources/META-INF/spring.schemas	2019-11-20 16:00:05.000000000 +0000
@@ -65,6 +65,7 @@
 http\://activemq.apache.org/schema/core/activemq-core-5.15.8.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.9.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.10.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.11.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
diff -Nru activemq-5.15.10/activemq-stomp/pom.xml activemq-5.15.11/activemq-stomp/pom.xml
--- activemq-5.15.10/activemq-stomp/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-stomp/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-stomp</artifactId>
diff -Nru activemq-5.15.10/activemq-tooling/activemq-junit/pom.xml activemq-5.15.11/activemq-tooling/activemq-junit/pom.xml
--- activemq-5.15.10/activemq-tooling/activemq-junit/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-tooling/activemq-junit/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-junit</artifactId>
diff -Nru activemq-5.15.10/activemq-tooling/activemq-maven-plugin/pom.xml activemq-5.15.11/activemq-tooling/activemq-maven-plugin/pom.xml
--- activemq-5.15.10/activemq-tooling/activemq-maven-plugin/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-tooling/activemq-maven-plugin/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-maven-plugin</artifactId>
diff -Nru activemq-5.15.10/activemq-tooling/activemq-memtest-maven-plugin/pom.xml activemq-5.15.11/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
--- activemq-5.15.10/activemq-tooling/activemq-memtest-maven-plugin/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-tooling/activemq-memtest-maven-plugin/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-memtest-maven-plugin</artifactId>
diff -Nru activemq-5.15.10/activemq-tooling/activemq-perf-maven-plugin/pom.xml activemq-5.15.11/activemq-tooling/activemq-perf-maven-plugin/pom.xml
--- activemq-5.15.10/activemq-tooling/activemq-perf-maven-plugin/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-tooling/activemq-perf-maven-plugin/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-perf-maven-plugin</artifactId>
diff -Nru activemq-5.15.10/activemq-tooling/pom.xml activemq-5.15.11/activemq-tooling/pom.xml
--- activemq-5.15.10/activemq-tooling/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-tooling/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff -Nru activemq-5.15.10/activemq-unit-tests/pom.xml activemq-5.15.11/activemq-unit-tests/pom.xml
--- activemq-5.15.10/activemq-unit-tests/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-unit-tests/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-unit-tests</artifactId>
@@ -108,7 +108,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff -Nru activemq-5.15.10/activemq-web/pom.xml activemq-5.15.11/activemq-web/pom.xml
--- activemq-5.15.10/activemq-web/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff -Nru activemq-5.15.10/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java activemq-5.15.11/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java
--- activemq-5.15.10/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java	2019-11-20 16:00:05.000000000 +0000
@@ -16,9 +16,6 @@
  */
 package org.apache.activemq.web;
 
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
@@ -27,19 +24,22 @@
 import javax.jms.QueueBrowser;
 import javax.jms.StreamMessage;
 import javax.jms.TextMessage;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Allow the user to browse a message on a queue by its ID
- * 
- * 
+ *
+ *
  */
 public class MessageQuery extends QueueBrowseQuery {
 
     private String id;
     private Message message;
 
-    public MessageQuery(BrokerFacade brokerFacade, SessionPool sessionPool) throws JMSException {
-        super(brokerFacade, sessionPool);
+    public MessageQuery(BrokerFacade brokerFacade) throws JMSException {
+        super(brokerFacade);
     }
 
     public String getId() {
@@ -111,7 +111,7 @@
 
         return null;
     }
-    
+
     public boolean isDLQ() throws Exception {
     	return getQueueView().isDLQ();
     }
diff -Nru activemq-5.15.10/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java activemq-5.15.11/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java
--- activemq-5.15.10/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java	2019-11-20 16:00:05.000000000 +0000
@@ -16,28 +16,26 @@
  */
 package org.apache.activemq.web;
 
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
 import javax.jms.JMSException;
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 import javax.jms.Session;
 
-import org.springframework.beans.factory.DisposableBean;
-
 /**
- * 
- * 
+ *
+ *
  */
 public class QueueBrowseQuery extends DestinationFacade implements DisposableBean {
-    private SessionPool sessionPool;
     private String selector;
-    private Session session;
     private Queue queue;
     private QueueBrowser browser;
 
-    public QueueBrowseQuery(BrokerFacade brokerFacade, SessionPool sessionPool) throws JMSException {
+    public QueueBrowseQuery(BrokerFacade brokerFacade) throws JMSException {
         super(brokerFacade);
-        this.sessionPool = sessionPool;
-        this.session = sessionPool.borrowSession();
         setJMSDestinationType("query");
     }
 
@@ -45,8 +43,6 @@
         if (browser != null) {
             browser.close();
         }
-        sessionPool.returnSession(session);
-        session = null;
     }
 
     public QueueBrowser getBrowser() throws JMSException {
@@ -62,7 +58,7 @@
 
     public Queue getQueue() throws JMSException {
         if (queue == null) {
-            queue = session.createQueue(getValidDestination());
+            queue = getSession().createQueue(getValidDestination());
         }
         return queue;
     }
@@ -79,10 +75,13 @@
         this.selector = selector;
     }
 
-    public Session getSession() {
-        return session;
+    public Session getSession() throws JMSException {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
+
+        return WebClient.getWebClient(servletRequestAttributes.getRequest()).getSession();
     }
 
+
     public boolean isQueue() {
         return true;
     }
@@ -91,5 +90,4 @@
         return getSession().createBrowser(getQueue(), getSelector());
     }
 
-    
 }
diff -Nru activemq-5.15.10/activemq-web-console/pom.xml activemq-5.15.11/activemq-web-console/pom.xml
--- activemq-5.15.10/activemq-web-console/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web-console/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
@@ -188,7 +188,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/activemq-web-console/src/main/webapp/WEB-INF/web.xml activemq-5.15.11/activemq-web-console/src/main/webapp/WEB-INF/web.xml
--- activemq-5.15.10/activemq-web-console/src/main/webapp/WEB-INF/web.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web-console/src/main/webapp/WEB-INF/web.xml	2019-11-20 16:00:05.000000000 +0000
@@ -155,7 +155,10 @@
   </error-page>
   
   <session-config>
-  	<session-timeout>30</session-timeout>
+    <session-timeout>30</session-timeout>
+    <cookie-config>
+      <http-only>true</http-only>
+    </cookie-config>
   </session-config>
 
   <context-param>
diff -Nru activemq-5.15.10/activemq-web-demo/pom.xml activemq-5.15.11/activemq-web-demo/pom.xml
--- activemq-5.15.10/activemq-web-demo/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/activemq-web-demo/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
@@ -147,7 +147,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff -Nru activemq-5.15.10/assembly/pom.xml activemq-5.15.11/assembly/pom.xml
--- activemq-5.15.10/assembly/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/assembly/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.15.10</version>
+    <version>5.15.11</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
@@ -282,7 +282,7 @@
      </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.shiro</groupId>
diff -Nru activemq-5.15.10/assembly/src/main/descriptors/common-bin.xml activemq-5.15.11/assembly/src/main/descriptors/common-bin.xml
--- activemq-5.15.10/assembly/src/main/descriptors/common-bin.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/assembly/src/main/descriptors/common-bin.xml	2019-11-20 16:00:05.000000000 +0000
@@ -143,7 +143,7 @@
         <include>org.apache.activemq.protobuf:activemq-protobuf</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
         <include>${pom.groupId}:activemq-web</include>
         <include>org.fusesource.hawtbuf:hawtbuf</include>
       </includes>
@@ -204,7 +204,7 @@
         <include>com.thoughtworks.xstream:xstream</include>
         <include>xpp3:xpp3</include>
         <include>org.codehaus.jettison:jettison</include>
-        <include>org.apache.velocity:velocity</include>
+        <include>org.apache.velocity:velocity-engine-core</include>
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
         <include>org.jasypt:jasypt</include>
         <include>org.jasypt:jasypt-spring31</include>
diff -Nru activemq-5.15.10/assembly/src/release/bin/activemq activemq-5.15.11/assembly/src/release/bin/activemq
--- activemq-5.15.10/assembly/src/release/bin/activemq	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/assembly/src/release/bin/activemq	2019-11-20 16:00:05.000000000 +0000
@@ -245,7 +245,7 @@
 fi
 
 # Hm, we still do not know the location of the java binary
-if [ ! -x "$JAVACMD" ] ; then
+if [ -z "$JAVACMD" ] || [ "$JAVACMD" = "auto" ] || [ ! -x "$JAVACMD" ] ; then
     JAVACMD=`which java 2> /dev/null `
     if [ -z "$JAVACMD" ] ; then
         JAVACMD=java
diff -Nru activemq-5.15.10/assembly/src/release/NOTICE activemq-5.15.11/assembly/src/release/NOTICE
--- activemq-5.15.10/assembly/src/release/NOTICE	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/assembly/src/release/NOTICE	2019-11-20 16:00:05.000000000 +0000
@@ -1,6 +1,6 @@
 
 Apache ActiveMQ
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2019 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff -Nru activemq-5.15.10/assembly/src/release/webapps/api/WEB-INF/web.xml activemq-5.15.11/assembly/src/release/webapps/api/WEB-INF/web.xml
--- activemq-5.15.10/assembly/src/release/webapps/api/WEB-INF/web.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/assembly/src/release/webapps/api/WEB-INF/web.xml	2019-11-20 16:00:05.000000000 +0000
@@ -71,4 +71,10 @@
         <url-pattern>/jolokia/*</url-pattern>
     </servlet-mapping>
 
-</web-app>
\ No newline at end of file
+    <session-config>
+        <cookie-config>
+            <http-only>true</http-only>
+        </cookie-config>
+    </session-config>
+
+</web-app>
diff -Nru activemq-5.15.10/debian/changelog activemq-5.15.11/debian/changelog
--- activemq-5.15.10/debian/changelog	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/changelog	2019-11-23 21:49:23.000000000 +0000
@@ -1,3 +1,11 @@
+activemq (5.15.11-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version 5.15.11.
+  * Declare compliance with Debian Policy 4.4.1.
+
+ -- Markus Koschany <apo@debian.org>  Sat, 23 Nov 2019 22:49:23 +0100
+
 activemq (5.15.10-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru activemq-5.15.10/debian/control activemq-5.15.11/debian/control
--- activemq-5.15.10/debian/control	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/control	2019-11-23 21:49:23.000000000 +0000
@@ -68,7 +68,7 @@
  libxstream-java (>= 1.4),
  libzookeeper-java,
  maven-debian-helper
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/activemq.git
 Vcs-Browser: https://salsa.debian.org/java-team/activemq
 Homepage: http://activemq.apache.org
@@ -110,6 +110,8 @@
 
 Package: activemq
 Architecture: all
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  adduser (>= 3.11),
  default-jre-headless | java7-runtime-headless,
diff -Nru activemq-5.15.10/debian/copyright activemq-5.15.11/debian/copyright
--- activemq-5.15.10/debian/copyright	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/copyright	2019-11-23 21:49:23.000000000 +0000
@@ -14,14 +14,14 @@
  assembly/src/release/examples/stomp/websocket
 
 Files: *
-Copyright: 2005-2016, Apache Software Foundation
+Copyright: 2005-2019, Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
 Copyright:
  2011,      Damien Raude-Morvan <drazzib@debian.org>
  2011,      Jonas Genannt <jonas.genannt@capi2name.de>
- 2016-2018, Markus Koschany <apo@debian.org>
+ 2016-2019, Markus Koschany <apo@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0
diff -Nru activemq-5.15.10/debian/maven.ignoreRules activemq-5.15.11/debian/maven.ignoreRules
--- activemq-5.15.10/debian/maven.ignoreRules	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/maven.ignoreRules	2019-11-23 21:49:23.000000000 +0000
@@ -51,3 +51,4 @@
 org.jencks * * * *
 org.springframework.osgi * * * *
 org.eclipse.jetty.aggregate jetty-all * * * *
+org.apache.velocity velocity-engine-core * * * *
diff -Nru activemq-5.15.10/debian/maven.rules activemq-5.15.11/debian/maven.rules
--- activemq-5.15.10/debian/maven.rules	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/maven.rules	2019-11-23 21:49:23.000000000 +0000
@@ -11,7 +11,7 @@
 org.apache.tomcat tomcat-servlet-api * s/.*/8.x/ * *
 org.apache.tomcat tomcat-websocket-api * s/.*/8.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-org.apache.geronimo.specs s/geronimo-jta_1.0.1B_spec/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
+org.apache.geronimo.specs s/geronimo-jta_1.1_spec/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
 s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/javax.servlet-api/ jar s/.*/3.1/ * *
 com.fasterxml.jackson.core jackson-databind * s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-core * s/2\..*/2.x/ * *
diff -Nru activemq-5.15.10/debian/patches/activemq-client-jar.patch activemq-5.15.11/debian/patches/activemq-client-jar.patch
--- activemq-5.15.10/debian/patches/activemq-client-jar.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/activemq-client-jar.patch	2019-11-23 21:49:23.000000000 +0000
@@ -9,7 +9,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
-index 096c4d3..5023e4d 100644
+index 17e532a..d899ff1 100644
 --- a/activemq-client/pom.xml
 +++ b/activemq-client/pom.xml
 @@ -26,7 +26,7 @@
diff -Nru activemq-5.15.10/debian/patches/disable-broker-test-dependency.patch activemq-5.15.11/debian/patches/disable-broker-test-dependency.patch
--- activemq-5.15.10/debian/patches/disable-broker-test-dependency.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/disable-broker-test-dependency.patch	2019-11-23 21:49:23.000000000 +0000
@@ -10,7 +10,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
-index a3af28d..190074b 100644
+index e52477e..306b188 100644
 --- a/activemq-ra/pom.xml
 +++ b/activemq-ra/pom.xml
 @@ -52,13 +52,13 @@
diff -Nru activemq-5.15.10/debian/patches/enable-activemq-jdbc-store-module.patch activemq-5.15.11/debian/patches/enable-activemq-jdbc-store-module.patch
--- activemq-5.15.10/debian/patches/enable-activemq-jdbc-store-module.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/enable-activemq-jdbc-store-module.patch	2019-11-23 21:49:23.000000000 +0000
@@ -1,5 +1,5 @@
 From: Markus Koschany <apo@debian.org>
-Date: Thu, 29 Aug 2019 23:09:34 +0200
+Date: Fri, 22 Nov 2019 22:44:53 +0100
 Subject: enable-activemq-jdbc-store-module
 
 ---
@@ -8,7 +8,7 @@
  2 files changed, 24 insertions(+)
 
 diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
-index ab344d8..88a4f08 100644
+index 2851f28..0be118e 100644
 --- a/activemq-jdbc-store/pom.xml
 +++ b/activemq-jdbc-store/pom.xml
 @@ -54,6 +54,16 @@
@@ -29,20 +29,20 @@
  
      <!-- =============================== -->
 diff --git a/pom.xml b/pom.xml
-index eb73b1e..5943950 100644
+index 18d8914..43bcbed 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,10 +53,12 @@
      <commons-beanutils-version>1.9.4</commons-beanutils-version>
      <commons-collections-version>3.2.2</commons-collections-version>
-     <commons-daemon-version>1.0.15</commons-daemon-version>
+     <commons-daemon-version>1.2.2</commons-daemon-version>
 +    <commons-dbcp-version>1.4</commons-dbcp-version>
-     <commons-dbcp2-version>2.6.0</commons-dbcp2-version>
+     <commons-dbcp2-version>2.7.0</commons-dbcp2-version>
      <commons-io-version>2.6</commons-io-version>
      <commons-lang-version>2.6</commons-lang-version>
      <commons-logging-version>1.2</commons-logging-version>
 +    <commons-pool-version>1.6</commons-pool-version>
-     <commons-pool2-version>2.6.2</commons-pool2-version>
+     <commons-pool2-version>2.7.0</commons-pool2-version>
      <commons-primitives-version>1.0</commons-primitives-version>
      <commons-net-version>3.6</commons-net-version>
 @@ -865,6 +867,18 @@
diff -Nru activemq-5.15.10/debian/patches/init-debian-default-values.patch activemq-5.15.11/debian/patches/init-debian-default-values.patch
--- activemq-5.15.10/debian/patches/init-debian-default-values.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/init-debian-default-values.patch	2019-11-23 21:49:23.000000000 +0000
@@ -9,7 +9,7 @@
  1 file changed, 11 insertions(+), 12 deletions(-)
 
 diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
-index 358204b..3a7d329 100755
+index c8d7f03..0d9ed95 100755
 --- a/assembly/src/release/bin/activemq
 +++ b/assembly/src/release/bin/activemq
 @@ -101,12 +101,12 @@ getActiveMQHome(){
diff -Nru activemq-5.15.10/debian/patches/java11.patch activemq-5.15.11/debian/patches/java11.patch
--- activemq-5.15.10/debian/patches/java11.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/java11.patch	2019-11-23 21:49:23.000000000 +0000
@@ -10,7 +10,7 @@
  2 files changed, 11 insertions(+)
 
 diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
-index 5023e4d..9829137 100644
+index d899ff1..3326ecb 100644
 --- a/activemq-client/pom.xml
 +++ b/activemq-client/pom.xml
 @@ -79,6 +79,11 @@
@@ -26,7 +26,7 @@
      <!-- =============================== -->
      <!-- Testing Dependencies -->
 diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
-index 90c3a52..ab344d8 100644
+index 313b8ad..2851f28 100644
 --- a/activemq-jdbc-store/pom.xml
 +++ b/activemq-jdbc-store/pom.xml
 @@ -49,6 +49,12 @@
diff -Nru activemq-5.15.10/debian/patches/maven-xbean-plugin.patch activemq-5.15.11/debian/patches/maven-xbean-plugin.patch
--- activemq-5.15.10/debian/patches/maven-xbean-plugin.patch	2019-08-29 21:02:03.000000000 +0000
+++ activemq-5.15.11/debian/patches/maven-xbean-plugin.patch	2019-11-23 21:49:23.000000000 +0000
@@ -9,7 +9,7 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
-index 9b85367..f002482 100644
+index 56674d6..9103929 100644
 --- a/activemq-spring/pom.xml
 +++ b/activemq-spring/pom.xml
 @@ -211,7 +211,7 @@
@@ -22,7 +22,7 @@
            <execution>
              <phase>process-classes</phase>
 diff --git a/pom.xml b/pom.xml
-index 9701a44..eb73b1e 100644
+index 6747f78..18d8914 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -131,7 +131,7 @@
diff -Nru activemq-5.15.10/doap.rdf activemq-5.15.11/doap.rdf
--- activemq-5.15.10/doap.rdf	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/doap.rdf	2019-11-20 16:00:05.000000000 +0000
@@ -25,7 +25,7 @@
 <!--
   =======================================================================
 
-   Copyright (c) 2006-2012 The Apache Software Foundation.  
+   Copyright (c) 2006-2019 The Apache Software Foundation.  
    All rights reserved.
 
   =======================================================================
@@ -34,13 +34,13 @@
     <created>2006-03-27</created>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
     <name>Apache ActiveMQ</name>
-    <homepage rdf:resource="http://activemq.apache.org/" />
-    <asfext:pmc rdf:resource="http://activemq.apache.org/" />
+    <homepage rdf:resource="https://activemq.apache.org/" />
+    <asfext:pmc rdf:resource="https://activemq.apache.org/" />
     <shortdesc>ActiveMQ is the most popular and powerful open source Message Broker.</shortdesc>
     <description>ActiveMQ is a fast and powerful Message Broker which supports many Cross Language Clients and Protocols and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.</description>
-    <bug-database rdf:resource="http://issues.apache.org/activemq/browse/AMQ" />
-    <mailing-list rdf:resource="http://activemq.apache.org/mailing-lists.html" />
-    <download-page rdf:resource="http://activemq.apache.org/download.html" />
+    <bug-database rdf:resource="https://issues.apache.org/jira/browse/AMQ" />
+    <mailing-list rdf:resource="https://activemq.apache.org/contact/" />
+    <download-page rdf:resource="https://activemq.apache.org/download.html" />
 
     <programming-language>Java</programming-language>
     <programming-language>C</programming-language>
diff -Nru activemq-5.15.10/pom.xml activemq-5.15.11/pom.xml
--- activemq-5.15.10/pom.xml	2019-08-28 06:44:45.000000000 +0000
+++ activemq-5.15.11/pom.xml	2019-11-20 16:00:05.000000000 +0000
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>5.15.10</version>
+  <version>5.15.11</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
   <inceptionYear>2005</inceptionYear>
@@ -41,8 +41,8 @@
     <activemq-protobuf-version>1.1</activemq-protobuf-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
-    <ant-version>1.8.4</ant-version>
-    <ant-bundle-version>1.7.0_6</ant-bundle-version>
+    <ant-version>1.10.7</ant-version>
+    <ant-bundle-version>1.10.7_1</ant-bundle-version>
     <aopalliance-version>1.0</aopalliance-version>
     <aries-version>1.1.0</aries-version>
     <aries-transaction-version>1.1.1</aries-transaction-version>
@@ -52,12 +52,12 @@
     <cglib-version>2.2</cglib-version>
     <commons-beanutils-version>1.9.4</commons-beanutils-version>
     <commons-collections-version>3.2.2</commons-collections-version>
-    <commons-daemon-version>1.0.15</commons-daemon-version>
-    <commons-dbcp2-version>2.6.0</commons-dbcp2-version>
+    <commons-daemon-version>1.2.2</commons-daemon-version>
+    <commons-dbcp2-version>2.7.0</commons-dbcp2-version>
     <commons-io-version>2.6</commons-io-version>
     <commons-lang-version>2.6</commons-lang-version>
     <commons-logging-version>1.2</commons-logging-version>
-    <commons-pool2-version>2.6.2</commons-pool2-version>
+    <commons-pool2-version>2.7.0</commons-pool2-version>
     <commons-primitives-version>1.0</commons-primitives-version>
     <commons-net-version>3.6</commons-net-version>
     <directory-version>2.0.0.AM25</directory-version>
@@ -73,14 +73,14 @@
     <httpclient-version>4.5.9</httpclient-version>
     <httpcore-version>4.4.11</httpcore-version>
     <insight-version>1.2.0.Beta4</insight-version>
-    <jackson-version>2.9.9</jackson-version>
-    <jackson-databind-version>2.9.9.3</jackson-databind-version>
+    <jackson-version>2.9.10</jackson-version>
+    <jackson-databind-version>2.9.10.1</jackson-databind-version>
     <jasypt-version>1.9.2</jasypt-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
-    <jetty9-version>9.4.19.v20190610</jetty9-version>
+    <jetty9-version>9.4.22.v20191022</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>
-    <tomcat-api-version>8.0.53</tomcat-api-version>
+    <tomcat-api-version>9.0.27</tomcat-api-version>
     <jettison-version>1.4.0</jettison-version>
     <jmock-version>2.5.1</jmock-version>
     <jolokia-version>1.6.0</jolokia-version>
@@ -96,7 +96,7 @@
     <leveldbjni-version>1.8</leveldbjni-version>
     <log4j-version>1.2.17</log4j-version>
     <mockito-version>1.10.19</mockito-version>
-    <owasp-dependency-check-version>4.0.2</owasp-dependency-check-version>
+    <owasp-dependency-check-version>5.2.2</owasp-dependency-check-version>
     <powermock-version>1.6.5</powermock-version>
     <mqtt-client-version>1.15</mqtt-client-version>
     <openjpa-version>1.2.0</openjpa-version>
@@ -106,12 +106,12 @@
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.14</zookeeper-version>
     <qpid-proton-version>0.33.2</qpid-proton-version>
-    <qpid-jms-version>0.45.0</qpid-jms-version>
-    <qpid-jms-netty-version>4.1.39.Final</qpid-jms-netty-version>
+    <qpid-jms-version>0.47.0</qpid-jms-version>
+    <qpid-jms-netty-version>4.1.43.Final</qpid-jms-netty-version>
     <qpid-jms-proton-version>0.33.2</qpid-jms-proton-version>
-    <netty-all-version>4.1.39.Final</netty-all-version>
+    <netty-all-version>4.1.43.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>
-    <rome-version>1.12.1</rome-version>
+    <rome-version>1.12.2</rome-version>
     <saxon-version>9.5.1-5</saxon-version>
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
@@ -123,7 +123,7 @@
     <spring-version>4.3.24.RELEASE</spring-version>
     <stax2-api-version>3.0.2</stax2-api-version>
     <taglibs-version>1.2.5</taglibs-version>
-    <velocity-version>1.7</velocity-version>
+    <velocity-version>2.1</velocity-version>
     <woodstox-core-asl-version>4.2.0</woodstox-core-asl-version>
     <xalan-version>2.7.2</xalan-version>
     <xmlbeans-version>2.6.0</xmlbeans-version>
@@ -158,7 +158,7 @@
     <maven-release-plugin-version>2.4.1</maven-release-plugin-version>
     <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
     <maven-war-plugin-version>2.4</maven-war-plugin-version>
-    <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
+    <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
     <maven-jar-plugin-version>2.4</maven-jar-plugin-version>
     <maven-archiver-version>2.5</maven-archiver-version>
     <maven-source-plugin-version>2.2.1</maven-source-plugin-version>
@@ -272,7 +272,7 @@
     <connection>scm:git:http://gitbox.apache.org/repos/asf/activemq.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=activemq.git;a=summary</url>
-    <tag>activemq-5.15.10</tag>
+    <tag>activemq-5.15.11</tag>
   </scm>
 
   <dependencyManagement>
@@ -520,8 +520,8 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>1.0.1</version>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <version>1.1.1</version>
       </dependency>
 
       <dependency>
@@ -1138,7 +1138,7 @@
 
       <dependency>
         <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity</artifactId>
+        <artifactId>velocity-engine-core</artifactId>
         <version>${velocity-version}</version>
       </dependency>
       <dependency>
@@ -1696,6 +1696,7 @@
             <configuration>
               <skipProvidedScope>true</skipProvidedScope>
               <skipRuntimeScope>true</skipRuntimeScope>
+              <skipSystemScope>true</skipSystemScope>
             </configuration>
             <executions>
               <execution>