From c89e34aaeb003997a43d72fca43d2f8d02c06971 Mon Sep 17 00:00:00 2001
From: andrew-coleman <andrew_coleman@uk.ibm.com>
Date: Fri, 30 Nov 2018 14:43:07 +0000
Subject: [PATCH] FABN-1040 add missing fabric client dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add fabric-client and fabric-ca-client dependencies
to fabric-network’s package.json

Change-Id: I5492362a123a5f7f43feeac1a17c57155bac9637
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
---
 fabric-network/package.json                    | 2 ++
 scripts/Jenkins_Scripts/Publish_NPM_Modules.sh | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fabric-network/package.json b/fabric-network/package.json
index 7a0a9b00d1..a0f50ec8ee 100644
--- a/fabric-network/package.json
+++ b/fabric-network/package.json
@@ -22,6 +22,8 @@
   },
   "types": "./types/index.d.ts",
   "dependencies": {
+    "fabric-client": "file:../fabric-client",
+    "fabric-ca-client": "file:../fabric-ca-client",
     "nano": "^6.4.4",
     "rimraf": "^2.6.2",
     "uuid": "^3.2.1"
diff --git a/scripts/Jenkins_Scripts/Publish_NPM_Modules.sh b/scripts/Jenkins_Scripts/Publish_NPM_Modules.sh
index 668bcb4aeb..19d7a71199 100755
--- a/scripts/Jenkins_Scripts/Publish_NPM_Modules.sh
+++ b/scripts/Jenkins_Scripts/Publish_NPM_Modules.sh
@@ -34,6 +34,10 @@ npmPublish() {
       export UNSTABLE_INCREMENT_VERSION=$RELEASE_VERSION.$UNSTABLE_INCREMENT
       echo "======> UNSTABLE_INCREMENT_VERSION:" $UNSTABLE_INCREMENT_VERSION
 
+      if [ "$1" = "fabric-network" ]; then
+          sed -i 's/\(.*\"fabric-client\"\: \"\)\(.*\)/\1'$CURRENT_TAG\"\,'/' package.json
+          sed -i 's/\(.*\"fabric-ca-client\"\: \"\)\(.*\)/\1'$CURRENT_TAG\"\,'/' package.json
+      fi
 
       # Replace existing version with $UNSTABLE_INCREMENT_VERSION
       sed -i 's/\(.*\"version\"\: \"\)\(.*\)/\1'$UNSTABLE_INCREMENT_VERSION\"\,'/' package.json
@@ -78,7 +82,7 @@ cd $WORKSPACE/gopath/src/github.com/hyperledger/fabric-sdk-node
 # Set NPM_TOKEN from CI configuration
 npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN
 
-# Add or delete modules from here.. 
+# Add or delete modules from here..
 for modules in fabric-network fabric-common fabric-ca-client fabric-client; do
      if [ -d "$modules" ]; then
            echo -e "\033[32m Publishing $modules" "\033[0m"