Author: jross
Date: Mon Jul 9 15:54:44 2012
New Revision: 1359232
URL: http://svn.apache.org/viewvc?rev=1359232&view=rev
Log:
QPID-4111: Adjust versions to 0.18 on the release branch
Modified:
qpid/branches/0.18/qpid/QPID_VERSION.txt
qpid/branches/0.18/qpid/cpp/bindings/qpid/ruby/README.rdoc
qpid/branches/0.18/qpid/extras/qmf/setup.py
qpid/branches/0.18/qpid/java/bdbstore/bin/backup.sh
qpid/branches/0.18/qpid/java/broker/src/main/java/broker.bnd
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
qpid/branches/0.18/qpid/java/client/src/main/java/client.bnd
qpid/branches/0.18/qpid/java/common.xml
qpid/branches/0.18/qpid/java/common/src/main/java/common.bnd
qpid/branches/0.18/qpid/java/management/common/src/main/java/management-common.bnd
qpid/branches/0.18/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
qpid/branches/0.18/qpid/packaging/windows/INSTALL_NOTES.html
qpid/branches/0.18/qpid/packaging/windows/installer.proj
qpid/branches/0.18/qpid/python/setup.py
qpid/branches/0.18/qpid/tests/setup.py
qpid/branches/0.18/qpid/tools/setup.py
Modified: qpid/branches/0.18/qpid/QPID_VERSION.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/QPID_VERSION.txt?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/QPID_VERSION.txt (original)
+++ qpid/branches/0.18/qpid/QPID_VERSION.txt Mon Jul 9 15:54:44 2012
@@ -1 +1 @@
-0.17
+0.18
Modified: qpid/branches/0.18/qpid/cpp/bindings/qpid/ruby/README.rdoc
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/bindings/qpid/ruby/README.rdoc?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/cpp/bindings/qpid/ruby/README.rdoc (original)
+++ qpid/branches/0.18/qpid/cpp/bindings/qpid/ruby/README.rdoc Mon Jul 9
15:54:44 2012
@@ -2,7 +2,7 @@
Qpid is an cross-platform enterprise messaging system.
-Version :: 0.17.0
+Version :: 0.18.0
= Links
Modified: qpid/branches/0.18/qpid/extras/qmf/setup.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/extras/qmf/setup.py?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/extras/qmf/setup.py (original)
+++ qpid/branches/0.18/qpid/extras/qmf/setup.py Mon Jul 9 15:54:44 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-qmf",
- version="0.17",
+ version="0.18",
author="Apache Qpid",
author_email="[email protected]",
packages=["qmf"],
Modified: qpid/branches/0.18/qpid/java/bdbstore/bin/backup.sh
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/bdbstore/bin/backup.sh?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/branches/0.18/qpid/java/bdbstore/bin/backup.sh Mon Jul 9 15:54:44 2012
@@ -34,7 +34,7 @@ if [ -z "${QPID_HOME}" ]; then
export QPID_HOME=`cd ${WHEREAMI}/../ && pwd`
fi
-VERSION=0.17
+VERSION=0.18
# 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"
Modified: qpid/branches/0.18/qpid/java/broker/src/main/java/broker.bnd
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/main/java/broker.bnd?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker/src/main/java/broker.bnd (original)
+++ qpid/branches/0.18/qpid/java/broker/src/main/java/broker.bnd Mon Jul 9
15:54:44 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.17.0
+ver: 0.18.0
Bundle-SymbolicName: qpid-broker
Bundle-Version: ${ver}
Modified:
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
(original)
+++
qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java
Mon Jul 9 15:54:44 2012
@@ -73,11 +73,11 @@ public class OsgiSystemPackageUtilTest e
_map.put("org.apache.qpid.xyz", "1.0.0");
_map.put("org.abc", "1.2.3");
- _util = new OsgiSystemPackageUtil(new Version("0.17"), _map);
+ _util = new OsgiSystemPackageUtil(new Version("0.18"), _map);
final String systemPackageString =
_util.getFormattedSystemPackageString();
- assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz;
version=0.17.0", systemPackageString);
+ assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz;
version=0.18.0", systemPackageString);
}
public void testWithQpidPackageWithoutQpidReleaseNumberSet() throws
Exception
Modified: qpid/branches/0.18/qpid/java/client/src/main/java/client.bnd
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/client/src/main/java/client.bnd?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/client/src/main/java/client.bnd (original)
+++ qpid/branches/0.18/qpid/java/client/src/main/java/client.bnd Mon Jul 9
15:54:44 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.17.0
+ver: 0.18.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
Modified: qpid/branches/0.18/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/common.xml?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/common.xml (original)
+++ qpid/branches/0.18/qpid/java/common.xml Mon Jul 9 15:54:44 2012
@@ -23,7 +23,7 @@
<dirname property="project.root" file="${ant.file.common}"/>
<property name="project.name" value="qpid"/>
- <property name="project.version" value="0.17"/>
+ <property name="project.version" value="0.18"/>
<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}"/>
Modified: qpid/branches/0.18/qpid/java/common/src/main/java/common.bnd
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/common/src/main/java/common.bnd?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/common/src/main/java/common.bnd (original)
+++ qpid/branches/0.18/qpid/java/common/src/main/java/common.bnd Mon Jul 9
15:54:44 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.17.0
+ver: 0.18.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
Modified:
qpid/branches/0.18/qpid/java/management/common/src/main/java/management-common.bnd
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/management/common/src/main/java/management-common.bnd?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
---
qpid/branches/0.18/qpid/java/management/common/src/main/java/management-common.bnd
(original)
+++
qpid/branches/0.18/qpid/java/management/common/src/main/java/management-common.bnd
Mon Jul 9 15:54:44 2012
@@ -17,7 +17,7 @@
# under the License.
#
-ver: 0.17.0
+ver: 0.18.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
Modified:
qpid/branches/0.18/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
(original)
+++ qpid/branches/0.18/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
Mon Jul 9 15:54:44 2012
@@ -3,7 +3,7 @@ Bundle-License: http://www.apache.org/li
Bundle-ManifestVersion: 2
Bundle-Name: Qpid JMX Management Console Plug-in
Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true
-Bundle-Version: 0.17.0
+Bundle-Version: 0.18.0
Bundle-Activator: org.apache.qpid.management.ui.Activator
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Modified: qpid/branches/0.18/qpid/packaging/windows/INSTALL_NOTES.html
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/packaging/windows/INSTALL_NOTES.html?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/branches/0.18/qpid/packaging/windows/INSTALL_NOTES.html Mon Jul 9
15:54:44 2012
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Apache Qpid C++ 0.17 Installation Notes</title>
+<title>Apache Qpid C++ 0.18 Installation Notes</title>
</head>
<body>
-<H1>Apache Qpid C++ 0.17 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.18 Installation Notes</H1>
-<p>Thank you for installing Apache Qpid version 0.17 for Windows.
+<p>Thank you for installing Apache Qpid version 0.18 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
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.17"
+cd "C:\Program Files\Apache\qpidc-0.18"
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
Modified: qpid/branches/0.18/qpid/packaging/windows/installer.proj
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/packaging/windows/installer.proj?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/packaging/windows/installer.proj (original)
+++ qpid/branches/0.18/qpid/packaging/windows/installer.proj Mon Jul 9
15:54:44 2012
@@ -32,7 +32,7 @@
<source_root>$(MSBuildProjectDirectory)\..\..</source_root>
<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>
<bits Condition="'$(bits)' == ''">32</bits>
- <qpid_version>0.17</qpid_version>
+ <qpid_version>0.18</qpid_version>
<OutputName>qpidc</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>C:\Program Files (x86)\Windows Installer XML
v3.5\bin</WixToolPath>
Modified: qpid/branches/0.18/qpid/python/setup.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/python/setup.py?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/python/setup.py (original)
+++ qpid/branches/0.18/qpid/python/setup.py Mon Jul 9 15:54:44 2012
@@ -298,7 +298,7 @@ class install_lib(_install_lib):
return outfiles + extra
setup(name="qpid-python",
- version="0.17",
+ version="0.18",
author="Apache Qpid",
author_email="[email protected]",
packages=["mllib", "qpid", "qpid.messaging", "qpid.tests",
Modified: qpid/branches/0.18/qpid/tests/setup.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/tests/setup.py?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/tests/setup.py (original)
+++ qpid/branches/0.18/qpid/tests/setup.py Mon Jul 9 15:54:44 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tests",
- version="0.17",
+ version="0.18",
author="Apache Qpid",
author_email="[email protected]",
packages=["qpid_tests", "qpid_tests.broker_0_10",
"qpid_tests.broker_0_9",
Modified: qpid/branches/0.18/qpid/tools/setup.py
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/tools/setup.py?rev=1359232&r1=1359231&r2=1359232&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/tools/setup.py (original)
+++ qpid/branches/0.18/qpid/tools/setup.py Mon Jul 9 15:54:44 2012
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name="qpid-tools",
- version="0.17",
+ version="0.18",
author="Apache Qpid",
author_email="[email protected]",
package_dir={'' : 'src/py'},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]