diff --git a/bin/configs/cpp-restbed-server.yaml b/bin/configs/cpp-restbed-server.yaml
new file mode 100644
index 00000000000..6dc3929ec08
--- /dev/null
+++ b/bin/configs/cpp-restbed-server.yaml
@@ -0,0 +1,4 @@
+generatorName: cpp-restbed-server
+outputDir: samples/server/petstore/cpp-restbed/generated/3_0
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server
diff --git a/bin/configs/unmaintained/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/unmaintained/cpp-restbed-server-cpp-restbed.yaml
deleted file mode 100644
index d7242c4b607..00000000000
--- a/bin/configs/unmaintained/cpp-restbed-server-cpp-restbed.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-generatorName: cpp-restbed-server
-outputDir: samples/server/petstore/cpp-restbed/generated/2_0
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server
diff --git a/docs/generators/cpp-restbed-server-deprecated.md b/docs/generators/cpp-restbed-server-deprecated.md
index c13d38b32ed..13f7b83d31f 100644
--- a/docs/generators/cpp-restbed-server-deprecated.md
+++ b/docs/generators/cpp-restbed-server-deprecated.md
@@ -29,10 +29,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Type/Alias | Imports |
 | ---------- | ------- |
-|file|#include <string>|
+|Object|#include "Object.h"|
 |restbed::Bytes|#include <corvusoft/restbed/byte.hpp>|
 |std::map|#include <map>|
-|std::set|#include <set>|
 |std::string|#include <string>|
 |std::vector|#include <vector>|
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
index 96c092c3fd4..93ade02496e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
@@ -76,7 +76,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
         apiTemplateFiles.put("api-header.mustache", ".h");
         apiTemplateFiles.put("api-source.mustache", ".cpp");
 
-        embeddedTemplateDir = templateDir = "cpp-restbed-server-deprecated";
+        embeddedTemplateDir = templateDir = "cpp-restbed-server";
 
         cliOptions.clear();
 
