Prepare for next release.
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/trunk@1450932 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index 7cb502c..5d1bf5e 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -1,4 +1,32 @@
=========================================================================
+== Release Notes for ActiveMQ CPP 3.6.0 ==
+=========================================================================
+
+Bug
+
+ [AMQCPP-449] - activemq::library::ActiveMQCPP::shutdownLibrary(); causing runtime exception
+ [AMQCPP-450] - Win32 Thread Handle Leak
+ [AMQCPP-451] - The number of CMS threads increases when we restart the message broker repeatedly
+ [AMQCPP-454] - Found pure function call error in CMS
+ [AMQCPP-455] - Found an access violation in CMS when creating a new connection
+ [AMQCPP-456] - Add ability to set updateURIsSupported for failover transport
+ [AMQCPP-459] - Found an access violation in NodePool::ReturNode(Node* node)
+ [AMQCPP-460] - Access Violation
+ [AMQCPP-461] - Create Thread objects that aren't started can leak their suspended thread on destroy.
+ [AMQCPP-464] - Deadlock during normal task termination
+ [AMQCPP-465] - Periodic access violation originating from Openwire::unmarshal
+ [AMQCPP-466] - Segmentation Fault in Temporary Queue consumer (incorrect Exception construction)
+
+Improvement
+
+ [AMQCPP-457] - Refactor Transports layer for more control over started / stopped state during initialization
+ [AMQCPP-467] - Improve the CMSException types thrown from errors sent back from the broker.
+
+New Feature
+
+ [AMQCPP-463] - Add support for priority backups to the FailoverTransport
+
+=========================================================================
== Release Notes for ActiveMQ CPP 3.5.0 ==
=========================================================================
diff --git a/activemq-cpp/activemq-cpp.spec b/activemq-cpp/activemq-cpp.spec
index 773dc15..53c0331 100644
--- a/activemq-cpp/activemq-cpp.spec
+++ b/activemq-cpp/activemq-cpp.spec
@@ -1,5 +1,5 @@
Name: activemq-cpp
-Version: 3.5.0
+Version: 3.6.0
Release: 1%{?dist}
Summary: C++ Implementation of a JMS style Messaging Client
diff --git a/activemq-cpp/configure.ac b/activemq-cpp/configure.ac
index 041eb59..9166e79 100644
--- a/activemq-cpp/configure.ac
+++ b/activemq-cpp/configure.ac
@@ -20,7 +20,7 @@
## --------------------------------
## Initialization macros.
## --------------------------------
-AC_INIT(activemq-cpp, 3.5.0, dev@activemq.apache.org)
+AC_INIT(activemq-cpp, 3.6.0, dev@activemq.apache.org)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@
## ------------------------------------------------------------
ACTIVEMQ_LIBRARY_NAME=activemq-cpp
ACTIVEMQ_MAJOR_VERSION=3
-ACTIVEMQ_MINOR_VERSION=5
+ACTIVEMQ_MINOR_VERSION=6
ACTIVEMQ_PATCH_VERSION=0
ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
@@ -39,7 +39,7 @@
## Define the Version variables for the CMS API Library
## ------------------------------------------------------------
CMSAPI_MAJOR_VERSION=3
-CMSAPI_MINOR_VERSION=0
+CMSAPI_MINOR_VERSION=1
CMSAPI_VERSION=${CMSAPI_MAJOR_VERSION}.${CMSAPI_MINOR_VERSION}
AC_SUBST(CMSAPI_MAJOR_VERSION)
@@ -75,7 +75,7 @@
## 3. Programs may need to be changed, recompiled, relinked in order to use the new version. Bump
## current, set revision and age to 0.
##
-ACTIVEMQ_LIBRARY_VERSION=15:0:0
+ACTIVEMQ_LIBRARY_VERSION=16:0:0
AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
AC_SUBST(ACTIVEMQ_VERSION)
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
index 029d185..5880cbc 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
@@ -31,7 +31,7 @@
////////////////////////////////////////////////////////////////////////////////
std::string ActiveMQConnectionMetaData::getCMSVersion() const {
- return "3.0";
+ return "3.1";
}
////////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////////////////////////////////
int ActiveMQConnectionMetaData::getCMSMinorVersion() const {
- return 0;
+ return 1;
}
////////////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@
////////////////////////////////////////////////////////////////////////////////
std::string ActiveMQConnectionMetaData::getProviderVersion() const {
- return "3.5.0";
+ return "3.6.0";
}
////////////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,12 @@
////////////////////////////////////////////////////////////////////////////////
int ActiveMQConnectionMetaData::getProviderMinorVersion() const {
- return 5;
+ return 6;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int ActiveMQConnectionMetaData::getProviderPatchVersion() const {
+ return 0;
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h
index 0d30ae4..7e61958 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.h
@@ -58,6 +58,8 @@
virtual int getProviderMinorVersion() const;
+ virtual int getProviderPatchVersion() const;
+
virtual std::vector<std::string> getCMSXPropertyNames() const;
};
diff --git a/activemq-cpp/src/main/cms/ConnectionMetaData.h b/activemq-cpp/src/main/cms/ConnectionMetaData.h
index 664c017..eb9e2ad 100644
--- a/activemq-cpp/src/main/cms/ConnectionMetaData.h
+++ b/activemq-cpp/src/main/cms/ConnectionMetaData.h
@@ -104,6 +104,16 @@
virtual int getProviderMinorVersion() const = 0;
/**
+ * Gets the CMS provider patch version number.
+ *
+ * @returns the CMS provider patch version number
+ *
+ * @throw CMSException
+ * If the CMS Provider fails to retrieve the metadata due to some internal error.
+ */
+ virtual int getProviderPatchVersion() const = 0;
+
+ /**
* Gets an Vector of the CMSX property names.
*
* @returns an Vector of CMSX property names
