diff --git a/.releaserc b/.releaserc index 80e12f9ea..7fe28fe58 100644 --- a/.releaserc +++ b/.releaserc @@ -53,16 +53,6 @@ { "assets": "./*.tgz" } - ], - [ - "@saithodev/semantic-release-backmerge", - { - "backmergeStrategy": "merge", - "mergeMode": "theirs", - "backmergeBranches": [ - { "from": "main", "to": "next" } - ] - } ] ] } diff --git a/package-lock.json b/package-lock.json index f224a65b5..89861587d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "@firebolt-js/openrpc": "3.1.1", + "@firebolt-js/openrpc": "3.1.3", "@firebolt-js/schemas": "2.0.0", "@saithodev/semantic-release-backmerge": "^3.2.0", "@semantic-release/changelog": "^6.0.1", @@ -1075,10 +1075,11 @@ "link": true }, "node_modules/@firebolt-js/openrpc": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@firebolt-js/openrpc/-/openrpc-3.1.1.tgz", - "integrity": "sha512-+ypWAo02Q/eYc3PQ0pHii/37u2Q9fIdeGyT8o9ghLO1rIYgB5q7N2rTE0hYEKgbOTAq6GdyFLV/TZ4Vj8D2jCA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@firebolt-js/openrpc/-/openrpc-3.1.3.tgz", + "integrity": "sha512-YHNdAS0yuuB6rLJJmEXud8WBaYaKjj7CQ03lT2EHJBtdbbKNTqGjtEq/ducTNAM4UsPqxOxVprlibcj1ucEiTg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "ajv": "^8.12.0", "ajv-formats": "^2.1.1", @@ -16962,7 +16963,7 @@ }, "src/sdks/core": { "name": "@firebolt-js/sdk", - "version": "1.4.0-next.11", + "version": "1.4.0", "license": "Apache-2.0", "devDependencies": { "jest": "^28.1.0", @@ -16973,7 +16974,7 @@ }, "src/sdks/discovery": { "name": "@firebolt-js/discovery-sdk", - "version": "1.4.0-next.11", + "version": "1.4.0", "license": "Apache-2.0", "devDependencies": { "jest": "^28.1.0", @@ -16984,7 +16985,7 @@ }, "src/sdks/manage": { "name": "@firebolt-js/manage-sdk", - "version": "1.4.0-next.11", + "version": "1.4.0", "license": "Apache-2.0", "devDependencies": { "jest": "^28.1.0", diff --git a/package.json b/package.json index c1e75befc..4544d6482 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "@firebolt-js/openrpc": "3.1.1", + "@firebolt-js/openrpc": "3.1.3", "@firebolt-js/schemas": "2.0.0", "@saithodev/semantic-release-backmerge": "^3.2.0", "@semantic-release/changelog": "^6.0.1",