@@ -197,7 +197,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
      */
     @Override
     public String getName() {
-        return "cpp-restbed-server-deprecated";
+        return "cpp-restbed-server";
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source-HandlerBody.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source-HandlerBody.mustache
index 5a5e1faf67d..811d07845f2 100644
--- a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source-HandlerBody.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source-HandlerBody.mustache
@@ -58,11 +58,6 @@ boost::split({{{paramName}}}_temp, {{{paramName}}}_raw, boost::is_any_of(","));
 std::copy({{{paramName}}}_temp.begin(), {{{paramName}}}_temp.end(), std::inserter({{{paramName}}}, std::next({{{paramName}}}.begin())));
 {{/isString}}
 {{^isString}}
-        #if 0
-        /*
-    {{{.}}}
-        */
-        #endif
 std::transform({{{paramName}}}_temp.begin(), {{{paramName}}}_temp.end(), std::back_inserter({{{paramName}}}), [](const auto& i){ {{{dataType}}} ret; ret.fromString(i); return ret;});
 {{/isString}}
 {{/items}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
index b50cfb673e7..37275cd03e5 100644
--- a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache
@@ -154,10 +154,6 @@ void {{vendorExtensions.x-codegen-resource-name}}Resource::handler_{{httpMethod}
     {{>api-source-HandlerBody}}
     {{/lambda.indented}}
 
-    {{#hasBodyParam}}
-    });
-    {{/hasBodyParam}}
-    
 }
 
 {{#vendorExtensions.x-codegen-other-methods}}
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION
index 717311e32e3..66672d4e9d3 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/.openapi-generator/VERSION
@@ -1 +1 @@
-unset
\ No newline at end of file
+6.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp
index b63bd61b370..90947c2cb35 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h
index 7e028d5f3b5..140ce978ed4 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/AnotherFakeApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp
index d92b33de68e..0a6487b1326 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h
index eb0337bfff5..077569e646a 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/DefaultApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
index 9bcbe3844d7..a11b134e617 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -1429,13 +1429,6 @@ void FakeResource::handler_GET_internal(const std::shared_ptr<restbed::Session>
     std::vector<EnumClass> enumQueryModelArray;
     std::vector<std::string> enumQueryModelArray_temp;
     boost::split(enumQueryModelArray_temp, enumQueryModelArray_raw, boost::is_any_of(","));
-            #if 0
-            /*
-        CodegenProperty{openApiType='EnumClass', baseName='inner', complexType='EnumClass', getter='getInner', setter='setInner', description='null', dataType='EnumClass', datatypeWithEnum='EnumClass', dataFormat='null', name='Inner', min='null', max='null', defaultValue='EnumClass{}', defaultValueWithParam=' = data.inner;', baseType='EnumClass', containerType='null', title='null', unescapedDescription='null', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{
-      "$ref" : "#/components/schemas/EnumClass"
-    }', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues={values=[_abc, -efg, (xyz)]}, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='inner', nameInSnakeCase='INNER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false}
-            */
-            #endif
     std::transform(enumQueryModelArray_temp.begin(), enumQueryModelArray_temp.end(), std::back_inserter(enumQueryModelArray), [](const auto& i){ EnumClass ret; ret.fromString(i); return ret;});
     // Getting the headers
     std::string enumHeaderStringArray_raw = request->get_header("enumHeaderStringArray");
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
index 95ab43aa2dd..b31e0b30036 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp
index a1ca04919b3..4e6eca7bbaa 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h
index cc5928f2a26..43e60de8d37 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeClassnameTags123Api.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp
index 8bc1c5e932a..10158548ead 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h
index 992e41c46be..79a22384392 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/PetApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp
index fe26f20762d..448a93159a4 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h
index ac9bbb6d4d4..58c93a09ba1 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/StoreApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp
index 4d42febf704..ca3e67bf3c4 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h
index 29fcfc78079..8138e1f6679 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/UserApi.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp
index 7b0add347b0..ed3ce888a40 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h
index b333b9bffdb..6e23cb78fa1 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AdditionalPropertiesClass.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp
index e441165cc2f..4225f89bfc0 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h
index 55b282160b1..69a45c90e5b 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/AllOfWithSingleRef.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp
index bee00c01fd6..338afc72627 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h
index 41ebed4c93d..216bc71c4cc 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Animal.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp
index 7b3645a9bd5..5407ddf53de 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h
index 86decc18444..eb417e2618f 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ApiResponse.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp
index f0c64571fcf..1f01d6d6b43 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h
index b01febcef80..a9750bcd940 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfArrayOfNumberOnly.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp
index c09ddfaa0d6..8e0f67af047 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h
index 289fa184017..dafcac5c5d6 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayOfNumberOnly.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp
index 0ddab20c4ea..03696f33bba 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h
index 60a12616644..7cc90cc3975 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ArrayTest.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp
index 585792079d7..79faaef4f1f 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h
index b0f88a65603..31c8e753407 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Capitalization.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp
index 775e31910c1..5f77cbf5243 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h
index 67c5dda9136..e36baa3e186 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp
index 59fd8eda58c..660a64ef3a5 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h
index 0a1c8ddebb6..3e2a6fda74e 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Cat_allOf.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp
index bf2943a92bf..ca1f2fe0b55 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h
index bf1ed7f9b0d..3613f4714f2 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Category.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp
index 22a4b89b181..73af20a61f2 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h
index b93444d2d78..a46ca48cd8d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ClassModel.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp
index 40dd9e4aea2..e5097cd1c82 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h
index b4186414c3c..d94b9ad5934 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Client.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp
index 3e58ffa81c9..fc7c3c04b45 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h
index b6e91c43842..62afc62d5eb 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/DeprecatedObject.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp
index 425909a46fb..e3d2b553aa2 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h
index 2759a8342ed..c533ef16728 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp
index 1ff79d5dcf4..a069d978d63 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h
index b3d10b2eb6d..95752d630b0 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Dog_allOf.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp
index 260eadcf9f6..59b3a019e92 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h
index 05b476df455..252b79ee721 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumArrays.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp
index 4cc87a3391f..7243600bf36 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h
index 718a905890a..73c3115dafe 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/EnumClass.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp
index 280cb3c3af0..17d63469915 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h
index 092712065e6..f5cdda43131 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Enum_Test.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp
index af06dfec90b..f9fd0768bbc 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h
index e9e2938d086..0e2b038d63d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/File.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp
index e6eba4c5249..63ac66b1f50 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h
index f8584fb55dc..a3d287435ae 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/FileSchemaTestClass.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp
index ddeaebd6f89..6c395f078bd 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h
index 004ba8c27e5..c1ef029566d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Foo.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp
index 4701ba408ba..935befcd44c 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h
index 1db28a3af5c..9312443492d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Format_test.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp
index 9e02f55f431..b1cb66d5b9b 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h
index 16f64910937..99ea6a32646 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HasOnlyReadOnly.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp
index 16ca7e8f962..60cb89f9942 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h
index 4314b5cdcde..cdc0937ab9a 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/HealthCheckResult.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp
index 79224a61b5c..5efc352a986 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h
index df9a0b764c6..6239d247472 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/List.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp
index 00488de0d8b..afb720207d6 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h
index 0c94e561659..02c80d70b2a 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MapTest.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp
index 9c442804615..7096af7b3e1 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h
index 1c6fdbf3774..68d2f132503 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/MixedPropertiesAndAdditionalPropertiesClass.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp
index c9fcd6795da..5221f6972da 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h
index 69f04cd79f1..ac9dfe9ea60 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Name.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp
index ec1f0b8fb95..4655b41ba93 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h
index 9babc72b38e..6e088d4303f 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NullableClass.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp
index d5681a55b81..3f648bd1a68 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h
index 19fe2c72c17..174c5d1ff89 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/NumberOnly.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp
index aab1b5b7612..9464abd0908 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h
index 2a262b46fee..60658d3a10d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ObjectWithDeprecatedFields.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
index 963b7d4b0db..f5395373f0d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
index c1e9c1902d1..5c49f3d8207 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp
index 5cdb9bbfb65..016a4468f38 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h
index f2f74cb335f..febc02b1f20 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterComposite.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp
index 736b9ee19ad..244167cd633 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h
index 0af9b81b99d..543208f4cff 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnum.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp
index 8d9315737e8..9312081d7a4 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h
index 08861af9ca4..0e52ce5ae82 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumDefaultValue.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp
index c56782e5351..39335678562 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h
index cb0a77c18bf..87a6b52df05 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumInteger.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp
index dfcef0d19f9..09a0122af6d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h
index 98597d5229e..e2dc7b67692 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterEnumIntegerDefaultValue.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp
index f3c4bd4098e..a2f1a093434 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h
index 79a3a6b7274..5d3f27b1edd 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/OuterObjectWithEnumProperty.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp
index 1f7a01feeb0..c6b8c9c40c3 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h
index 2fc33d0c1ac..8be048ed763 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Pet.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp
index d17debded35..097b6ac44c3 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h
index 1b416dadc60..ee26ac05ed2 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/ReadOnlyFirst.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp
index 6332ef30fc7..b960a80f5cf 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h
index e57ee29a4f8..8b0988fc632 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Return.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp
index bfe5abd1cdb..c889f284e77 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h
index 8162686fc02..408828c334b 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/SingleRefType.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp
index 44ab7a2c97f..6e14bb1ddc1 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h
index e6ba3ee96c1..586a8f6d29e 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Tag.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp
index 666999644e7..da67b794a69 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h
index 214640aae14..328096bcbf8 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/User.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp
index 1ad8bb0a0a1..b3d36fe2f3f 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h
index 9c5416bd8f2..ab2e4f56d89 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_foo_get_default_response.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp
index 3f3ca3e8cd1..9a006974ed7 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h
index 4333323a4c2..e7ce76a981b 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/_special_model_name_.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h
index 4201555c639..52396d0c4ac 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/helpers.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp
index a5b3309bb21..37197a1591b 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.cpp
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h
index 6108e2edf37..6044c28046d 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/r_200_response.h
@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator unset.
+ * NOTE: This class is auto generated by OpenAPI-Generator 6.1.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */