diff --git a/activemq-cpp/pom.xml b/activemq-cpp/pom.xml
index cd7ab75..408deb9 100644
--- a/activemq-cpp/pom.xml
+++ b/activemq-cpp/pom.xml
@@ -189,7 +189,7 @@
                   <tasks>
                     <echo>Running OpenWire Generator</echo>
                     <taskdef name="generate" classname="org.apache.activemq.openwire.tool.AmqCppGeneratorTask" classpathref="maven.compile.classpath" />
-                    <generate maxVersion="10" source="${activemq-client-dir}" target="${basedir}" />
+                    <generate maxVersion="11" source="${activemq-client-dir}" target="${basedir}" />
                   </tasks>
                 </configuration>
                 <goals>
diff --git a/activemq-cpp/src/main/activemq/commands/MessageId.cpp b/activemq-cpp/src/main/activemq/commands/MessageId.cpp
index a021901..c674c01 100644
--- a/activemq-cpp/src/main/activemq/commands/MessageId.cpp
+++ b/activemq-cpp/src/main/activemq/commands/MessageId.cpp
@@ -141,7 +141,7 @@
                 key = "ID:" + textView;
             }
         } else {
-            this->key = this->producerId->toString() + ":" +
+            this->key = this->producerId->toString() + ":" + 
                         Long::toString(this->producerSequenceId);
         }
     }
diff --git a/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp b/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp
index d0f9aa1..04cba69 100644
--- a/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp
+++ b/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp
@@ -39,7 +39,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 SubscriptionInfo::SubscriptionInfo() :
-    BaseDataStructure(), clientId(""), destination(NULL), selector(""), subcriptionName(""), subscribedDestination(NULL) {
+    BaseDataStructure(), clientId(""), destination(NULL), selector(""), subcriptionName(""), subscribedDestination(NULL), noLocal(false) {
 
 }
 
@@ -81,6 +81,7 @@
     this->setSelector(srcPtr->getSelector());
     this->setSubcriptionName(srcPtr->getSubcriptionName());
     this->setSubscribedDestination(srcPtr->getSubscribedDestination());
+    this->setNoLocal(srcPtr->isNoLocal());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,6 +114,8 @@
     } else {
         stream << "NULL";
     }
+    stream << ", ";
+    stream << "NoLocal = " << this->isNoLocal();
     stream << " }";
 
     return stream.str();
@@ -154,6 +157,9 @@
     } else if (valuePtr->getSubscribedDestination() != NULL) {
         return false;
     }
+    if (this->isNoLocal() != valuePtr->isNoLocal()) {
+        return false;
+    }
     if (!BaseDataStructure::equals(value)) {
         return false;
     }
@@ -235,3 +241,13 @@
     this->subscribedDestination = subscribedDestination;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool SubscriptionInfo::isNoLocal() const {
+    return noLocal;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SubscriptionInfo::setNoLocal(bool noLocal) {
+    this->noLocal = noLocal;
+}
+
diff --git a/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h b/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h
index 3b01d9f..65ac8f4 100644
--- a/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h
+++ b/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h
@@ -52,6 +52,7 @@
         std::string selector;
         std::string subcriptionName;
         Pointer<ActiveMQDestination> subscribedDestination;
+        bool noLocal;
 
     public:
 
@@ -98,6 +99,9 @@
         virtual Pointer<ActiveMQDestination>& getSubscribedDestination();
         virtual void setSubscribedDestination( const Pointer<ActiveMQDestination>& subscribedDestination );
 
+        virtual bool isNoLocal() const;
+        virtual void setNoLocal( bool noLocal );
+
     };
 
 }}
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
index 2cb4287..7ac8551 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormat.cpp
@@ -50,7 +50,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 const unsigned char OpenWireFormat::NULL_TYPE = 0;
 const int OpenWireFormat::DEFAULT_VERSION = 1;
-const int OpenWireFormat::MAX_SUPPORTED_VERSION = 10;
+const int OpenWireFormat::MAX_SUPPORTED_VERSION = 11;
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireFormat::OpenWireFormat(const decaf::util::Properties& properties) :
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
index ca71dda..1faea34 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/OpenWireFormatFactory.cpp
@@ -42,7 +42,7 @@
         Pointer<WireFormatInfo> info(new WireFormatInfo());
 
         // Configure the version to use
-        info->setVersion(Integer::parseInt(properties.getProperty("wireFormat.version", "10")));
+        info->setVersion(Integer::parseInt(properties.getProperty("wireFormat.version", "11")));
 
         // parse params out of the properties
         info->setStackTraceEnabled(
diff --git a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp
index e9e473b..2a45f5d 100644
--- a/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp
+++ b/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp
@@ -71,6 +71,9 @@
             info->setSubscribedDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination* >(
                 tightUnmarshalNestedObject(wireFormat, dataIn, bs))));
         }
+        if (wireVersion >= 11) {
+            info->setNoLocal(bs->readBoolean());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -96,6 +99,9 @@
         if (wireVersion >= 3) {
             rc += tightMarshalNestedObject1(wireFormat, info->getSubscribedDestination().get(), bs);
         }
+        if (wireVersion >= 11) {
+            bs->writeBoolean(info->isNoLocal());
+        }
 
         return rc + 0;
     }
@@ -123,6 +129,9 @@
         if (wireVersion >= 3) {
             tightMarshalNestedObject2(wireFormat, info->getSubscribedDestination().get(), dataOut, bs);
         }
+        if (wireVersion >= 11) {
+            bs->readBoolean();
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException)
@@ -149,6 +158,9 @@
             info->setSubscribedDestination(Pointer<ActiveMQDestination>(dynamic_cast<ActiveMQDestination*>(
                 looseUnmarshalNestedObject(wireFormat, dataIn))));
         }
