summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2013-11-12 22:49:12 +0000
committerJustin Ross <jross@apache.org>2013-11-12 22:49:12 +0000
commit59fde7dd17976ab709428e81e507863a3a3f2145 (patch)
treedc22bc6ef400e8fb00177b9e9f582510fa279f78
parentb408e144b6c259de4e1875bf707a917b2f3aff07 (diff)
downloadqpid-python-59fde7dd17976ab709428e81e507863a3a3f2145.tar.gz
QPID-5255: Change branch version to 0.26
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1541291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--qpid/QPID_VERSION.txt2
-rw-r--r--qpid/cpp/QPID_VERSION.txt2
-rw-r--r--qpid/doc/book/src/java-broker/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
-rw-r--r--qpid/java/common.xml2
-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
14 files changed, 17 insertions, 17 deletions
diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
index 7d385d419c..9922215085 100644
--- a/qpid/QPID_VERSION.txt
+++ b/qpid/QPID_VERSION.txt
@@ -1 +1 @@
-0.25
+0.26
diff --git a/qpid/cpp/QPID_VERSION.txt b/qpid/cpp/QPID_VERSION.txt
index 7d385d419c..9922215085 100644
--- a/qpid/cpp/QPID_VERSION.txt
+++ b/qpid/cpp/QPID_VERSION.txt
@@ -1 +1 @@
-0.25
+0.26
diff --git a/qpid/doc/book/src/java-broker/commonEntities.xml b/qpid/doc/book/src/java-broker/commonEntities.xml
index ed2a21ba89..c767470189 100644
--- a/qpid/doc/book/src/java-broker/commonEntities.xml
+++ b/qpid/doc/book/src/java-broker/commonEntities.xml
@@ -23,7 +23,7 @@
<!ENTITY qpidProgrammingBook "../../Programming-In-Apache-Qpid/html/">
<!ENTITY qpidCppBook "../../AMQP-Messaging-Broker-CPP-Book/html/">
-<!ENTITY qpidCurrentRelease "0.25">
+<!ENTITY qpidCurrentRelease "0.26">
<!ENTITY windowsBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.zip">
<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
index b3d96efc5c..218bc5bbef 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.25",
+ version="0.26",
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 8296764126..1888fb3720 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.25.0
+ver: 0.26.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 5cc63b8d51..90b6d27bf7 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.25.0
+ver: 0.26.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 005dd261b4..6db3766b1a 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -24,7 +24,7 @@
<property name="project.name" value="qpid"/>
<!-- Version used for standard build output -->
- <property name="project.version" value="0.25"/>
+ <property name="project.version" value="0.26"/>
<!-- The release version used for maven output. SNAPSHOT added via maven.version.suffix -->
<property name="project.version.maven" value="0.26"/>
<property name="project.url" value="http://qpid.apache.org"/>
diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index 4d6cd3d844..05678c5860 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.25.0
+ver: 0.26.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 b31617a2e1..6ee39ab66c 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.25.0
+ver: 0.26.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 53eb1719d2..76d3c59224 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.25 Installation Notes</title>
+<title>Apache Qpid C++ 0.26 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.25 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.26 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.25 for Windows.
+<p>Thank you for installing Apache Qpid version 0.26 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.25"
+cd "C:\Program Files\Apache\qpidc-0.26"
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 6a3fc05e57..55b63a3240 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.25</qpid_version>
+ <qpid_version>0.26</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 aefd86e293..c70a0a3ea4 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.25",
+ version="0.26",
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 72a6dc2484..1c7f4cdb0e 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.25",
+ version="0.26",
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 00bffc4905..ff6e74b494 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.25",
+ version="0.26",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
package_dir={'' : 'src/py'},
View Lorry Controller Status