Merge pull request #551 from coheigea/AMQ-7513
AMQ-7513 - Fix http://activemq.org links
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 244b1f2..8aca089 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-all</artifactId>
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 271a34c..1567f89 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-amqp</artifactId>
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 4c0da46..e9b8c03 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-blueprint</artifactId>
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index f2bc7a1..a02178d 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-broker</artifactId>
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationsViewFilter.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationsViewFilter.java
index 05a4187..f95ecdd 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationsViewFilter.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationsViewFilter.java
@@ -196,7 +196,7 @@
Object leftValue = getter.invoke(left.getValue());
Object rightValue = getter.invoke(right.getValue());
if (leftValue instanceof Comparable && rightValue instanceof Comparable) {
- if (getSortOrder().toLowerCase().equals("desc")) {
+ if (getSortOrder().equalsIgnoreCase("desc")) {
return ((Comparable) rightValue).compareTo(leftValue);
} else {
return ((Comparable) leftValue).compareTo(rightValue);
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
index d100c67..727f79d 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/virtual/SelectorAwareVirtualTopicInterceptor.java
@@ -77,7 +77,7 @@
LOG.debug("No active consumer match found. Will try cache if configured...");
if (selectorCachePlugin != null) {
- final Set<String> selectors = selectorCachePlugin.getSelector(dest.getActiveMQDestination().getQualifiedName());
+ final Set<String> selectors = selectorCachePlugin.getSelectorsForDestination(dest.getActiveMQDestination().getQualifiedName());
if (selectors != null) {
for (String selector : selectors) {
try {
diff --git a/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
index 6147f4c..7a0e58c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/plugin/SubQueueSelectorCacheBroker.java
@@ -69,7 +69,7 @@
* The subscription's selector cache. We cache compiled expressions keyed
* by the target destination.
*/
- private ConcurrentMap<String, Set<String>> subSelectorCache = new ConcurrentHashMap<String, Set<String>>();
+ private ConcurrentMap<String, Set<String>> subSelectorCache = new ConcurrentHashMap<>();
private final File persistFile;
private boolean singleSelectorPerDestination = false;
@@ -249,13 +249,6 @@
}
/**
- * @return The JMS selector for the specified {@code destination}
- */
- public Set<String> getSelector(final String destination) {
- return subSelectorCache.get(destination);
- }
-
- /**
* Persist the selector cache every {@code MAX_PERSIST_INTERVAL}ms.
*
* @see java.lang.Runnable#run()
@@ -282,8 +275,11 @@
@SuppressWarnings("unchecked")
public Set<String> getSelectorsForDestination(String destinationName) {
- if (subSelectorCache.containsKey(destinationName)) {
- return new HashSet<String>(subSelectorCache.get(destinationName));
+ final Set<String> cachedSelectors = subSelectorCache.get(destinationName);
+ if (cachedSelectors != null) {
+ synchronized(cachedSelectors) {
+ return new HashSet<>(cachedSelectors);
+ }
}
return Collections.EMPTY_SET;
@@ -298,17 +294,13 @@
}
public boolean deleteSelectorForDestination(String destinationName, String selector) {
- if (subSelectorCache.containsKey(destinationName)) {
- Set<String> cachedSelectors = subSelectorCache.get(destinationName);
- return cachedSelectors.remove(selector);
- }
-
- return false;
+ final Set<String> cachedSelectors = subSelectorCache.get(destinationName);
+ return cachedSelectors != null ? cachedSelectors.remove(selector) : false;
}
public boolean deleteAllSelectorsForDestination(String destinationName) {
- if (subSelectorCache.containsKey(destinationName)) {
- Set<String> cachedSelectors = subSelectorCache.get(destinationName);
+ final Set<String> cachedSelectors = subSelectorCache.get(destinationName);
+ if (cachedSelectors != null) {
cachedSelectors.clear();
}
return true;
diff --git a/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java b/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java
index 065affd..034e864 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java
@@ -35,9 +35,9 @@
}
public void setAsText(String text) throws java.lang.IllegalArgumentException {
- if (text.toLowerCase().equals("true")) {
+ if (text.equalsIgnoreCase("true")) {
setValue(Boolean.TRUE);
- } else if (text.toLowerCase().equals("false")) {
+ } else if (text.equalsIgnoreCase("false")) {
setValue(Boolean.FALSE);
} else {
throw new java.lang.IllegalArgumentException(text);
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 290572b..5e07ff5 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-camel</artifactId>
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
index ed6588f..2c135e1 100644
--- a/activemq-cf/pom.xml
+++ b/activemq-cf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-cf</artifactId>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index c70a295..2a1c58e 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-client</artifactId>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index e4d7693..4361b58 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-console</artifactId>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index e3972d8..3ab5532 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-http</artifactId>
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/util/HttpTransportUtils.java b/activemq-http/src/main/java/org/apache/activemq/transport/util/HttpTransportUtils.java
index a8309b6..6a5d0a6 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/util/HttpTransportUtils.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/util/HttpTransportUtils.java
@@ -27,7 +27,7 @@
StringBuilder remoteAddress = new StringBuilder();
String scheme = request.getScheme();
- remoteAddress.append(scheme != null && scheme.toLowerCase().equals("https") ? "wss://" : "ws://");
+ remoteAddress.append(scheme != null && scheme.equalsIgnoreCase("https") ? "wss://" : "ws://");
remoteAddress.append(request.getRemoteAddr());
remoteAddress.append(":");
remoteAddress.append(request.getRemotePort());
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
index d5ea748..bca914b 100644
--- a/activemq-itests-spring31/pom.xml
+++ b/activemq-itests-spring31/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-itests-spring31</artifactId>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 877a840..80b2436 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index b23f5af..24b10a4 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-jdbc-store</artifactId>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index a9251de..e035aa4 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-jms-pool</artifactId>
diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
index 3e19a7f..c0b223d 100644
--- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
+++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
@@ -20,7 +20,9 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+
import javax.net.ssl.SSLServerSocket;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +99,7 @@
return to.cast(value);
}
- if (boolean.class.isAssignableFrom(to) && value instanceof String) {
+ if ((boolean.class.isAssignableFrom(to) || Boolean.class.isAssignableFrom(to)) && value instanceof String) {
return Boolean.valueOf((String)value);
}
diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
index a5d5aea..dd4f962 100644
--- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
+++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
@@ -43,7 +43,7 @@
private static final long serialVersionUID = -6545688026350913005L;
private TransactionManager transactionManager;
- private boolean tmFromJndi = false;
+ private Boolean tmFromJndi = false;
private String tmJndiName = "java:/TransactionManager";
public TransactionManager getTransactionManager() {
@@ -129,7 +129,7 @@
this.tmJndiName = tmJndiName;
}
- public boolean isTmFromJndi() {
+ public Boolean isTmFromJndi() {
return tmFromJndi;
}
@@ -138,7 +138,7 @@
*
* @param tmFromJndi
*/
- public void setTmFromJndi(boolean tmFromJndi) {
+ public void setTmFromJndi(Boolean tmFromJndi) {
this.tmFromJndi = tmFromJndi;
}
}
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
index d793759..a4ea122 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
@@ -322,8 +322,8 @@
public void testBindableEnvOverrides() throws Exception {
XaPooledConnectionFactory pcf = new XaPooledConnectionFactory();
assertTrue(pcf instanceof ObjectFactory);
- Hashtable<String, String> environment = new Hashtable<String, String>();
- environment.put("tmFromJndi", String.valueOf(Boolean.FALSE));
+ Hashtable<String, Object> environment = new Hashtable<>();
+ environment.put("tmFromJndi", Boolean.FALSE);
assertTrue(((ObjectFactory) pcf).getObjectInstance(null, null, null, environment) instanceof XaPooledConnectionFactory);
assertFalse(pcf.isTmFromJndi());
pcf.stop();
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 840845f..eefc566 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-kahadb-store</artifactId>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index e458fd1..a596858 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-karaf-itest</artifactId>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index c903269..f6d6aa6 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-karaf</artifactId>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 8853f42..e9da1ff 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-leveldb-store</artifactId>
diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
index d32e855..8c205a7 100644
--- a/activemq-log4j-appender/pom.xml
+++ b/activemq-log4j-appender/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-log4j-appender</artifactId>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 60469ba..312aff3 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-mqtt</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index 106694d..d9c398d 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-openwire-generator</artifactId>
diff --git a/activemq-openwire-legacy/pom.xml b/activemq-openwire-legacy/pom.xml
index a51ae69..19e5019 100644
--- a/activemq-openwire-legacy/pom.xml
+++ b/activemq-openwire-legacy/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-openwire-legacy</artifactId>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 3929bd3..339d9b8 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-osgi</artifactId>
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index b402b80..388c5a3 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-partition</artifactId>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 0e62913..dfb99c7 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-pool</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index cd4a3e5..791feed 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 72fa540..bd19355 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-rar</artifactId>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index b21ae1e..db42e80 100644
--- a/activemq-run/pom.xml
+++ b/activemq-run/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-run</artifactId>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 08c01bc..829123a 100644
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-runtime-config</artifactId>
diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml
index 906bc58..d8eff03 100644
--- a/activemq-shiro/pom.xml
+++ b/activemq-shiro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-shiro</artifactId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index ee81c5c..0f89652 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-spring</artifactId>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 922bbca..5f524ef 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-stomp</artifactId>
diff --git a/activemq-tooling/activemq-junit/pom.xml b/activemq-tooling/activemq-junit/pom.xml
index 4b8804c..fec5bf8 100644
--- a/activemq-tooling/activemq-junit/pom.xml
+++ b/activemq-tooling/activemq-junit/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-tooling</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-junit</artifactId>
diff --git a/activemq-tooling/activemq-maven-plugin/pom.xml b/activemq-tooling/activemq-maven-plugin/pom.xml
index b2b73db..4cf6d30 100644
--- a/activemq-tooling/activemq-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-tooling</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-maven-plugin</artifactId>
diff --git a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
index 6325a5b..06296c9 100644
--- a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-tooling</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-memtest-maven-plugin</artifactId>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
index eb6beb5..398bf15 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-tooling</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-perf-maven-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index d42899b..7fcd626 100644
--- a/activemq-tooling/pom.xml
+++ b/activemq-tooling/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 3999526..7693435 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-unit-tests</artifactId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 3e83c54..31e0629 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index d83e0b5..1de5c50 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 76c1c05..70fa0be 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-web</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f3c681d..e4f23d9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
</parent>
<artifactId>apache-activemq</artifactId>
diff --git a/pom.xml b/pom.xml
index 336b251..4532c6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
- <version>5.16.1-SNAPSHOT</version>
+ <version>5.17.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ActiveMQ</name>
<inceptionYear>2005</inceptionYear>
@@ -105,11 +105,11 @@
<p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.14</zookeeper-version>
- <qpid-proton-version>0.33.5</qpid-proton-version>
- <qpid-jms-version>0.52.0</qpid-jms-version>
- <qpid-jms-netty-version>4.1.46.Final</qpid-jms-netty-version>
- <qpid-jms-proton-version>0.33.5</qpid-jms-proton-version>
- <netty-all-version>4.1.46.Final</netty-all-version>
+ <qpid-proton-version>0.33.6</qpid-proton-version>
+ <qpid-jms-version>0.53.0</qpid-jms-version>
+ <qpid-jms-netty-version>4.1.51.Final</qpid-jms-netty-version>
+ <qpid-jms-proton-version>0.33.6</qpid-jms-proton-version>
+ <netty-all-version>4.1.51.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
<rome-version>1.12.2</rome-version>
<saxon-version>9.5.1-5</saxon-version>
