Definitely okay. Thanks, Robbie. On Mon, 7 Mar 2011, Robbie Gemmell wrote:
Hi Justin, I would like to apply the below changes onto the 0.10 branch (substituting 10 for 11, obviously), is that ok? Thanks, Robbie ---------- Forwarded message ---------- From: <[email protected]> Date: 7 March 2011 10:21 Subject: svn commit: r1078729 - in /qpid/trunk/qpid: cpp/src/ extras/qmf/ java/broker-plugins/experimental/shutdown/src/main/java/ java/broker/src/main/java/org/apache/qpid/server/plugins/ java/common/src/main/java/ tests/ tools/ To: [email protected] Author: robbie Date: Mon Mar 7 10:21:47 2011 New Revision: 1078729 URL: http://svn.apache.org/viewvc?rev=1078729&view=rev Log: NO-JIRA: increment version numbers from 0.9 to 0.11 Modified: qpid/trunk/qpid/cpp/src/CMakeWinVersions.cmake qpid/trunk/qpid/extras/qmf/setup.py qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java qpid/trunk/qpid/java/common/src/main/java/common.bnd qpid/trunk/qpid/tests/setup.py qpid/trunk/qpid/tools/setup.py Modified: qpid/trunk/qpid/cpp/src/CMakeWinVersions.cmake URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeWinVersions.cmake?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/CMakeWinVersions.cmake (original) +++ qpid/trunk/qpid/cpp/src/CMakeWinVersions.cmake Mon Mar 7 10:21:47 2011 @@ -34,11 +34,11 @@ # set ("winver_PACKAGE_NAME" "qpid-cpp") # set ("winver_DESCRIPTION_SUMMARY" "Apache Qpid C++") # set ("winver_FILE_VERSION_N1" "0") -# set ("winver_FILE_VERSION_N2" "9") +# set ("winver_FILE_VERSION_N2" "11") # set ("winver_FILE_VERSION_N3" "0") # set ("winver_FILE_VERSION_N4" "0") # set ("winver_PRODUCT_VERSION_N1" "0") -# set ("winver_PRODUCT_VERSION_N2" "9") +# set ("winver_PRODUCT_VERSION_N2" "11) # set ("winver_PRODUCT_VERSION_N3" "0") # set ("winver_PRODUCT_VERSION_N4" "0") # set ("winver_LEGAL_COPYRIGHT" "") @@ -46,10 +46,10 @@ # # Specification of per-project settings: # -# set ("winver_${projectName}_FileVersionBinary" "0,9,0,0") -# set ("winver_${projectName}_ProductVersionBinary" "0,9,0,0") -# set ("winver_${projectName}_FileVersionString" "0, 9, 0, 0") -# set ("winver_${projectName}_ProductVersionString" "0, 9, 0, 0") +# set ("winver_${projectName}_FileVersionBinary" "0,11,0,0") +# set ("winver_${projectName}_ProductVersionBinary" "0,11,0,0") +# set ("winver_${projectName}_FileVersionString" "0, 11, 0, 0") +# set ("winver_${projectName}_ProductVersionString" "0, 11, 0, 0") # set ("winver_${projectName}_FileDescription" "qpid-cpp-qpidcommon Library") # set ("winver_${projectName}_LegalCopyright" "") # set ("winver_${projectName}_InternalName" "qpidcommon") Modified: qpid/trunk/qpid/extras/qmf/setup.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/setup.py?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/extras/qmf/setup.py (original) +++ qpid/trunk/qpid/extras/qmf/setup.py Mon Mar 7 10:21:47 2011 @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-qmf", - version="0.9", + version="0.11", author="Apache Qpid", author_email="[email protected]", packages=["qmf"], Modified: qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd (original) +++ qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd Mon Mar 7 10:21:47 2011 @@ -17,7 +17,7 @@ # under the License. # -ver: 0.9.0 +ver: 0.11.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java Mon Mar 7 10:21:47 2011 @@ -63,7 +63,7 @@ public class PluginManager implements Cl 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.9,"; + private static final String QPID_VER_SUFFIX = "version=0.11,"; private Framework _felix; Modified: qpid/trunk/qpid/java/common/src/main/java/common.bnd URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/common.bnd?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/main/java/common.bnd (original) +++ qpid/trunk/qpid/java/common/src/main/java/common.bnd Mon Mar 7 10:21:47 2011 @@ -17,7 +17,7 @@ # under the License. # -ver: 0.9.0 +ver: 0.11.0 Bundle-SymbolicName: qpid-common Bundle-Version: ${ver} Modified: qpid/trunk/qpid/tests/setup.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tests/setup.py?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/tests/setup.py (original) +++ qpid/trunk/qpid/tests/setup.py Mon Mar 7 10:21:47 2011 @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-tests", - version="0.9", + version="0.11", author="Apache Qpid", author_email="[email protected]", packages=["qpid_tests", "qpid_tests.broker_0_10", "qpid_tests.broker_0_9", Modified: qpid/trunk/qpid/tools/setup.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/setup.py?rev=1078729&r1=1078728&r2=1078729&view=diff ============================================================================== --- qpid/trunk/qpid/tools/setup.py (original) +++ qpid/trunk/qpid/tools/setup.py Mon Mar 7 10:21:47 2011 @@ -20,7 +20,7 @@ from distutils.core import setup setup(name="qpid-tools", - version="0.9", + version="0.11", author="Apache Qpid", author_email="[email protected]", scripts=["src/py/qpid-cluster", --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
--------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
