From a1a536167c9cccb12ab10169ad115d50cc92e2fc Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 7 Nov 2010 19:44:28 +0000 Subject: Increment code and documentation version numbers from 0.7 to 0.8 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.8-release-candidates@1032366 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/QPID_VERSION.txt | 2 +- qpid/cpp/src/CMakeWinVersions.cmake | 16 ++++++++-------- qpid/doc/book/src/Programming-In-Apache-Qpid.xml | 2 +- .../java/broker/configuration/Topic-Configuration.xml | 4 ++-- qpid/extras/qmf/setup.py | 2 +- .../experimental/shutdown/src/main/java/shutdown.bnd | 2 +- .../org/apache/qpid/server/plugins/PluginManager.java | 2 +- qpid/java/client/src/main/java/client.bnd | 2 +- qpid/java/common.xml | 2 +- qpid/java/common/src/main/java/common.bnd | 2 +- .../common/src/main/java/management-common.bnd | 2 +- qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF | 2 +- qpid/python/setup.py | 2 +- qpid/tests/setup.py | 2 +- qpid/tools/setup.py | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt index eb49d7c7fd..aec258df73 100644 --- a/qpid/QPID_VERSION.txt +++ b/qpid/QPID_VERSION.txt @@ -1 +1 @@ -0.7 +0.8 diff --git a/qpid/cpp/src/CMakeWinVersions.cmake b/qpid/cpp/src/CMakeWinVersions.cmake index 93890a908f..6a17cfbe82 100644 --- a/qpid/cpp/src/CMakeWinVersions.cmake +++ b/qpid/cpp/src/CMakeWinVersions.cmake @@ -34,22 +34,22 @@ # set ("winver_PACKAGE_NAME" "qpid-cpp") # set ("winver_DESCRIPTION_SUMMARY" "Apache Qpid C++") # set ("winver_FILE_VERSION_N1" "0") -# set ("winver_FILE_VERSION_N2" "7") +# set ("winver_FILE_VERSION_N2" "8") # set ("winver_FILE_VERSION_N3" "0") -# set ("winver_FILE_VERSION_N4" "1") +# set ("winver_FILE_VERSION_N4" "0") # set ("winver_PRODUCT_VERSION_N1" "0") -# set ("winver_PRODUCT_VERSION_N2" "7") +# set ("winver_PRODUCT_VERSION_N2" "8") # set ("winver_PRODUCT_VERSION_N3" "0") -# set ("winver_PRODUCT_VERSION_N4" "1") +# set ("winver_PRODUCT_VERSION_N4" "0") # set ("winver_LEGAL_COPYRIGHT" "") # # Specification of per-project settings: # -# set ("winver_${projectName}_FileVersionBinary" "0,7,0,1") -# set ("winver_${projectName}_ProductVersionBinary" "0,7,0,1") -# set ("winver_${projectName}_FileVersionString" "0, 7, 0, 1") -# set ("winver_${projectName}_ProductVersionString" "0, 7, 0, 1") +# set ("winver_${projectName}_FileVersionBinary" "0,8,0,0") +# set ("winver_${projectName}_ProductVersionBinary" "0,8,0,0") +# set ("winver_${projectName}_FileVersionString" "0, 8, 0, 0") +# set ("winver_${projectName}_ProductVersionString" "0, 8, 0, 0") # set ("winver_${projectName}_FileDescription" "qpid-cpp-qpidcommon Library") # set ("winver_${projectName}_LegalCopyright" "") # set ("winver_${projectName}_InternalName" "qpidcommon") diff --git a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml index 1de6f71d31..142033b757 100644 --- a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml +++ b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml @@ -2887,7 +2887,7 @@ destination.topicExchange = amq.topic Boolean - If you are using JMS Map messages and deploying a new client with any JMS client older than 0.7 release, you must set this to true to ensure the older clients can understand the map message encoding. + If you are using JMS Map messages and deploying a new client with any JMS client older than 0.8 release, you must set this to true to ensure the older clients can understand the map message encoding. diff --git a/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml b/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml index 9113d6786f..1f73bbd7a4 100644 --- a/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml +++ b/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml @@ -23,7 +23,7 @@
Topic Configuration on Java Broker - New in 0.7 is the ability to define configuration for topics. Currently this is limited to + New in 0.8 is the ability to define configuration for topics. Currently this is limited to configuration for slow consumer detection. This configuration is based on the work designed on the design @@ -84,7 +84,7 @@
Limitiations - As of 0.7 the topic configuration is limited to straight string matching. This means + As of 0.8 the topic configuration is limited to straight string matching. This means that given the following two topic configuring sections for 'stocks.us' and 'stocks.*' a subscription for 'stocks.uk' will not match the expected 'stocks.*'. Nor will any additional configuration listed in 'stocks.*' affect any 'stocks.us' subscriptions. diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py index c7626aa932..98daad7796 100755 --- a/qpid/extras/qmf/setup.py +++ b/qpid/extras/qmf/setup.py @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-qmf", - version="0.7", + version="0.8", author="Apache Qpid", author_email="dev@qpid.apache.org", packages=["qmf", "qmf2", "qmf2.tests"], diff --git a/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd index b72cf94c85..5c1ef4166b 100755 --- a/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd +++ b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.7.0 +ver: 0.8.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java index 4c8c1e4b0d..e02ac80b7f 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java @@ -63,7 +63,7 @@ public class PluginManager implements Closeable private static final Logger _logger = Logger.getLogger(PluginManager.class); private static final int FELIX_STOP_TIMEOUT = 30000; - private static final String QPID_VER_SUFFIX = "version=0.7,"; + private static final String QPID_VER_SUFFIX = "version=0.8,"; private Framework _felix; diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd index 85993e39f9..88869168fa 100755 --- a/qpid/java/client/src/main/java/client.bnd +++ b/qpid/java/client/src/main/java/client.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.7.0 +ver: 0.8.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 3ebf07a210..0276dfca24 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -23,7 +23,7 @@ - + diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd index 30d1e29079..45587bd332 100755 --- a/qpid/java/common/src/main/java/common.bnd +++ b/qpid/java/common/src/main/java/common.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.7.0 +ver: 0.8.0 Bundle-SymbolicName: qpid-common Bundle-Version: ${ver} diff --git a/qpid/java/management/common/src/main/java/management-common.bnd b/qpid/java/management/common/src/main/java/management-common.bnd index 264489a6b6..f58f894139 100644 --- a/qpid/java/management/common/src/main/java/management-common.bnd +++ b/qpid/java/management/common/src/main/java/management-common.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.7.0 +ver: 0.8.0 Bundle-SymbolicName: qpid-management-common Bundle-Version: ${ver} diff --git a/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF index 7db972995b..144f91c42b 100644 --- a/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF +++ b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-ManifestVersion: 2 Bundle-Name: Qpid JMX Management Console Plug-in Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true -Bundle-Version: 0.7.0 +Bundle-Version: 0.8.0 Bundle-Activator: org.apache.qpid.management.ui.Activator Bundle-Vendor: Apache Software Foundation Bundle-Localization: plugin diff --git a/qpid/python/setup.py b/qpid/python/setup.py index bdd04d4ddf..e07db55bfe 100755 --- a/qpid/python/setup.py +++ b/qpid/python/setup.py @@ -298,7 +298,7 @@ class install_lib(_install_lib): return outfiles + extra setup(name="qpid-python", - version="0.7", + version="0.8", author="Apache Qpid", author_email="dev@qpid.apache.org", packages=["mllib", "qpid", "qpid.messaging", "qpid.tests", diff --git a/qpid/tests/setup.py b/qpid/tests/setup.py index c6f3142007..5236e4ca03 100755 --- a/qpid/tests/setup.py +++ b/qpid/tests/setup.py @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-tests", - version="0.7", + version="0.8", author="Apache Qpid", author_email="dev@qpid.apache.org", packages=["qpid_tests", "qpid_tests.broker_0_10", "qpid_tests.broker_0_9", diff --git a/qpid/tools/setup.py b/qpid/tools/setup.py index 96f8652296..f51b9d8bc1 100755 --- a/qpid/tools/setup.py +++ b/qpid/tools/setup.py @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-tools", - version="0.7", + version="0.8", author="Apache Qpid", author_email="dev@qpid.apache.org", scripts=["src/py/qpid-cluster", -- cgit v1.2.1