diff --git a/modules/swagger-codegen/src/main/resources/cpprest/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/cpprest/licenseInfo.mustache
index bbd8742e52a..2931118038b 100644
--- a/modules/swagger-codegen/src/main/resources/cpprest/licenseInfo.mustache
+++ b/modules/swagger-codegen/src/main/resources/cpprest/licenseInfo.mustache
@@ -5,7 +5,7 @@
  * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
  * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator {{{generatorVersion}}}.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpprest/ApiClient.cpp
index 69de9e34f95..365e56c7860 100644
--- a/samples/client/petstore/cpprest/ApiClient.cpp
+++ b/samples/client/petstore/cpprest/ApiClient.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiClient.h b/samples/client/petstore/cpprest/ApiClient.h
index 1f38c864f0e..f6ad8e2d76e 100644
--- a/samples/client/petstore/cpprest/ApiClient.h
+++ b/samples/client/petstore/cpprest/ApiClient.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiConfiguration.cpp b/samples/client/petstore/cpprest/ApiConfiguration.cpp
index 1520a56d347..5e49ae49aac 100644
--- a/samples/client/petstore/cpprest/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpprest/ApiConfiguration.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiConfiguration.h b/samples/client/petstore/cpprest/ApiConfiguration.h
index 0574783f690..76d485a7224 100644
--- a/samples/client/petstore/cpprest/ApiConfiguration.h
+++ b/samples/client/petstore/cpprest/ApiConfiguration.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiException.cpp b/samples/client/petstore/cpprest/ApiException.cpp
index 5ddf808f9f0..f679ef8f3f7 100644
--- a/samples/client/petstore/cpprest/ApiException.cpp
+++ b/samples/client/petstore/cpprest/ApiException.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ApiException.h b/samples/client/petstore/cpprest/ApiException.h
index 835752ea75b..ba75120a06b 100644
--- a/samples/client/petstore/cpprest/ApiException.h
+++ b/samples/client/petstore/cpprest/ApiException.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/HttpContent.cpp b/samples/client/petstore/cpprest/HttpContent.cpp
index e9a619d7753..df37e526df8 100644
--- a/samples/client/petstore/cpprest/HttpContent.cpp
+++ b/samples/client/petstore/cpprest/HttpContent.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/HttpContent.h b/samples/client/petstore/cpprest/HttpContent.h
index 6b7bae0a5f7..b2ccea73103 100644
--- a/samples/client/petstore/cpprest/HttpContent.h
+++ b/samples/client/petstore/cpprest/HttpContent.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/IHttpBody.h b/samples/client/petstore/cpprest/IHttpBody.h
index 0ccf80876e9..fede57e11a6 100644
--- a/samples/client/petstore/cpprest/IHttpBody.h
+++ b/samples/client/petstore/cpprest/IHttpBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/JsonBody.cpp b/samples/client/petstore/cpprest/JsonBody.cpp
index 41ce32702c3..67ea71af047 100644
--- a/samples/client/petstore/cpprest/JsonBody.cpp
+++ b/samples/client/petstore/cpprest/JsonBody.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/JsonBody.h b/samples/client/petstore/cpprest/JsonBody.h
index 335be0a72b6..b75a69699ad 100644
--- a/samples/client/petstore/cpprest/JsonBody.h
+++ b/samples/client/petstore/cpprest/JsonBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ModelBase.cpp b/samples/client/petstore/cpprest/ModelBase.cpp
index a311d7d1707..bb53546f26e 100644
--- a/samples/client/petstore/cpprest/ModelBase.cpp
+++ b/samples/client/petstore/cpprest/ModelBase.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/ModelBase.h b/samples/client/petstore/cpprest/ModelBase.h
index 558d403b15d..b2f190c87c3 100644
--- a/samples/client/petstore/cpprest/ModelBase.h
+++ b/samples/client/petstore/cpprest/ModelBase.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/MultipartFormData.cpp b/samples/client/petstore/cpprest/MultipartFormData.cpp
index a7e5f56c9f9..76078484f6a 100644
--- a/samples/client/petstore/cpprest/MultipartFormData.cpp
+++ b/samples/client/petstore/cpprest/MultipartFormData.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/MultipartFormData.h b/samples/client/petstore/cpprest/MultipartFormData.h
index 63b84dcb3a9..e7af513fa4b 100644
--- a/samples/client/petstore/cpprest/MultipartFormData.h
+++ b/samples/client/petstore/cpprest/MultipartFormData.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/PetApi.cpp b/samples/client/petstore/cpprest/api/PetApi.cpp
index a5e3d57c70b..1b655e62250 100644
--- a/samples/client/petstore/cpprest/api/PetApi.cpp
+++ b/samples/client/petstore/cpprest/api/PetApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/PetApi.h b/samples/client/petstore/cpprest/api/PetApi.h
index d60c3c80fca..617a05f40ee 100644
--- a/samples/client/petstore/cpprest/api/PetApi.h
+++ b/samples/client/petstore/cpprest/api/PetApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/StoreApi.cpp b/samples/client/petstore/cpprest/api/StoreApi.cpp
index d418af4fa4c..286755e9da4 100644
--- a/samples/client/petstore/cpprest/api/StoreApi.cpp
+++ b/samples/client/petstore/cpprest/api/StoreApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/StoreApi.h b/samples/client/petstore/cpprest/api/StoreApi.h
index 60ec088b326..e43ab4c4e77 100644
--- a/samples/client/petstore/cpprest/api/StoreApi.h
+++ b/samples/client/petstore/cpprest/api/StoreApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/UserApi.cpp b/samples/client/petstore/cpprest/api/UserApi.cpp
index 3e0318000f9..504df50ff3f 100644
--- a/samples/client/petstore/cpprest/api/UserApi.cpp
+++ b/samples/client/petstore/cpprest/api/UserApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/api/UserApi.h b/samples/client/petstore/cpprest/api/UserApi.h
index e94de1a1241..09415c0f2e5 100644
--- a/samples/client/petstore/cpprest/api/UserApi.h
+++ b/samples/client/petstore/cpprest/api/UserApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/ApiResponse.cpp b/samples/client/petstore/cpprest/model/ApiResponse.cpp
index d2f4238deeb..cb66ff06996 100644
--- a/samples/client/petstore/cpprest/model/ApiResponse.cpp
+++ b/samples/client/petstore/cpprest/model/ApiResponse.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/ApiResponse.h b/samples/client/petstore/cpprest/model/ApiResponse.h
index ec0a3a1b012..b9e339aaf68 100644
--- a/samples/client/petstore/cpprest/model/ApiResponse.h
+++ b/samples/client/petstore/cpprest/model/ApiResponse.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Category.cpp b/samples/client/petstore/cpprest/model/Category.cpp
index 24bdc66c132..8701f5122d3 100644
--- a/samples/client/petstore/cpprest/model/Category.cpp
+++ b/samples/client/petstore/cpprest/model/Category.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Category.h b/samples/client/petstore/cpprest/model/Category.h
index 860918c0822..8fe6e5452b3 100644
--- a/samples/client/petstore/cpprest/model/Category.h
+++ b/samples/client/petstore/cpprest/model/Category.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Order.cpp b/samples/client/petstore/cpprest/model/Order.cpp
index 24f3b7e46cc..73a89f510dd 100644
--- a/samples/client/petstore/cpprest/model/Order.cpp
+++ b/samples/client/petstore/cpprest/model/Order.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Order.h b/samples/client/petstore/cpprest/model/Order.h
index da065593b84..15d6cd200f1 100644
--- a/samples/client/petstore/cpprest/model/Order.h
+++ b/samples/client/petstore/cpprest/model/Order.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Pet.cpp b/samples/client/petstore/cpprest/model/Pet.cpp
index a89406497f6..2558475b349 100644
--- a/samples/client/petstore/cpprest/model/Pet.cpp
+++ b/samples/client/petstore/cpprest/model/Pet.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Pet.h b/samples/client/petstore/cpprest/model/Pet.h
index 61ae8b92f17..cfd594e78f0 100644
--- a/samples/client/petstore/cpprest/model/Pet.h
+++ b/samples/client/petstore/cpprest/model/Pet.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Tag.cpp b/samples/client/petstore/cpprest/model/Tag.cpp
index 050bcc2d488..e7b3400e8b5 100644
--- a/samples/client/petstore/cpprest/model/Tag.cpp
+++ b/samples/client/petstore/cpprest/model/Tag.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/Tag.h b/samples/client/petstore/cpprest/model/Tag.h
index 30159052950..eda00393e95 100644
--- a/samples/client/petstore/cpprest/model/Tag.h
+++ b/samples/client/petstore/cpprest/model/Tag.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/User.cpp b/samples/client/petstore/cpprest/model/User.cpp
index 9ec72d1ac98..2faaf5b7ce5 100644
--- a/samples/client/petstore/cpprest/model/User.cpp
+++ b/samples/client/petstore/cpprest/model/User.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpprest/model/User.h b/samples/client/petstore/cpprest/model/User.h
index 3ecd51ce96d..30fa8e74f14 100644
--- a/samples/client/petstore/cpprest/model/User.h
+++ b/samples/client/petstore/cpprest/model/User.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator program.
+ * NOTE: This class is auto generated by the swagger code generator 2.2.3-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */