diff options
author | Justin Ross <jross@apache.org> | 2012-03-08 10:30:33 +0000 |
---|---|---|
committer | Justin Ross <jross@apache.org> | 2012-03-08 10:30:33 +0000 |
commit | f65eb3d998149d92c346b757a46c45b3f47a816d (patch) | |
tree | c13b044a3eb5e12838e7db5703c383e39d1c4396 | |
parent | 6cf73d712451348441171d2a76579b828b359d82 (diff) | |
download | qpid-python-f65eb3d998149d92c346b757a46c45b3f47a816d.tar.gz |
QPID-3864: Update version strings to 0.16
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1298344 13f79535-47bb-0310-9956-ffa450edef68
20 files changed, 24 insertions, 24 deletions
diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt index 2856407c03..8eac30c383 100644 --- a/qpid/QPID_VERSION.txt +++ b/qpid/QPID_VERSION.txt @@ -1 +1 @@ -0.15 +0.16 diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py index f11546fe84..14812d11ba 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.15", + version="0.16", author="Apache Qpid", author_email="dev@qpid.apache.org", packages=["qmf"], diff --git a/qpid/java/bdbstore/bin/backup.sh b/qpid/java/bdbstore/bin/backup.sh index 0fa1d57392..3b9d65c573 100755 --- a/qpid/java/bdbstore/bin/backup.sh +++ b/qpid/java/bdbstore/bin/backup.sh @@ -34,7 +34,7 @@ if [ -z "${QPID_HOME}" ]; then export QPID_HOME=`cd ${WHEREAMI}/../ && pwd` fi -VERSION=0.15 +VERSION=0.16 # BDB's je JAR expected to be found in lib/opt LIBS="${QPID_HOME}/lib/opt/*:${QPID_HOME}/lib/qpid-bdbstore-${VERSION}.jar:${QPID_HOME}/lib/qpid-all.jar" diff --git a/qpid/java/bdbstore/bin/storeUpgrade.sh b/qpid/java/bdbstore/bin/storeUpgrade.sh index 4c13f8d178..0ef82534b7 100755 --- a/qpid/java/bdbstore/bin/storeUpgrade.sh +++ b/qpid/java/bdbstore/bin/storeUpgrade.sh @@ -33,7 +33,7 @@ if [ -z "${QPID_HOME}" ]; then export QPID_HOME=`cd ${WHEREAMI}/../ && pwd` fi -VERSION=0.15 +VERSION=0.16 # BDB's je JAR expected to be found in lib/opt LIBS="$QPID_HOME/lib/opt/*:$QPID_HOME/lib/qpid-bdbstore-${VERSION}.jar:$QPID_HOME/lib/qpid-all.jar" diff --git a/qpid/java/bdbstore/etc/scripts/bdbtest.sh b/qpid/java/bdbstore/etc/scripts/bdbtest.sh index d53481c393..dd4abf440c 100755 --- a/qpid/java/bdbstore/etc/scripts/bdbtest.sh +++ b/qpid/java/bdbstore/etc/scripts/bdbtest.sh @@ -32,7 +32,7 @@ for arg in "$@"; do fi done -VERSION=0.15 +VERSION=0.16 # Set classpath to include Qpid jar with all required jars in manifest QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.jar 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 c9e1371732..9536c1cf70 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.15.0 +ver: 0.16.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} diff --git a/qpid/java/broker/src/main/java/broker.bnd b/qpid/java/broker/src/main/java/broker.bnd index 25b0495a63..5f5cb6a555 100755 --- a/qpid/java/broker/src/main/java/broker.bnd +++ b/qpid/java/broker/src/main/java/broker.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.15.0 +ver: 0.16.0 Bundle-SymbolicName: qpid-broker Bundle-Version: ${ver} diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 259902a938..ac95d15700 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -737,7 +737,7 @@ public class ServerConfiguration extends ConfigurationPlugin public String getConnectorKeyManagerFactoryAlgorithm() { final String systemFallback = KeyManagerFactory.getDefaultAlgorithm(); - // deprecated, pre-0.15 brokers supported this name. + // deprecated, pre-0.16 brokers supported this name. final String fallback = getStringValue("connector.ssl.certType", systemFallback); return getStringValue("connector.ssl.keyManagerFactoryAlgorithm", fallback); } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java index d64d1212b0..75df574aba 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java @@ -73,11 +73,11 @@ public class OsgiSystemPackageUtilTest extends QpidTestCase _map.put("org.apache.qpid.xyz", "1.0.0"); _map.put("org.abc", "1.2.3"); - _util = new OsgiSystemPackageUtil(new Version("0.15"), _map); + _util = new OsgiSystemPackageUtil(new Version("0.16"), _map); final String systemPackageString = _util.getFormattedSystemPackageString(); - assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.15.0", systemPackageString); + assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.16.0", systemPackageString); } public void testWithQpidPackageWithoutQpidReleaseNumberSet() throws Exception diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd index d92d582ec8..47e76a3f62 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.15.0 +ver: 0.16.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 4e9e2d1598..0bff70ff96 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -23,7 +23,7 @@ <dirname property="project.root" file="${ant.file.common}"/> <property name="project.name" value="qpid"/> - <property name="project.version" value="0.15"/> + <property name="project.version" value="0.16"/> <property name="project.url" value="http://qpid.apache.org"/> <property name="project.groupid" value="org.apache.qpid"/> <property name="project.namever" value="${project.name}-${project.version}"/> diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd index 64e80c9b43..9e5136e3c7 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.15.0
+ver: 0.16.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
diff --git a/qpid/java/ivy.xml b/qpid/java/ivy.xml index 899c5fa79b..b821de728f 100644 --- a/qpid/java/ivy.xml +++ b/qpid/java/ivy.xml @@ -18,7 +18,7 @@ <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> - <info organisation="org/apache" module="qpid" revision="0.15"/> + <info organisation="org/apache" module="qpid" revision="0.16"/> <publications xmlns:e="urn:ant.apache.org:ivy-extras"> <artifact name="qpid-client" type="pom" ext="pom"/> 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 5f7f8bede3..6fe0ca9099 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.15.0 +ver: 0.16.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 f47bc86797..38038532d9 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.15.0 +Bundle-Version: 0.16.0 Bundle-Activator: org.apache.qpid.management.ui.Activator Bundle-Vendor: Apache Software Foundation Bundle-Localization: plugin diff --git a/qpid/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html index ad57eb8a36..be04baf790 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.15 Installation Notes</title>
+<title>Apache Qpid C++ 0.16 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.15 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.16 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.15 for Windows.
+<p>Thank you for installing Apache Qpid version 0.16 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.15"
+cd "C:\Program Files\Apache\qpidc-0.16"
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 5a3f1e0201..d0d4089092 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.14</qpid_version>
+ <qpid_version>0.16</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 a0717ece1b..d0afa5bf46 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.15", + version="0.16", 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 b8e952998d..f789f13841 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.15", + version="0.16", 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 71e1310b2d..85e6a54a44 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.15", + version="0.16", author="Apache Qpid", author_email="dev@qpid.apache.org", package_dir={'' : 'src/py'}, |