diff options
author | Justin Ross <jross@apache.org> | 2011-11-03 20:54:31 +0000 |
---|---|---|
committer | Justin Ross <jross@apache.org> | 2011-11-03 20:54:31 +0000 |
commit | b78ecf148fc47dc90c015720563df8a8357c28e5 (patch) | |
tree | 28c2a115992a94ec89751929aa589c3e8a6c762a | |
parent | e2e2e9af14a5e3581530397590e3f4df65315dd8 (diff) | |
download | qpid-python-b78ecf148fc47dc90c015720563df8a8357c28e5.tar.gz |
QPID-3583: Update trunk version from 0.13 to 0.15
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1197304 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/bdbstore/bin/backup.sh | 2 | ||||
-rwxr-xr-x | qpid/java/bdbstore/bin/storeUpgrade.sh | 2 | ||||
-rwxr-xr-x | qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd | 2 | ||||
-rwxr-xr-x | qpid/java/broker/src/main/java/broker.bnd | 2 | ||||
-rw-r--r-- | qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java | 4 | ||||
-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/ivy.xml | 2 | ||||
-rw-r--r-- | qpid/java/management/common/src/main/java/management-common.bnd | 2 | ||||
-rw-r--r-- | qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF | 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 |
17 files changed, 21 insertions, 21 deletions
diff --git a/qpid/QPID_VERSION.txt b/qpid/QPID_VERSION.txt index f3040840fd..2856407c03 100644 --- a/qpid/QPID_VERSION.txt +++ b/qpid/QPID_VERSION.txt @@ -1 +1 @@ -0.13 +0.15 diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py index ae35c42375..f11546fe84 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.13", + version="0.15", 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 0e2f0fda09..22d8d52b58 100755 --- a/qpid/java/bdbstore/bin/backup.sh +++ b/qpid/java/bdbstore/bin/backup.sh @@ -31,7 +31,7 @@ WHEREAMI=`dirname $0` if [ -z "$QPID_HOME" ]; then export QPID_HOME=`cd $WHEREAMI/../ && pwd` fi -VERSION=0.13 +VERSION=0.15 LIBS=$QPID_HOME/lib/je-4.0.103.jar:$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 076b9d3f7e..f3b089b3d3 100755 --- a/qpid/java/bdbstore/bin/storeUpgrade.sh +++ b/qpid/java/bdbstore/bin/storeUpgrade.sh @@ -36,7 +36,7 @@ if [ -z "$BDB_HOME" ]; then export BDB_HOME=$(dirname $(dirname $(readlink -f $0))) fi -VERSION=0.13 +VERSION=0.15 LIBS=$BDB_HOME/lib/je-4.0.103.jar:$BDB_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.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 f6ae79536d..c9e1371732 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.13.0 +ver: 0.15.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 36c7d1a5b3..25b0495a63 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.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-broker Bundle-Version: ${ver} 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 4a03445357..f2249c5931 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 @@ -72,11 +72,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.13"), _map); + _util = new OsgiSystemPackageUtil(new Version("0.15"), _map); final String systemPackageString = _util.getFormattedSystemPackageString(); - assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.13.0", systemPackageString); + assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.15.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 98696dc7d8..bd13844e8e 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.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} diff --git a/qpid/java/common.xml b/qpid/java/common.xml index c6688ee2de..26537e7dfc 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.13"/> + <property name="project.version" value="0.15"/> <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 f12fbf9273..64e80c9b43 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.13.0
+ver: 0.15.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
diff --git a/qpid/java/ivy.xml b/qpid/java/ivy.xml index bac2f3d6ee..899c5fa79b 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.13"/> + <info organisation="org/apache" module="qpid" revision="0.15"/> <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 5c39329f2f..5f7f8bede3 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.13.0 +ver: 0.15.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 0df308dff1..f47bc86797 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.13.0 +Bundle-Version: 0.15.0 Bundle-Activator: org.apache.qpid.management.ui.Activator Bundle-Vendor: Apache Software Foundation Bundle-Localization: plugin diff --git a/qpid/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj index 5dc16b0bfa..b02bdf5b8e 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.13"
+ DefineConstants="qpidc_version=0.15"
InstallerPlatform="x64"
- OutputFile="qpidc-0.13-x64.msi" />
+ OutputFile="qpidc-0.15-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.13 -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.15 -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.13-$(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.15-$(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 65cb72854f..a0717ece1b 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.13", + version="0.15", 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 2ea7d347e7..b8e952998d 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.13", + version="0.15", 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 4231476c90..feae4bb1bd 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.13", + version="0.15", author="Apache Qpid", author_email="dev@qpid.apache.org", scripts=["src/py/qpid-cluster", |