diff options
author | Justin Ross <jross@apache.org> | 2011-06-30 14:55:54 +0000 |
---|---|---|
committer | Justin Ross <jross@apache.org> | 2011-06-30 14:55:54 +0000 |
commit | a8a48be98d3462ef4089910f93f1a4bf91ed935f (patch) | |
tree | 47c806be1f4453e58b7766b81fcb9b90be49f7a2 | |
parent | 49e0ab1fba3ac42778a1fb5fc8d75914bcb40257 (diff) | |
download | qpid-python-a8a48be98d3462ef4089910f93f1a4bf91ed935f.tar.gz |
QPID-3331: Update branch versions to 0.12
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.12@1141557 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/QPID_VERSION.txt | 2 | ||||
-rwxr-xr-x | qpid/extras/qmf/setup.py | 2 | ||||
-rwxr-xr-x | qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd | 2 | ||||
-rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java | 2 | ||||
-rwxr-xr-x | qpid/java/client/src/main/java/client.bnd | 2 | ||||
-rw-r--r-- | qpid/java/common.xml | 2 | ||||
-rwxr-xr-x | qpid/java/common/src/main/java/common.bnd | 2 | ||||
-rw-r--r-- | qpid/java/management/common/src/main/java/management-common.bnd | 2 | ||||
-rw-r--r-- | qpid/packaging/windows/installer.proj | 8 | ||||
-rwxr-xr-x | qpid/python/setup.py | 2 | ||||
-rwxr-xr-x | qpid/tests/setup.py | 2 | ||||
-rwxr-xr-x | qpid/tools/setup.py | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt index 51176c7c89..c43e1055fd 100644 --- a/qpid/QPID_VERSION.txt +++ b/qpid/QPID_VERSION.txt @@ -1 +1 @@ -0.11 +0.12 diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py index e7bf4b9717..5b128603f7 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.11", + version="0.12", author="Apache Qpid", author_email="dev@qpid.apache.org", packages=["qmf"], 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 f49578ba8c..25d81807c1 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.11.0 +ver: 0.12.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java index 4e8d64a136..be8d905d79 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java @@ -63,7 +63,7 @@ public class PluginManager implements Closeable private static final Logger _logger = Logger.getLogger(PluginManager.class); private static final int FELIX_STOP_TIMEOUT = 30000; - private static final String QPID_VER_SUFFIX = "version=0.11,"; + private static final String QPID_VER_SUFFIX = "version=0.12,"; private Framework _felix; diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd index d2bc4f8d50..0129dd14f9 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.11.0 +ver: 0.12.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 1125a3230c..b4bf3ce6b4 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.11"/> + <property name="project.version" value="0.12"/> <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 89c397f400..c9e97af668 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.11.0
+ver: 0.12.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 66eb9f156b..57b4a66c4a 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.11.0 +ver: 0.12.0 Bundle-SymbolicName: qpid-management-common Bundle-Version: ${ver} diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index 8481c7b8a2..a41aaddf2b 100644 --- a/qpid/packaging/windows/installer.proj +++ b/qpid/packaging/windows/installer.proj @@ -218,9 +218,9 @@ OutputFile="boost_dlls.wxs" />
<Candle
ToolPath="$(WixToolPath)"
- DefineConstants="qpidc_version=0.11"
+ DefineConstants="qpidc_version=0.12"
InstallerPlatform="x64"
- OutputFile="qpidc-0.11-x64.msi" />
+ OutputFile="qpidc-0.12-x64.msi" />
-->
<Exec
Command="heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs" />
@@ -240,9 +240,9 @@ <Exec
Command="heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs" />
<Exec
- Command="candle -dqpidc_version=0.11 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" />
+ Command="candle -dqpidc_version=0.12 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture)" />
<Exec
- Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.11-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj examples_qmf-console.wixobj api_docs.wixobj" />
+ Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.12-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj examples_qmf-console.wixobj api_docs.wixobj" />
</Target>
</Project>
diff --git a/qpid/python/setup.py b/qpid/python/setup.py index a301b3e4cc..b03abe1d48 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.11", + version="0.12", 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 6a99fbb80f..db0974b1c7 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.11", + version="0.12", 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 58863a07d9..c628270ad8 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.11", + version="0.12", author="Apache Qpid", author_email="dev@qpid.apache.org", scripts=["src/py/qpid-cluster", |