From 9048ca5b245a076e53342cff2740ee35d0ac531c Mon Sep 17 00:00:00 2001
From: "Shah, Kevin" <Kevin_Shah@comcast.com>
Date: Wed, 4 Sep 2024 13:14:05 -0400
Subject: [PATCH] fix: Merge latest main to next

---
 CHANGELOG.md      | 13 +++++++++++--
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14d8a8a3..497397a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,19 @@
-## [3.1.1-next.5](https://github.com/rdkcentral/firebolt-openrpc/compare/v3.1.1-next.4...v3.1.1-next.5) (2024-09-04)
-
+## [3.1.2-next.1](https://github.com/rdkcentral/firebolt-openrpc/compare/v3.1.1-next.4...v3.1.1-next.5) (2024-09-04)
 
 ### Bug Fixes
 
 * Void provider methods have JSONRPC errors ([#212](https://github.com/rdkcentral/firebolt-openrpc/issues/212)) ([d984304](https://github.com/rdkcentral/firebolt-openrpc/commit/d9843044cc1da2656edd70c01cc57ebcee3dedfb))
 
+## [3.1.1](https://github.com/rdkcentral/firebolt-openrpc/compare/v3.1.0...v3.1.1) (2024-08-30)
+
+
+### Bug Fixes
+* Add provider-selection tag to validation schema ([756e88a](https://github.com/rdkcentral/firebolt-openrpc/commit/756e88a92782c8d65ec481182c31c8edb218c9d6))
+* CPP Enum/AnyOf ([#210](https://github.com/rdkcentral/firebolt-openrpc/issues/210)) ([eb768fb](https://github.com/rdkcentral/firebolt-openrpc/commit/eb768fb5f0d8ce4c123daab428bd53ca7225333c))
+* Quote unsafe property names in languages that support it ([647043d](https://github.com/rdkcentral/firebolt-openrpc/commit/647043d59ea0399b725d32e4a2e48ee017965288))
+* Return empty config, not null ([f02aadc](https://github.com/rdkcentral/firebolt-openrpc/commit/f02aadcb57f3936f1dcebfe570e418c1d04f626d))
+* Update getSuffix to properly work in pipeline ([#209](https://github.com/rdkcentral/firebolt-openrpc/issues/209)) ([16b4e6e](https://github.com/rdkcentral/firebolt-openrpc/commit/16b4e6eb5a8739a7715eb975104d7bb33053b28c))
+
 ## [3.1.1-next.4](https://github.com/rdkcentral/firebolt-openrpc/compare/v3.1.1-next.3...v3.1.1-next.4) (2024-08-30)
 
 
diff --git a/package-lock.json b/package-lock.json
index a6cc8091..d0e77337 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@firebolt-js/openrpc",
-  "version": "3.1.1-next.5",
+  "version": "3.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@firebolt-js/openrpc",
-      "version": "3.1.1-next.5",
+      "version": "3.1.1",
       "license": "Apache-2.0",
       "dependencies": {
         "ajv": "^8.12.0",
diff --git a/package.json b/package.json
index 14dc939c..d205fbac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@firebolt-js/openrpc",
-  "version": "3.1.1-next.5",
+  "version": "3.1.1",
   "description": "The Firebolt SDK Code & Doc Generator",
   "main": "languages/javascript/src/sdk.mjs",
   "type": "module",