From 1df38a48072c2135b2588924217b4bdff971a2f1 Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <Mark.S.Lewis@outlook.com>
Date: Fri, 20 Dec 2024 14:13:01 +0000
Subject: [PATCH] Update versions following v1.7.1 release

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
---
 .github/workflows/verify-versions.yml |  2 +-
 Makefile                              | 15 +++++++++------
 java/pom.xml                          |  2 +-
 node/package-lock.json                |  6 +++---
 node/package.json                     |  2 +-
 scenario/node/package-lock.json       |  4 ++--
 scripts/update-versions.sh            |  2 ++
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/verify-versions.yml b/.github/workflows/verify-versions.yml
index a5fbb66a2..3349a4744 100644
--- a/.github/workflows/verify-versions.yml
+++ b/.github/workflows/verify-versions.yml
@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 env:
-  GATEWAY_VERSION: 1.7.1
+  GATEWAY_VERSION: 1.7.2
 
 jobs:
   go:
diff --git a/Makefile b/Makefile
index 71781caea..6eb9b42ee 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,13 @@ build-node:
 		rm -f fabric-gateway-dev.tgz && \
 		mv $$(npm pack) fabric-gateway-dev.tgz
 
+.PHONY: build-scenario-node
+build-scenario-node: build-node
+	cd '$(scenario_dir)/node' && \
+		npm ci && \
+		npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz
+
+
 .PHONY: build-java
 build-java:
 	cd '$(java_dir)' && \
@@ -175,17 +182,13 @@ scenario-test-go-no-hsm: vendor-chaincode
 		go test -timeout 20m -tags pkcs11 -v --godog.tags='~@hsm' -args '$(scenario_dir)/features/'
 
 .PHONY: scenario-test-node
-scenario-test-node: vendor-chaincode build-node fabric-ca-client setup-softhsm
+scenario-test-node: vendor-chaincode build-scenario-node fabric-ca-client setup-softhsm
 	cd '$(scenario_dir)/node' && \
-		npm ci && \
-		npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
 		npm test
 
 .PHONY: scenario-test-node-no-hsm
-scenario-test-node-no-hsm: vendor-chaincode build-node fabric-ca-client
+scenario-test-node-no-hsm: vendor-chaincode build-scenario-node fabric-ca-client
 	cd '$(scenario_dir)/node' && \
-		npm ci && \
-		npm install @hyperledger/fabric-gateway@file:../../node/fabric-gateway-dev.tgz && \
 		npm run test:no-hsm
 
 .PHONY: scenario-test-java
diff --git a/java/pom.xml b/java/pom.xml
index a5361808c..9f735013a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.hyperledger.fabric</groupId>
     <artifactId>fabric-gateway</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>fabric-gateway</name>
diff --git a/node/package-lock.json b/node/package-lock.json
index 3103b72ce..3437fb798 100644
--- a/node/package-lock.json
+++ b/node/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@hyperledger/fabric-gateway",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@hyperledger/fabric-gateway",
-            "version": "1.7.1",
+            "version": "1.7.2",
             "license": "Apache-2.0",
             "dependencies": {
                 "@grpc/grpc-js": "^1.12.0",
@@ -30,7 +30,7 @@
                 "prettier": "^3.4.2",
                 "ts-jest": "^29.2.5",
                 "typedoc": "^0.27.5",
-                "typescript": "^5.7.2",
+                "typescript": "~5.7.2",
                 "typescript-eslint": "^8.18.1"
             },
             "engines": {
diff --git a/node/package.json b/node/package.json
index 7098473fe..e0836a851 100644
--- a/node/package.json
+++ b/node/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hyperledger/fabric-gateway",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "description": "Hyperledger Fabric Gateway client API for Node",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
diff --git a/scenario/node/package-lock.json b/scenario/node/package-lock.json
index 8f4f5bc57..bfe28b206 100644
--- a/scenario/node/package-lock.json
+++ b/scenario/node/package-lock.json
@@ -586,9 +586,9 @@
             }
         },
         "node_modules/@hyperledger/fabric-gateway": {
-            "version": "1.7.1",
+            "version": "1.7.2",
             "resolved": "file:../../node/fabric-gateway-dev.tgz",
-            "integrity": "sha512-NNd9YchCJx8u2/XIcDH8EEQeYOgje66JsNcjP/Q5GeIJVRUzlxFRn4I67Ro+Q9PUHihKE7+YPS5ydBrSgJSiMA==",
+            "integrity": "sha512-tR9fCo90OOgCMvNwl+3OK6ITVov8wmNACaXLaSnMkZYt8/2HFP8ktPjnYYdiBR/NNB/m6Y1yGa+Hrp+J5mD85Q==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@grpc/grpc-js": "^1.12.0",
diff --git a/scripts/update-versions.sh b/scripts/update-versions.sh
index 694238840..f2fbd0a33 100755
--- a/scripts/update-versions.sh
+++ b/scripts/update-versions.sh
@@ -7,6 +7,7 @@ PROJECT_DIR="$( cd "$( dirname -- "${BASH_SOURCE[0]}" )/.." > /dev/null && pwd )
 VERIFY_VERSIONS="${PROJECT_DIR}/.github/workflows/verify-versions.yml"
 JAVA_DIR="${PROJECT_DIR}/java"
 NODE_DIR="${PROJECT_DIR}/node"
+NODE_SCENARIO_DIR="${PROJECT_DIR}/scenario/node"
 
 if [ $# -eq 1 ]; then
     NEXT_VERSION="$1"
@@ -29,6 +30,7 @@ echo "Updating Java version to ${NEXT_JAVA_VERSION}"
 echo "Updating Node version to ${NEXT_VERSION}"
 ( cd "${NODE_DIR}" && \
     npm --allow-same-version --no-git-tag-version version "${NEXT_VERSION}" )
+make build-scenario-node
 
 echo "Updating verify-versions.yml to ${NEXT_VERSION}"
 NEXT_VERIFY_VERSIONS="$( sed -r "s/^([ \t]*GATEWAY_VERSION:[ \t]*)[0-9.]+/\1${NEXT_VERSION}/" "${VERIFY_VERSIONS}" )"