summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2014-08-07 20:26:37 +0000
committerJustin Ross <jross@apache.org>2014-08-07 20:26:37 +0000
commitdba548b498b8718242353fb3b492d5e29b31e9e9 (patch)
treeb68c60663c4fac35db8ce68b6f5cea51337adf58
parent3beaac1c70d923f9997a3a0fd1fd9d5085f82a13 (diff)
downloadqpid-python-dba548b498b8718242353fb3b492d5e29b31e9e9.tar.gz
QPID-5813: Advance the branch release version to 0.30
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1616588 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/QPID_VERSION.txt2
-rw-r--r--qpid/cpp/QPID_VERSION.txt2
-rw-r--r--qpid/cpp/docs/man/qpidd.12
-rw-r--r--qpid/doc/book/src/java-broker/commonEntities.xml2
-rw-r--r--qpid/doc/book/src/jms-client-0-8/commonEntities.xml2
-rwxr-xr-xqpid/extras/qmf/setup.py2
-rwxr-xr-xqpid/java/broker-core/src/main/java/broker.bnd2
-rwxr-xr-xqpid/java/client/src/main/java/client.bnd2
-rwxr-xr-xqpid/java/common/src/main/java/common.bnd2
-rw-r--r--qpid/java/management/common/src/main/java/management-common.bnd2
-rw-r--r--qpid/packaging/windows/INSTALL_NOTES.html8
-rw-r--r--qpid/packaging/windows/installer.proj2
-rwxr-xr-xqpid/python/setup.py2
-rwxr-xr-xqpid/tests/setup.py2
-rwxr-xr-xqpid/tools/setup.py2
15 files changed, 18 insertions, 18 deletions
diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
index eec15f9025..f7c6c31b62 100644
--- a/qpid/QPID_VERSION.txt
+++ b/qpid/QPID_VERSION.txt
@@ -1 +1 @@
-0.29
+0.30
diff --git a/qpid/cpp/QPID_VERSION.txt b/qpid/cpp/QPID_VERSION.txt
index eec15f9025..f7c6c31b62 100644
--- a/qpid/cpp/QPID_VERSION.txt
+++ b/qpid/cpp/QPID_VERSION.txt
@@ -1 +1 @@
-0.29
+0.30
diff --git a/qpid/cpp/docs/man/qpidd.1 b/qpid/cpp/docs/man/qpidd.1
index ac272552e7..1db83310bb 100644
--- a/qpid/cpp/docs/man/qpidd.1
+++ b/qpid/cpp/docs/man/qpidd.1
@@ -17,7 +17,7 @@
.\" under the License.
.\"
-.TH QPIDD "1" "December 2013" "qpidd (qpid-cpp) version 0.29" "User Commands"
+.TH QPIDD "1" "August 2014" "qpidd (qpid-cpp) version 0.30" "User Commands"
.SH NAME
qpidd \- the Qpid AMQP Message Broker Daemon
diff --git a/qpid/doc/book/src/java-broker/commonEntities.xml b/qpid/doc/book/src/java-broker/commonEntities.xml
index 8dd3d61f55..2c3d875406 100644
--- a/qpid/doc/book/src/java-broker/commonEntities.xml
+++ b/qpid/doc/book/src/java-broker/commonEntities.xml
@@ -22,7 +22,7 @@
<!ENTITY qpidDownloadUrl "http://qpid.apache.org/download.html">
<!ENTITY qpidCppBook "../../AMQP-Messaging-Broker-CPP-Book/html/">
-<!ENTITY qpidCurrentRelease "0.29">
+<!ENTITY qpidCurrentRelease "0.30">
<!ENTITY windowsBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.zip">
<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
diff --git a/qpid/doc/book/src/jms-client-0-8/commonEntities.xml b/qpid/doc/book/src/jms-client-0-8/commonEntities.xml
index d3247f0483..7214ffc758 100644
--- a/qpid/doc/book/src/jms-client-0-8/commonEntities.xml
+++ b/qpid/doc/book/src/jms-client-0-8/commonEntities.xml
@@ -19,7 +19,7 @@
-->
-<!ENTITY qpidVersion "0.29">
+<!ENTITY qpidVersion "0.30">
<!ENTITY qpidDownloadUrlDesc "the Apache Qpid project web site">
<!ENTITY qpidDownloadUrl "http://qpid.apache.org/download.html">
diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
index 3022d4b2cd..fa2f0965f7 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.29",
+ version="0.30",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qmf"],
diff --git a/qpid/java/broker-core/src/main/java/broker.bnd b/qpid/java/broker-core/src/main/java/broker.bnd
index 8b3f663ec6..16e266727c 100755
--- a/qpid/java/broker-core/src/main/java/broker.bnd
+++ b/qpid/java/broker-core/src/main/java/broker.bnd
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.29.0
+ver: 0.30.0
Bundle-SymbolicName: qpid-broker
Bundle-Version: ${ver}
diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
index c2abcd55b5..9b4dd3b878 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.29.0
+ver: 0.30.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index 498562f3c1..8edb097da5 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.29.0
+ver: 0.30.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 cb080c9680..21d04e04fb 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.29.0
+ver: 0.30.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
index 8c142b3c2a..b2b819db03 100644
--- a/qpid/packaging/windows/INSTALL_NOTES.html
+++ b/qpid/packaging/windows/INSTALL_NOTES.html
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.29 Installation Notes</title>
+<title>Apache Qpid C++ 0.30 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.29 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.30 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.29 for Windows.
+<p>Thank you for installing Apache Qpid version 0.30 for Windows.
If the requisite features were installed, you can now run a broker,
use the example programs, and design your own messaging programs while
reading the Qpid C++ API reference documentation.</p>
@@ -83,7 +83,7 @@ default; therefore, to gain support for durable items the persistence plugin
must be loaded into the broker. This can be done using the
<code>--load-module</code> option to load the needed plugins. For example:
<pre>
-cd "C:\Program Files\Apache\qpidc-0.29"
+cd "C:\Program Files\Apache\qpidc-0.30"
qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll
</pre>
The <code>--load-module</code> option can also take a full path. The option
diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj
index 84eb652b0b..97f77808fc 100644
--- a/qpid/packaging/windows/installer.proj
+++ b/qpid/packaging/windows/installer.proj
@@ -32,7 +32,7 @@
<source_root>$(MSBuildProjectDirectory)\..\..</source_root>
<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>
<bits Condition="'$(bits)' == ''">32</bits>
- <qpid_version>0.29</qpid_version>
+ <qpid_version>0.30</qpid_version>
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>
diff --git a/qpid/python/setup.py b/qpid/python/setup.py
index c56ff6afba..4e6ce8fe6b 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.29",
+ version="0.30",
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 101ec322a2..692891e241 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.29",
+ version="0.30",
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 52dc27aaaf..5f6c4ec100 100755
--- a/qpid/tools/setup.py
+++ b/qpid/tools/setup.py
@@ -34,7 +34,7 @@ containing QMF commands to the Qpid broker.
"""
setup(name="qpid-tools",
- version="0.29",
+ version="0.30",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
package_dir={'' : 'src/py'},