You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2020/07/21 09:36:17 UTC
[qpid-broker-j] branch master updated (7bf4399 -> 16bc623)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 7bf4399 QPID-8426: [Broker-J] Reuse tcp port by SimpleKdcServer and skip kerberos-related tests from SimpleLDAPAuthenticationManagerTest when IBM JDK is used
new 7fe4191 QPID-8457: [Broker-J] Change broker version to 9.0.0-SNAPSHOT
new 6e39561 QPID-8456: [Broker-J] Configurable shutdown timeout
new 16bc623 QPID-8449: [Broker-J][WMC] Fix query store updater
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-qpid-broker-j/pom.xml | 2 +-
bdbstore/pom.xml | 2 +-
bdbstore/systests/pom.xml | 2 +-
broker-codegen/pom.xml | 2 +-
broker-core/pom.xml | 2 +-
.../qpid/server/model/AbstractSystemConfig.java | 62 -------------------
.../java/org/apache/qpid/server/model/Broker.java | 10 +++-
.../org/apache/qpid/server/model/BrokerImpl.java | 70 ++++++++++++++++++----
.../org/apache/qpid/server/model/BrokerModel.java | 2 +-
.../store/BrokerStoreUpgraderAndRecoverer.java | 24 ++++++++
.../VirtualHostStoreUpgraderAndRecoverer.java | 24 ++++++++
broker-plugins/access-control/pom.xml | 2 +-
broker-plugins/amqp-0-10-protocol/pom.xml | 2 +-
broker-plugins/amqp-0-8-protocol/pom.xml | 2 +-
broker-plugins/amqp-1-0-bdb-store/pom.xml | 2 +-
broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +-
broker-plugins/amqp-1-0-protocol/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +-
broker-plugins/derby-store/pom.xml | 2 +-
broker-plugins/jdbc-logging-logback/pom.xml | 2 +-
broker-plugins/jdbc-provider-bone/pom.xml | 2 +-
broker-plugins/jdbc-store/pom.xml | 2 +-
broker-plugins/logging-logback/pom.xml | 2 +-
broker-plugins/management-amqp/pom.xml | 2 +-
broker-plugins/management-http/pom.xml | 2 +-
.../latest/LatestManagementControllerFactory.java | 2 +-
...=> LegacyManagementControllerFactory_v8_0.java} | 9 ++-
...a => LegacyCategoryControllerFactory_v8_0.java} | 6 +-
.../src/main/java/resources/editBroker.html | 13 ++++
.../java/resources/js/qpid/management/Broker.js | 1 +
.../resources/js/qpid/management/editBroker.js | 2 +-
.../js/qpid/management/query/StoreUpdater.js | 1 +
.../src/main/java/resources/showBroker.html | 4 ++
broker-plugins/memory-store/pom.xml | 2 +-
broker-plugins/websocket/pom.xml | 2 +-
broker/pom.xml | 2 +-
doc/developer-guide/pom.xml | 2 +-
doc/java-broker/pom.xml | 2 +-
...roker-Appendix-BDB-HA-Initial-Configuration.xml | 2 +-
.../docbkx/Java-Broker-Initial-Configuration.xml | 2 +-
.../Java-Broker-Management-Managing-Broker.xml | 4 ++
doc/java-perftests/pom.xml | 2 +-
doc/pom.xml | 2 +-
joramtests/pom.xml | 2 +-
perftests/pom.xml | 2 +-
perftests/visualisation-jfc/pom.xml | 2 +-
pom.xml | 2 +-
qpid-perftests-systests/pom.xml | 2 +-
qpid-systests-parent/pom.xml | 4 +-
qpid-test-utils/pom.xml | 2 +-
systests/end-to-end-conversion-tests/pom.xml | 2 +-
.../config-end-to-end-conversion-tests.json | 2 +-
systests/protocol-tests-amqp-0-10/pom.xml | 2 +-
.../main/resources/config-protocol-tests-0-10.json | 2 +-
systests/protocol-tests-amqp-0-8/pom.xml | 2 +-
.../main/resources/config-protocol-tests-0-8.json | 2 +-
systests/protocol-tests-amqp-1-0/pom.xml | 2 +-
.../src/main/resources/config-protocol-tests.json | 2 +-
systests/protocol-tests-core/pom.xml | 2 +-
systests/qpid-systests-http-management/pom.xml | 2 +-
.../resources/config-http-management-tests.json | 2 +-
systests/qpid-systests-jms-core/pom.xml | 2 +-
.../src/main/resources/config-jms-tests.json | 2 +-
systests/qpid-systests-jms_1.1/pom.xml | 2 +-
systests/qpid-systests-jms_2.0/pom.xml | 2 +-
systests/qpid-systests-spawn-admin/pom.xml | 2 +-
.../src/main/resources/spawn-broker.json | 2 +-
systests/systests-utils/pom.xml | 2 +-
tck/pom.xml | 2 +-
tools/pom.xml | 2 +-
72 files changed, 208 insertions(+), 142 deletions(-)
copy broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/{LegacyManagementControllerFactory_v7_1.java => LegacyManagementControllerFactory_v8_0.java} (89%)
copy broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/{LegacyCategoryControllerFactory_v7_1.java => LegacyCategoryControllerFactory_v8_0.java} (87%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 03/03: QPID-8449: [Broker-J][WMC] Fix query store
updater
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 16bc623e22b5154d01054150dea44c48a5744960
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Jul 6 22:45:12 2020 +0100
QPID-8449: [Broker-J][WMC] Fix query store updater
---
.../src/main/java/resources/js/qpid/management/query/StoreUpdater.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/StoreUpdater.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/StoreUpdater.js
index 33a09af..0e2cb4b 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/StoreUpdater.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/StoreUpdater.js
@@ -69,6 +69,7 @@ define(["dojo/_base/declare",
{
this._inProgressfetch = this.inherited(arguments);
}
+ var queryResults = this._inProgressfetch;
this._captureResults(queryResults, "fetch");
return queryResults;
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/03: QPID-8456: [Broker-J] Configurable shutdown
timeout
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 6e395612a604fa747cfe9353ab5c86e3b752a9fb
Author: Tomas Vavricka <to...@deutsche-boerse.com>
AuthorDate: Fri Jul 17 11:45:28 2020 +0000
QPID-8456: [Broker-J] Configurable shutdown timeout
This closes #49
---
.../qpid/server/model/AbstractSystemConfig.java | 62 -------------------
.../java/org/apache/qpid/server/model/Broker.java | 10 +++-
.../org/apache/qpid/server/model/BrokerImpl.java | 70 ++++++++++++++++++----
.../src/main/java/resources/editBroker.html | 13 ++++
.../java/resources/js/qpid/management/Broker.js | 1 +
.../resources/js/qpid/management/editBroker.js | 2 +-
.../src/main/java/resources/showBroker.html | 4 ++
.../Java-Broker-Management-Managing-Broker.xml | 4 ++
8 files changed, 92 insertions(+), 74 deletions(-)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
index ca174f0..cfa740a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
@@ -27,7 +27,6 @@ import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Principal;
-import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -35,18 +34,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.security.auth.Subject;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.store.ManagementModeStoreHandler;
@@ -71,10 +63,7 @@ import org.apache.qpid.server.util.urlstreamhandler.classpath.Handler;
public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
extends AbstractConfiguredObject<X> implements SystemConfig<X>, DynamicModel
{
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSystemConfig.class);
-
private static final UUID SYSTEM_ID = new UUID(0l, 0l);
- private static final long SHUTDOWN_TIMEOUT = 30000l;
private final Principal _systemPrincipal;
@@ -111,8 +100,6 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
@ManagedAttributeField
private String _defaultContainerType;
- private final Thread _shutdownHook = new Thread(new ShutdownService(), "QpidBrokerShutdownHook");
-
static
{
Handler.register();
@@ -152,22 +139,6 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
}
@Override
- protected ListenableFuture<Void> beforeClose()
- {
- try
- {
- boolean removed = Runtime.getRuntime().removeShutdownHook(_shutdownHook);
- LOGGER.debug("Removed shutdown hook : {}", removed);
- }
- catch(IllegalStateException ise)
- {
- //ignore, means the JVM is already shutting down
- }
-
- return super.beforeClose();
- }
-
- @Override
protected ListenableFuture<Void> onClose()
{
final TaskExecutor taskExecutor = getTaskExecutor();
@@ -244,11 +215,6 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
@Override
protected void onOpen()
{
- super.onOpen();
-
- Runtime.getRuntime().addShutdownHook(_shutdownHook);
- LOGGER.debug("Added shutdown hook");
-
_configurationStore = createStoreObject();
if (isManagementMode())
@@ -597,32 +563,4 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
return null;
}
}
-
- private class ShutdownService implements Runnable
- {
- @Override
- public void run()
- {
- Subject.doAs(getSystemTaskSubject("Shutdown"),
- new PrivilegedAction<Object>()
- {
- @Override
- public Object run()
- {
- LOGGER.debug("Shutdown hook initiating close");
- ListenableFuture<Void> closeResult = closeAsync();
- try
- {
- closeResult.get(SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
- }
- catch (InterruptedException | ExecutionException | TimeoutException e)
- {
- LOGGER.warn("Attempting to cleanly shutdown took too long, exiting immediately", e);
- }
- return null;
- }
- });
- }
- }
-
}
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index 62e2519..4e45159 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -62,6 +62,7 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
String QPID_AMQP_PORT = "qpid.amqp_port";
String QPID_HTTP_PORT = "qpid.http_port";
String QPID_DOCUMENTATION_URL = "qpid.helpURL";
+ String BROKER_SHUTDOWN_TIMEOUT = "broker.shutdownTimeout";
String BROKER_STATISTICS_REPORING_PERIOD = "broker.statisticsReportingPeriod";
String NETWORK_BUFFER_SIZE = "qpid.broker.networkBufferSize";
@@ -123,6 +124,9 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
@ManagedContextDefault(name = QPID_DOCUMENTATION_URL)
String DEFAULT_DOCUMENTATION_URL = "http://qpid.apache.org/releases/qpid-broker-j-${qpid.version}/book/";
+ @ManagedContextDefault(name = BROKER_SHUTDOWN_TIMEOUT)
+ int DEFAULT_BROKER_SHUTDOWN_TIMEOUT = 30;
+
@ManagedContextDefault(name = BROKER_STATISTICS_REPORING_PERIOD)
int DEFAULT_STATISTICS_REPORTING_PERIOD = 0;
@@ -146,11 +150,15 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
@DerivedAttribute
int getNumberOfCores();
+ @ManagedAttribute( defaultValue = "${" + BROKER_SHUTDOWN_TIMEOUT + "}", description = "Broker shutdown timeout in seconds (disabled if 0)." +
+ " If clean shutdown takes more than shutdown timeout, broker exits immediately.")
+ int getShutdownTimeout();
+
@ManagedAttribute( defaultValue = "${" + BROKER_STATISTICS_REPORING_PERIOD + "}", description = "Period (in seconds) of the statistic report.")
int getStatisticsReportingPeriod();
@ManagedContextDefault( name = "broker.housekeepingThreadCount")
- public static final int DEFAULT_HOUSEKEEPING_THREAD_COUNT = 2;
+ int DEFAULT_HOUSEKEEPING_THREAD_COUNT = 2;
String QPID_BROKER_HOUSEKEEPING_CHECK_PERIOD = "qpid.broker.housekeepingCheckPeriod";
@ManagedContextDefault(name = QPID_BROKER_HOUSEKEEPING_CHECK_PERIOD)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 085628d..7d0b77f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -38,9 +38,11 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
@@ -72,7 +74,6 @@ import org.apache.qpid.server.security.AccessControl;
import org.apache.qpid.server.security.CompoundAccessControl;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.SubjectFixedResultAccessControl;
-import org.apache.qpid.server.security.SubjectFixedResultAccessControl.ResultCalculator;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.SocketConnectionMetaData;
import org.apache.qpid.server.security.auth.SocketConnectionPrincipal;
@@ -102,14 +103,10 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
public static final String MANAGEMENT_MODE_AUTHENTICATION = "MANAGEMENT_MODE_AUTHENTICATION";
- private final AccessControl _systemUserAllowed = new SubjectFixedResultAccessControl(new ResultCalculator()
- {
- @Override
- public Result getResult(final Subject subject)
- {
- return isSystemSubject(subject) ? Result.ALLOWED : Result.DEFER;
- }
- }, Result.DEFER);
+ private final Thread _shutdownHook = new Thread(new ShutdownService(), "QpidBrokerShutdownHook");
+
+ private final AccessControl _systemUserAllowed = new SubjectFixedResultAccessControl(subject ->
+ isSystemSubject(subject) ? Result.ALLOWED : Result.DEFER, Result.DEFER);
private final BrokerPrincipal _principal;
@@ -124,6 +121,8 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
private final AtomicLong _maximumMessageSize = new AtomicLong();
@ManagedAttributeField
+ private int _shutdownTimeout;
+ @ManagedAttributeField
private int _statisticsReportingPeriod;
@ManagedAttributeField
private boolean _messageCompressionEnabled;
@@ -531,6 +530,12 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
}
@Override
+ public int getShutdownTimeout()
+ {
+ return _shutdownTimeout;
+ }
+
+ @Override
public int getStatisticsReportingPeriod()
{
return _statisticsReportingPeriod;
@@ -611,6 +616,9 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
{
super.onOpen();
+ Runtime.getRuntime().addShutdownHook(_shutdownHook);
+ LOGGER.debug("Added shutdown hook");
+
PreferencesRoot preferencesRoot = (SystemConfig) getParent();
_preferenceStore = preferencesRoot.createPreferenceStore();
@@ -703,7 +711,16 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
@Override
protected ListenableFuture<Void> beforeClose()
{
- _brokerLoggersToClose = new ArrayList(getChildren(BrokerLogger.class));
+ try
+ {
+ final boolean removed = Runtime.getRuntime().removeShutdownHook(_shutdownHook);
+ LOGGER.debug("Removed shutdown hook: " + removed);
+ }
+ catch(IllegalStateException ise)
+ {
+ LOGGER.debug("JVM is already shutting down", ise);
+ }
+ _brokerLoggersToClose = new ArrayList<>(getChildren(BrokerLogger.class));
return super.beforeClose();
}
@@ -1294,4 +1311,37 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
}
}
+ private class ShutdownService implements Runnable
+ {
+ @Override
+ public void run()
+ {
+ Subject.doAs(getSystemTaskSubject("Shutdown"), (PrivilegedAction<Object>) () ->
+ {
+ LOGGER.debug("Shutdown hook initiating close");
+ waitForBrokerShutdown();
+ return null;
+ });
+ }
+
+ private void waitForBrokerShutdown()
+ {
+ final ListenableFuture<Void> closeResult = _parent.closeAsync();
+ try
+ {
+ if (_shutdownTimeout < 1)
+ {
+ closeResult.get();
+ }
+ else
+ {
+ closeResult.get(_shutdownTimeout, TimeUnit.SECONDS);
+ }
+ }
+ catch (InterruptedException | ExecutionException | TimeoutException e)
+ {
+ LOGGER.warn("Attempting to cleanly shutdown took too long, exiting immediately", e);
+ }
+ }
+ }
}
diff --git a/broker-plugins/management-http/src/main/java/resources/editBroker.html b/broker-plugins/management-http/src/main/java/resources/editBroker.html
index b5120c6..8a26dff 100644
--- a/broker-plugins/management-http/src/main/java/resources/editBroker.html
+++ b/broker-plugins/management-http/src/main/java/resources/editBroker.html
@@ -37,6 +37,19 @@
</div>
</div>
<div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Shutdown timeout (s):</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="editBroker.shutdownTimeout"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'shutdownTimeout',
+ trim: true,
+ placeholder: 'Time in seconds',
+ label: 'Shutdown timeout (s):',
+ promptMessage: 'Broker shutdown timeout in seconds (disabled if 0).<br>If clean shutdown takes more than shutdown timeout, broker exits immediately.'" />
+ </div>
+ </div>
+ <div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Statistics reporting period (s):</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="editBroker.statisticsReportingPeriod"
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index f0f8be1..98c29fd 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -96,6 +96,7 @@ define(["dojo/parser",
"productVersion",
"processPid",
"modelVersion",
+ "shutdownTimeout",
"statisticsReportingPeriod",
"statisticsReportingResetEnabled",
"confidentialConfigurationEncryptionProvider"];
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
index be8a67f..58b56ee 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
@@ -59,7 +59,7 @@ define(["dojox/html/entities",
util,
template)
{
- var numericFieldNames = ["statisticsReportingPeriod"];
+ var numericFieldNames = ["shutdownTimeout", "statisticsReportingPeriod"];
var brokerEditor = {
init: function ()
diff --git a/broker-plugins/management-http/src/main/java/resources/showBroker.html b/broker-plugins/management-http/src/main/java/resources/showBroker.html
index f23f2dd..956e415 100644
--- a/broker-plugins/management-http/src/main/java/resources/showBroker.html
+++ b/broker-plugins/management-http/src/main/java/resources/showBroker.html
@@ -46,6 +46,10 @@
<div class="formLabel-labelCell">PID:</div>
<div id="brokerAttribute.processPid"></div>
</div>
+ <div id="brokerAttribute.shutdownTimeout.container" class="clear">
+ <div class="formLabel-labelCell">Shutdown timeout (s):</div>
+ <div id="brokerAttribute.shutdownTimeout"></div>
+ </div>
<div id="brokerAttribute.confidentialConfigurationEncryptionProvider.container" class="clear">
<div class="formLabel-labelCell">Config Encryption:</div>
<div id="brokerAttribute.confidentialConfigurationEncryptionProvider"></div>
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
index 6194209..a4cae77 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
@@ -35,6 +35,10 @@
environments that have many.</para>
</listitem>
<listitem>
+ <para><emphasis>Shutdown timeout</emphasis>. Broker shutdown timeout in seconds (disabled if 0). If clean
+ shutdown takes more than shutdown timeout, broker exits immediately.</para>
+ </listitem>
+ <listitem>
<para><emphasis>Confidential configuration encryption provider</emphasis>. The name of the
provider used to encrypt passwords and other secrets within the configuration. See <xref linkend="Java-Broker-Security-Configuration-Encryption"/>.</para>
</listitem>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8457: [Broker-J] Change broker version
to 9.0.0-SNAPSHOT
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 7fe4191f8f6fd35ea0137fdcda3f5e49d320facf
Author: Dedeepya Tunga <de...@jpmchase.com>
AuthorDate: Mon Jul 20 15:58:09 2020 +0530
QPID-8457: [Broker-J] Change broker version to 9.0.0-SNAPSHOT
This closes #50
---
apache-qpid-broker-j/pom.xml | 2 +-
bdbstore/pom.xml | 2 +-
bdbstore/systests/pom.xml | 2 +-
broker-codegen/pom.xml | 2 +-
broker-core/pom.xml | 2 +-
.../org/apache/qpid/server/model/BrokerModel.java | 2 +-
.../store/BrokerStoreUpgraderAndRecoverer.java | 24 ++++++++++++++
.../VirtualHostStoreUpgraderAndRecoverer.java | 24 ++++++++++++++
broker-plugins/access-control/pom.xml | 2 +-
broker-plugins/amqp-0-10-protocol/pom.xml | 2 +-
broker-plugins/amqp-0-8-protocol/pom.xml | 2 +-
broker-plugins/amqp-1-0-bdb-store/pom.xml | 2 +-
broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +-
broker-plugins/amqp-1-0-protocol/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +-
broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +-
broker-plugins/derby-store/pom.xml | 2 +-
broker-plugins/jdbc-logging-logback/pom.xml | 2 +-
broker-plugins/jdbc-provider-bone/pom.xml | 2 +-
broker-plugins/jdbc-store/pom.xml | 2 +-
broker-plugins/logging-logback/pom.xml | 2 +-
broker-plugins/management-amqp/pom.xml | 2 +-
broker-plugins/management-http/pom.xml | 2 +-
.../latest/LatestManagementControllerFactory.java | 2 +-
.../LegacyManagementControllerFactory_v8_0.java} | 16 ++++++----
.../LegacyCategoryControllerFactory_v8_0.java | 37 +++++++---------------
broker-plugins/memory-store/pom.xml | 2 +-
broker-plugins/websocket/pom.xml | 2 +-
broker/pom.xml | 2 +-
doc/developer-guide/pom.xml | 2 +-
doc/java-broker/pom.xml | 2 +-
...roker-Appendix-BDB-HA-Initial-Configuration.xml | 2 +-
.../docbkx/Java-Broker-Initial-Configuration.xml | 2 +-
doc/java-perftests/pom.xml | 2 +-
doc/pom.xml | 2 +-
joramtests/pom.xml | 2 +-
perftests/pom.xml | 2 +-
perftests/visualisation-jfc/pom.xml | 2 +-
pom.xml | 2 +-
qpid-perftests-systests/pom.xml | 2 +-
qpid-systests-parent/pom.xml | 4 +--
qpid-test-utils/pom.xml | 2 +-
systests/end-to-end-conversion-tests/pom.xml | 2 +-
.../config-end-to-end-conversion-tests.json | 2 +-
systests/protocol-tests-amqp-0-10/pom.xml | 2 +-
.../main/resources/config-protocol-tests-0-10.json | 2 +-
systests/protocol-tests-amqp-0-8/pom.xml | 2 +-
.../main/resources/config-protocol-tests-0-8.json | 2 +-
systests/protocol-tests-amqp-1-0/pom.xml | 2 +-
.../src/main/resources/config-protocol-tests.json | 2 +-
systests/protocol-tests-core/pom.xml | 2 +-
systests/qpid-systests-http-management/pom.xml | 2 +-
.../resources/config-http-management-tests.json | 2 +-
systests/qpid-systests-jms-core/pom.xml | 2 +-
.../src/main/resources/config-jms-tests.json | 2 +-
systests/qpid-systests-jms_1.1/pom.xml | 2 +-
systests/qpid-systests-jms_2.0/pom.xml | 2 +-
systests/qpid-systests-spawn-admin/pom.xml | 2 +-
.../src/main/resources/spawn-broker.json | 2 +-
systests/systests-utils/pom.xml | 2 +-
tck/pom.xml | 2 +-
tools/pom.xml | 2 +-
63 files changed, 130 insertions(+), 91 deletions(-)
diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index aa6f5b4..fc2326f 100644
--- a/apache-qpid-broker-j/pom.xml
+++ b/apache-qpid-broker-j/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index 2b781a1..81ba182 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-bdbstore</artifactId>
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 0fa3b5d..90d0b37 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml
index 9c47e03..465c63b 100644
--- a/broker-codegen/pom.xml
+++ b/broker-codegen/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-broker-codegen</artifactId>
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index ee2e736..ee5b8d3 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-broker-core</artifactId>
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
index ee078c3..78176f2 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
@@ -81,7 +81,7 @@ public final class BrokerModel extends Model
* Added new broker statistics: processCpuTime, processCpuLoad
* Added new context variables for queues and exchanges to configure behaviour on unknown declared arguments
*/
- public static final int MODEL_MAJOR_VERSION = 8;
+ public static final int MODEL_MAJOR_VERSION = 9;
public static final int MODEL_MINOR_VERSION = 0;
public static final String MODEL_VERSION = MODEL_MAJOR_VERSION + "." + MODEL_MINOR_VERSION;
private static final Model MODEL_INSTANCE = new BrokerModel();
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
index 57b989c..3925f72 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
@@ -69,6 +69,7 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU
register(new Upgrader_6_1_to_7_0());
register(new Upgrader_7_0_to_7_1());
register(new Upgrader_7_1_to_8_0());
+ register(new Upgrader_8_0_to_9_0());
}
private static final class Upgrader_1_0_to_1_1 extends StoreUpgraderPhase
@@ -733,6 +734,29 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU
}
}
+ private class Upgrader_8_0_to_9_0 extends StoreUpgraderPhase
+ {
+ public Upgrader_8_0_to_9_0()
+ {
+ super("modelVersion", "8.0", "9.0");
+ }
+
+ @Override
+ public void configuredObject(final ConfiguredObjectRecord record)
+ {
+ if("Broker".equals(record.getType()))
+ {
+ upgradeRootRecord(record);
+ }
+ }
+
+ @Override
+ public void complete()
+ {
+
+ }
+ }
+
private static class VirtualHostEntryUpgrader
{
@SuppressWarnings("serial")
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
index db16180..d1bc608 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
@@ -78,6 +78,7 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS
register(new Upgrader_6_1_to_7_0());
register(new Upgrader_7_0_to_7_1());
register(new Upgrader_7_1_to_8_0());
+ register(new Upgrader_8_0_to_9_0());
Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>();
for (String exchangeName : DEFAULT_EXCHANGES.keySet())
@@ -1087,6 +1088,29 @@ public class VirtualHostStoreUpgraderAndRecoverer extends AbstractConfigurationS
}
}
+ private class Upgrader_8_0_to_9_0 extends StoreUpgraderPhase
+ {
+ public Upgrader_8_0_to_9_0()
+ {
+ super("modelVersion", "8.0", "9.0");
+ }
+
+ @Override
+ public void configuredObject(final ConfiguredObjectRecord record)
+ {
+ if("VirtualHost".equals(record.getType()))
+ {
+ upgradeRootRecord(record);
+ }
+ }
+
+ @Override
+ public void complete()
+ {
+
+ }
+ }
+
public boolean upgradeAndRecover(final DurableConfigurationStore durableConfigurationStore,
final ConfiguredObjectRecord... initialRecords)
{
diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml
index 41250aa..ba09cd8 100644
--- a/broker-plugins/access-control/pom.xml
+++ b/broker-plugins/access-control/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-0-10-protocol/pom.xml b/broker-plugins/amqp-0-10-protocol/pom.xml
index 75a1c35..796a09c 100644
--- a/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/broker-plugins/amqp-0-10-protocol/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-0-8-protocol/pom.xml b/broker-plugins/amqp-0-8-protocol/pom.xml
index 667bb9b..99eaf26 100644
--- a/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-1-0-bdb-store/pom.xml b/broker-plugins/amqp-1-0-bdb-store/pom.xml
index 03cf0f0..0738695 100644
--- a/broker-plugins/amqp-1-0-bdb-store/pom.xml
+++ b/broker-plugins/amqp-1-0-bdb-store/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
diff --git a/broker-plugins/amqp-1-0-jdbc-store/pom.xml b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
index 92fdf8e..821a17f 100644
--- a/broker-plugins/amqp-1-0-jdbc-store/pom.xml
+++ b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
diff --git a/broker-plugins/amqp-1-0-protocol/pom.xml b/broker-plugins/amqp-1-0-protocol/pom.xml
index d1a3201..4c16494 100644
--- a/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/broker-plugins/amqp-1-0-protocol/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
index ca90d4c..9009cad 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
index 2cc9d35..9a01780 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
index 88eb3ab..53b5419 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/derby-store/pom.xml b/broker-plugins/derby-store/pom.xml
index 5d994ba..78ee584 100644
--- a/broker-plugins/derby-store/pom.xml
+++ b/broker-plugins/derby-store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/jdbc-logging-logback/pom.xml b/broker-plugins/jdbc-logging-logback/pom.xml
index 9f7f005..dba5c6c 100644
--- a/broker-plugins/jdbc-logging-logback/pom.xml
+++ b/broker-plugins/jdbc-logging-logback/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/jdbc-provider-bone/pom.xml b/broker-plugins/jdbc-provider-bone/pom.xml
index 3671ef9..345ce15 100644
--- a/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/broker-plugins/jdbc-provider-bone/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/jdbc-store/pom.xml b/broker-plugins/jdbc-store/pom.xml
index 9b4c804..033c58d 100644
--- a/broker-plugins/jdbc-store/pom.xml
+++ b/broker-plugins/jdbc-store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/logging-logback/pom.xml b/broker-plugins/logging-logback/pom.xml
index 2d706fb..f381a0e 100644
--- a/broker-plugins/logging-logback/pom.xml
+++ b/broker-plugins/logging-logback/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/management-amqp/pom.xml b/broker-plugins/management-amqp/pom.xml
index d4c2d20..0fc3098 100644
--- a/broker-plugins/management-amqp/pom.xml
+++ b/broker-plugins/management-amqp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>qpid-broker-parent</artifactId>
<groupId>org.apache.qpid</groupId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml
index c363c2f..3c34234 100644
--- a/broker-plugins/management-http/pom.xml
+++ b/broker-plugins/management-http/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java
index be5981c..be8e43e 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java
@@ -44,7 +44,7 @@ public class LatestManagementControllerFactory implements ManagementControllerFa
@Override
public String getPreviousVersion()
{
- return "7.1";
+ return "8.0";
}
@Override
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java
similarity index 75%
copy from broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java
copy to broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java
index be5981c..977029e 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/latest/LatestManagementControllerFactory.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/LegacyManagementControllerFactory_v8_0.java
@@ -18,27 +18,28 @@
* under the License.
*
*/
-package org.apache.qpid.server.management.plugin.controller.latest;
+package org.apache.qpid.server.management.plugin.controller.v7_0;
import org.apache.qpid.server.management.plugin.HttpManagementConfiguration;
import org.apache.qpid.server.management.plugin.ManagementController;
import org.apache.qpid.server.management.plugin.ManagementControllerFactory;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.plugin.PluggableService;
@PluggableService
-public class LatestManagementControllerFactory implements ManagementControllerFactory
+public class LegacyManagementControllerFactory_v8_0 implements ManagementControllerFactory
{
+ public static final String MODEL_VERSION = "8.0";
+
@Override
public String getType()
{
- return "org.apache.qpid.server.management.plugin.model.latest";
+ return "org.apache.qpid.server.management.plugin.model.v8_0";
}
@Override
public String getVersion()
{
- return BrokerModel.MODEL_VERSION;
+ return MODEL_VERSION;
}
@Override
@@ -51,6 +52,9 @@ public class LatestManagementControllerFactory implements ManagementControllerFa
public ManagementController createManagementController(final HttpManagementConfiguration<?> httpManagement,
final ManagementController nextVersionManagementController)
{
- return new LatestManagementController(httpManagement);
+
+ LegacyManagementController controller = new LegacyManagementController(nextVersionManagementController, MODEL_VERSION);
+ controller.initialize();
+ return controller;
}
}
diff --git a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java
similarity index 57%
copy from systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
copy to broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java
index 3188fda..7be3a34 100644
--- a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/controller/v7_0/category/LegacyCategoryControllerFactory_v8_0.java
@@ -18,30 +18,17 @@
* under the License.
*
*/
+package org.apache.qpid.server.management.plugin.controller.v7_0.category;
+
+import org.apache.qpid.server.management.plugin.controller.v7_0.LegacyManagementControllerFactory_v8_0;
+import org.apache.qpid.server.plugin.PluggableService;
+
+@PluggableService
+public class LegacyCategoryControllerFactory_v8_0 extends LegacyCategoryControllerFactory
{
- "name" : "${broker.name}",
- "modelVersion" : "8.0",
- "authenticationproviders" : [ {
- "name" : "anon",
- "type" : "Anonymous"
- } ],
- "ports" : [ {
- "name" : "ANONYMOUS_AMQP",
- "type" : "AMQP",
- "authenticationProvider" : "anon",
- "port" : "0",
- "virtualhostaliases" : [ {
- "name" : "defaultAlias",
- "type" : "defaultAlias",
- "durable" : true
- }, {
- "name": "patternMatchingAlias",
- "type": "patternMatchingAlias"
- }, {
- "name" : "nameAlias",
- "type" : "nameAlias",
- "durable" : true
- } ]
- } ],
- "virtualhostnodes" : []
+ @Override
+ public String getModelVersion()
+ {
+ return LegacyManagementControllerFactory_v8_0.MODEL_VERSION;
+ }
}
diff --git a/broker-plugins/memory-store/pom.xml b/broker-plugins/memory-store/pom.xml
index 684cd7a..6771fcc 100644
--- a/broker-plugins/memory-store/pom.xml
+++ b/broker-plugins/memory-store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker-plugins/websocket/pom.xml b/broker-plugins/websocket/pom.xml
index 9e80c44..bdba8a6 100644
--- a/broker-plugins/websocket/pom.xml
+++ b/broker-plugins/websocket/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/broker/pom.xml b/broker/pom.xml
index 49562fd..61ca655 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-broker</artifactId>
diff --git a/doc/developer-guide/pom.xml b/doc/developer-guide/pom.xml
index 240af8d..dbfbcc8 100644
--- a/doc/developer-guide/pom.xml
+++ b/doc/developer-guide/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-java-doc</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-broker-j-developer-guide</artifactId>
diff --git a/doc/java-broker/pom.xml b/doc/java-broker/pom.xml
index a1de3f8..25f99c0 100644
--- a/doc/java-broker/pom.xml
+++ b/doc/java-broker/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-java-doc</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-java-doc-broker</artifactId>
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml
index 465e201..e50940d 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-BDB-HA-Initial-Configuration.xml
@@ -64,7 +64,7 @@
<programlisting>
{
"name": "\${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "Plain",
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
index 0fae218..ad552b2 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
@@ -264,7 +264,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
<programlisting>
{
"name": "\${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "Plain",
diff --git a/doc/java-perftests/pom.xml b/doc/java-perftests/pom.xml
index 76b806e..e1d044e 100644
--- a/doc/java-perftests/pom.xml
+++ b/doc/java-perftests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-java-doc</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-java-doc-perftests</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index bd14a9f..9d5bf82 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-java-doc</artifactId>
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index e248f74..ed50a64 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>qpid-broker-parent</artifactId>
<groupId>org.apache.qpid</groupId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/perftests/pom.xml b/perftests/pom.xml
index 28ba542..8469da5 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-perftests</artifactId>
diff --git a/perftests/visualisation-jfc/pom.xml b/perftests/visualisation-jfc/pom.xml
index 9a65991..8a9c83d 100644
--- a/perftests/visualisation-jfc/pom.xml
+++ b/perftests/visualisation-jfc/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index f8c9d92..bafdcdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Qpid Broker-J Parent</name>
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 31617a9..cd17f42 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 6f2b335..6e13815 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Qpid Broker-J System Test Parent</name>
<description>Parent POM for Qpid system testing modules</description>
diff --git a/qpid-test-utils/pom.xml b/qpid-test-utils/pom.xml
index b44ac54..23d528e 100644
--- a/qpid-test-utils/pom.xml
+++ b/qpid-test-utils/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-test-utils</artifactId>
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 91463d0..ee2457c 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json b/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
index 3188fda..5776a0a 100644
--- a/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
+++ b/systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "anon",
"type" : "Anonymous"
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index c66e388..f3c9a62 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json b/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json
index a4fd9f3..583f32a 100644
--- a/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json
+++ b/systests/protocol-tests-amqp-0-10/src/main/resources/config-protocol-tests-0-10.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "anon",
"type" : "Anonymous"
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml
index 420cb9d..6ac90df 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json b/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json
index c74f09d..b314d73 100644
--- a/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json
+++ b/systests/protocol-tests-amqp-0-8/src/main/resources/config-protocol-tests-0-8.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "anon",
"type" : "Anonymous"
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index b4c691c..29cba10 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json b/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json
index 7ccded1..f96ba68 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json
+++ b/systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "anon",
"type" : "Anonymous"
diff --git a/systests/protocol-tests-core/pom.xml b/systests/protocol-tests-core/pom.xml
index 7566e37..9aac67b 100644
--- a/systests/protocol-tests-core/pom.xml
+++ b/systests/protocol-tests-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml
index 92a323a..4faa3b5 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json b/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json
index 0825206..e29cd96 100644
--- a/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json
+++ b/systests/qpid-systests-http-management/src/main/resources/config-http-management-tests.json
@@ -20,7 +20,7 @@
*/
{
"name": "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"keystores": [
{
"name": "systestsKeyStore",
diff --git a/systests/qpid-systests-jms-core/pom.xml b/systests/qpid-systests-jms-core/pom.xml
index 933f5a2..1797eee 100644
--- a/systests/qpid-systests-jms-core/pom.xml
+++ b/systests/qpid-systests-jms-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json b/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json
index af190a0..5e708aa 100644
--- a/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json
+++ b/systests/qpid-systests-jms-core/src/main/resources/config-jms-tests.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "anon",
"type" : "Anonymous"
diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml
index 96a2db6..17940a5 100644
--- a/systests/qpid-systests-jms_1.1/pom.xml
+++ b/systests/qpid-systests-jms_1.1/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/systests/qpid-systests-jms_2.0/pom.xml b/systests/qpid-systests-jms_2.0/pom.xml
index 5db2de2..7b0a633 100644
--- a/systests/qpid-systests-jms_2.0/pom.xml
+++ b/systests/qpid-systests-jms_2.0/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml
index e4f0d03..49fdf9e 100644
--- a/systests/qpid-systests-spawn-admin/pom.xml
+++ b/systests/qpid-systests-spawn-admin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
diff --git a/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json b/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json
index 7e7eaae..c39951b 100644
--- a/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json
+++ b/systests/qpid-systests-spawn-admin/src/main/resources/spawn-broker.json
@@ -20,7 +20,7 @@
*/
{
"name" : "${broker.name}",
- "modelVersion" : "8.0",
+ "modelVersion" : "9.0",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "Plain",
diff --git a/systests/systests-utils/pom.xml b/systests/systests-utils/pom.xml
index ed6a3d9..ae21b37 100644
--- a/systests/systests-utils/pom.xml
+++ b/systests/systests-utils/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-systests-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
<relativePath>../../qpid-systests-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tck/pom.xml b/tck/pom.xml
index 117c672..6b9ed62 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>qpid-broker-parent</artifactId>
<groupId>org.apache.qpid</groupId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tools/pom.xml b/tools/pom.xml
index 7269e12..2121182 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-parent</artifactId>
- <version>8.0.1-SNAPSHOT</version>
+ <version>9.0.0-SNAPSHOT</version>
</parent>
<artifactId>qpid-tools</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org