summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2013-07-18 01:56:23 +0000
committerJustin Ross <jross@apache.org>2013-07-18 01:56:23 +0000
commit2d131d5628306ec9ecefc2c17471108f70b5fdc0 (patch)
treeaa9fb6aaa6fca2fbe5f72de86a7e0e54af563bdb
parent2c06b765380e6856fdc07e6bded3e7c49894b0c2 (diff)
downloadqpid-python-2d131d5628306ec9ecefc2c17471108f70b5fdc0.tar.gz
QPID-4961: Change trunk version to 0.25
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1504343 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--QPID_VERSION.txt2
-rw-r--r--doc/book/src/java-broker/commonEntities.xml2
-rwxr-xr-xextras/qmf/setup.py2
-rwxr-xr-xjava/broker/src/main/java/broker.bnd2
-rwxr-xr-xjava/client/src/main/java/client.bnd2
-rw-r--r--java/common.xml2
-rwxr-xr-xjava/common/src/main/java/common.bnd2
-rw-r--r--java/management/common/src/main/java/management-common.bnd2
-rw-r--r--packaging/windows/INSTALL_NOTES.html8
-rw-r--r--packaging/windows/installer.proj2
-rwxr-xr-xpython/setup.py2
-rwxr-xr-xtests/setup.py2
-rwxr-xr-xtools/setup.py2
13 files changed, 16 insertions, 16 deletions
diff --git a/QPID_VERSION.txt b/QPID_VERSION.txt
index 39010d220e..7d385d419c 100644
--- a/QPID_VERSION.txt
+++ b/QPID_VERSION.txt
@@ -1 +1 @@
-0.23
+0.25
diff --git a/doc/book/src/java-broker/commonEntities.xml b/doc/book/src/java-broker/commonEntities.xml
index d986d1e940..ca642519f0 100644
--- a/doc/book/src/java-broker/commonEntities.xml
+++ b/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.23">
+<!ENTITY qpidCurrentRelease "0.25">
<!ENTITY windowsBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.zip">
<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
diff --git a/extras/qmf/setup.py b/extras/qmf/setup.py
index ddfba19a49..b3d96efc5c 100755
--- a/extras/qmf/setup.py
+++ b/extras/qmf/setup.py
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.23",
+ version="0.25",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["qmf"],
diff --git a/java/broker/src/main/java/broker.bnd b/java/broker/src/main/java/broker.bnd
index 2edbab79a5..8296764126 100755
--- a/java/broker/src/main/java/broker.bnd
+++ b/java/broker/src/main/java/broker.bnd
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.23.0
+ver: 0.25.0
Bundle-SymbolicName: qpid-broker
Bundle-Version: ${ver}
diff --git a/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd
index 1d78bee554..5cc63b8d51 100755
--- a/java/client/src/main/java/client.bnd
+++ b/java/client/src/main/java/client.bnd
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.23.0
+ver: 0.25.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
diff --git a/java/common.xml b/java/common.xml
index 85cc7fc30b..f05e3fd8c6 100644
--- a/java/common.xml
+++ b/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.23"/>
+ <property name="project.version" value="0.25"/>
<!-- The release version used for maven output. SNAPSHOT added via maven.version.suffix -->
<property name="project.version.maven" value="0.24"/>
<property name="project.url" value="http://qpid.apache.org"/>
diff --git a/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd
index 5635012faa..4d6cd3d844 100755
--- a/java/common/src/main/java/common.bnd
+++ b/java/common/src/main/java/common.bnd
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.23.0
+ver: 0.25.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
diff --git a/java/management/common/src/main/java/management-common.bnd b/java/management/common/src/main/java/management-common.bnd
index dad6055a13..b31617a2e1 100644
--- a/java/management/common/src/main/java/management-common.bnd
+++ b/java/management/common/src/main/java/management-common.bnd
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.23.0
+ver: 0.25.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
diff --git a/packaging/windows/INSTALL_NOTES.html b/packaging/windows/INSTALL_NOTES.html
index 66a24253a2..53eb1719d2 100644
--- a/packaging/windows/INSTALL_NOTES.html
+++ b/packaging/windows/INSTALL_NOTES.html
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.23 Installation Notes</title>
+<title>Apache Qpid C++ 0.25 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.23 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.25 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.23 for Windows.
+<p>Thank you for installing Apache Qpid version 0.25 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.23"
+cd "C:\Program Files\Apache\qpidc-0.25"
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/packaging/windows/installer.proj b/packaging/windows/installer.proj
index 5402559a18..6a3fc05e57 100644
--- a/packaging/windows/installer.proj
+++ b/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.23</qpid_version>
+ <qpid_version>0.25</qpid_version>
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>
diff --git a/python/setup.py b/python/setup.py
index bc8c3e3fa4..aefd86e293 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.23",
+ version="0.25",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
packages=["mllib", "qpid", "qpid.messaging", "qpid.tests",
diff --git a/tests/setup.py b/tests/setup.py
index 519c47c416..72a6dc2484 100755
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.23",
+ version="0.25",
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/tools/setup.py b/tools/setup.py
index 87ae63c903..02d8367d5a 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.23",
+ version="0.25",
author="Apache Qpid",
author_email="dev@qpid.apache.org",
package_dir={'' : 'src/py'},
View Lorry Controller Status