+        if (wireVersion >= 11) {
+            info->setNoLocal(dataIn->readBoolean());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
@@ -173,6 +185,9 @@
         if (wireVersion >= 3) {
             looseMarshalNestedObject(wireFormat, info->getSubscribedDestination().get(), dataOut);
         }
+        if (wireVersion >= 11) {
+            dataOut->writeBoolean(info->isNoLocal());
+        }
     }
     AMQ_CATCH_RETHROW(decaf::io::IOException)
     AMQ_CATCH_EXCEPTION_CONVERT(exceptions::ActiveMQException, decaf::io::IOException)
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
index 4619fee..e3dd631 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQBlobMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQBlobMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
index ebe7872..e903866 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQBytesMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQBytesMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
index e88dbe7..5d68764 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQMapMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQMapMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
index 257990c..402cb9d 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
index 3809754..928178d 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQObjectMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQObjectMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
index 5d2511c..6d0eb87 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQQueue outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQQueue outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
index 37eb26e..8f151ae 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQStreamMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQStreamMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
index a66900f..ee84751 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTempQueue outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTempQueue outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
index 7abae8f..b4ecef6 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTempTopic outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTempTopic outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
index 4974589..8fccf09 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTextMessage outCommand;
@@ -125,7 +125,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTextMessage outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
index 6b41342..314602f 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ActiveMQTopic outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ActiveMQTopic outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
index 7bf69d2..d3848f3 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     BrokerId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     BrokerId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
index 91a1ce3..2157e90 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     BrokerInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     BrokerInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
index 81600e5..a953376 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionControl outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionControl outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
index ed6a26e..2698da4 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionError outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionError outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
index 9ae3e78..ec49dcb 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
index 36d2cbc..af675d8 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConnectionInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConnectionInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshallerTest.cpp
index 16b3d09..ffe76e8 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConsumerControl outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConsumerControl outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshallerTest.cpp
index 6de1908..5c6a31b 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConsumerId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConsumerId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshallerTest.cpp
index 2796d8e..44fed19 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ConsumerInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ConsumerInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshallerTest.cpp
index 0d99be5..1358d13 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ControlCommand outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ControlCommand outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshallerTest.cpp
index cbca9bd..1c8774c 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     DataArrayResponse outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     DataArrayResponse outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataResponseMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataResponseMarshallerTest.cpp
index c7c9e77..ccdce44 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataResponseMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DataResponseMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     DataResponse outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     DataResponse outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshallerTest.cpp
index 7adb047..c053533 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     DestinationInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     DestinationInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshallerTest.cpp
index c45c789..6e55b49 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     DiscoveryEvent outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     DiscoveryEvent outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshallerTest.cpp
index 81cb656..ed5ed54 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ExceptionResponse outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ExceptionResponse outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshallerTest.cpp
index e021988..03bee79 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     FlushCommand outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     FlushCommand outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshallerTest.cpp
index 181d602..0a2cf28 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     IntegerResponse outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     IntegerResponse outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshallerTest.cpp
index 8658f46..1bc0ace 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     JournalQueueAck outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     JournalQueueAck outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshallerTest.cpp
index f9c1c42..87c6abf 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     JournalTopicAck outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     JournalTopicAck outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshallerTest.cpp
index 5ec4cf9..67d0c79 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     JournalTrace outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     JournalTrace outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshallerTest.cpp
index 609b672..a5e98e0 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     JournalTransaction outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     JournalTransaction outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshallerTest.cpp
index bbc55cb..399142b 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     KeepAliveInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     KeepAliveInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshallerTest.cpp
index 53d2cd5..32507de 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     LastPartialCommand outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     LastPartialCommand outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshallerTest.cpp
index 247f2ec..1de4cec 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     LocalTransactionId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     LocalTransactionId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageAckMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageAckMarshallerTest.cpp
index 6aaa28d..f6b79ec 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageAckMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageAckMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     MessageAck outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     MessageAck outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshallerTest.cpp
index 874f155..05fdf7f 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     MessageDispatch outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     MessageDispatch outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshallerTest.cpp
index 2800d04..fd7626a 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     MessageDispatchNotification outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     MessageDispatchNotification outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageIdMarshallerTest.cpp
index bd01c5c..49a5654 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessageIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     MessageId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     MessageId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessagePullMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessagePullMarshallerTest.cpp
index a8a26f4..e3427f2 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessagePullMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/MessagePullMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     MessagePull outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     MessagePull outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshallerTest.cpp
index aed98e5..baff535 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     NetworkBridgeFilter outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     NetworkBridgeFilter outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshallerTest.cpp
index 7c4ef49..64cadd0 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     PartialCommand outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     PartialCommand outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshallerTest.cpp
index e5b96b9..55579e6 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ProducerAck outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ProducerAck outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshallerTest.cpp
index 474f0ba..d409e68 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ProducerId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ProducerId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshallerTest.cpp
index e62d800..6941505 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ProducerInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ProducerInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshallerTest.cpp
index 25f246f..31cd57c 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     RemoveInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     RemoveInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshallerTest.cpp
index 9d101a1..8ad0ddb 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     RemoveSubscriptionInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     RemoveSubscriptionInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshallerTest.cpp
index 265e77c..506a7b3 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ReplayCommand outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ReplayCommand outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ResponseMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ResponseMarshallerTest.cpp
index 17d337b..796a272 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ResponseMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ResponseMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     Response outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     Response outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionIdMarshallerTest.cpp
index 476bd91..756caf6 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     SessionId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     SessionId outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshallerTest.cpp
index a48c0da..247dbf2 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     SessionInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     SessionInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshallerTest.cpp
index 5eddac9..878265a 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     ShutdownInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     ShutdownInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshallerTest.cpp
index 2a86ec7..f0e11e3 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     SubscriptionInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     SubscriptionInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshallerTest.cpp
index 1048b0a..e919c1d 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     TransactionInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     TransactionInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshallerTest.cpp
index ed4c9ef..8903d18 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     WireFormatInfo outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     WireFormatInfo outCommand;
diff --git a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshallerTest.cpp b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshallerTest.cpp
index 2c9b8d9..52f5f6a 100644
--- a/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshallerTest.cpp
+++ b/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshallerTest.cpp
@@ -73,7 +73,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( false );
 
     XATransactionId outCommand;
@@ -113,7 +113,7 @@
     OpenWireFormat openWireFormat( props );
 
     // Configure for this test.
-    openWireFormat.setVersion( 10 );
+    openWireFormat.setVersion( 11 );
     openWireFormat.setTightEncodingEnabled( true );
 
     XATransactionId outCommand;