FABN-1067 NodeSDK prepare for 1.4.0

Prepare the branch release-1.4 for the release 1.4.0.

Change-Id: I2b67085fd22e3231adbd38aee0b515ccf65c5aa3
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>

Jenkinsfile.x

@@ -8,11 +8,7 @@ node ('hyp-x') { // trigger build on x86_64 node
     try {
      def ROOTDIR = pwd() // workspace dir (/w/workspace/<job_name>)
      def nodeHome = tool 'nodejs-8.11.3'
-     env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim()
-     env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile
      env.ARCH = "amd64"
-     env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus
-     env.PROJECT_VERSION = "${VERSION}-stable"
      env.PROJECT_DIR = "gopath/src/github.com/hyperledger"
      env.GOPATH = "$WORKSPACE/gopath"
      env.PATH = "$GOPATH/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:${nodeHome}/bin:$PATH"
@@ -68,22 +64,6 @@ node ('hyp-x') { // trigger build on x86_64 node
           }
          }
 
-// Pull fabric,fabric-ca and Javaenv
-      stage("Pull Docker Images") {
-         wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
-           try {
-                 dir("${ROOTDIR}/$PROJECT_DIR/fabric-sdk-node/scripts/Jenkins_Scripts") {
-                 sh './CI_Script.sh --pull_Docker_Images'
-                 }
-               }
-           catch (err) {
-                 failure_stage = "Pull docker images"
-                 currentBuild.result = 'FAILURE'
-                 throw err
-           }
-         }
-      }
-
 // Run gulp tests (headless and integration tests)
       stage("Headless & Integration Tests") {
          wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {

Jenkinsfile.z

@@ -10,7 +10,7 @@ node('hyp-z') {
      def ROOTDIR = pwd() // workspace dir (/w/workspace/<job_name>
      env.NODE_VER = "8.11.3"
      // Fetch the BASE_VERSION from fabric master branch to pull images from nexus
-     env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim()
+     env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/release-1.4/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim()
      env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile
      env.ARCH = "s390x" // `uname -m`
      env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus3

fabric-ca-client/package.json

@@ -5,8 +5,8 @@
     "hyperledger",
     "blockchain"
   ],
-  "version": "1.4.0-rc2",
-  "tag": "rc2",
+  "version": "1.4.0-rc3-snapshot",
+  "tag": "unstable-1.4",
   "main": "index.js",
   "scripts": {
     "test": "nyc mocha --exclude 'test/data/**/*.js' --recursive  -t 10000"

fabric-client/lib/Remote.js

@@ -153,6 +153,7 @@ class Remote {
 					if (err.message) {
 						err.message = err.message + ' URL:' + self.getUrl();
 					}
+					err.connectFailed = true;
 					logger.error(err);
 
 					return reject(err);

fabric-client/package.json

@@ -5,8 +5,8 @@
     "hyperledger",
     "blockchain"
   ],
-  "version": "1.4.0-rc2",
-  "tag": "rc2",
+  "version": "1.4.0-rc3-snapshot",
+  "tag": "unstable-1.4",
   "main": "index.js",
   "scripts": {
     "test": "nyc mocha --exclude 'test/data/**/*.js' --recursive  -t 10000"

fabric-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fabric-common",
-  "version": "1.4.0-rc2",
-  "tag": "rc2",
+  "version": "1.4.0-rc3-snapshot",
+  "tag": "unstable-1.4",
   "description" : "This package encapsulates the common code used by the `fabric-ca-client`, `fabric-client` packages.",
   "keywords" :[
 	  "blockchain",

fabric-network/package.json

@@ -5,8 +5,8 @@
     "hyperledger",
     "blockchain"
   ],
-  "version": "1.4.0-rc2",
-  "tag": "rc2",
+  "version": "1.4.0-rc3-snapshot",
+  "tag": "unstable-1.4",
   "main": "index.js",
   "repository": {
     "type": "gerrit",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fabric-sdk-node",
-  "version": "1.4.0-rc2",
-  "testFabricVersion": "master",
+  "version": "1.4.0-rc3-snapshot",
+  "testFabricVersion": "1.4.0-rc1",
   "testFabricThirdParty": "0.4.14",
   "docsLatestVersion": "master",
   "main": "index.js",

scripts/Jenkins_Scripts/Publish_API_Docs.sh

@@ -24,4 +24,4 @@ git commit -m "SDK commit - $SDK_COMMIT"
 # Credentials are stored as Global Variables in Jenkins
 git config remote.gh-pages.url https://$NODE_SDK_USERNAME:$NODE_SDK_PASSWORD@github.com/$NODE_SDK_USERNAME/$TARGET_REPO
 # Push API docs to target repository
-git push gh-pages master
+git push gh-pages release-1.4

scripts/Jenkins_Scripts/Publish_NPM_Modules.sh

@@ -8,31 +8,28 @@
 npmPublish() {
 
  if [[ "$CURRENT_TAG" = *"skip"* ]]; then
-     echo "----> Don't publish $1 npm modules on skip tag"
+     echo -e "\033[34m----> Don't publish $1 npm modules on skip tag \033[0m"
  elif [[ "$CURRENT_TAG" = *"unstable"* ]]; then
       echo
       UNSTABLE_VER=$(npm dist-tags ls "$1" | awk "/$CURRENT_TAG"":"/'{
       ver=$NF
-      sub(/.*\./,"",rel)
-      sub(/\.[[:digit:]]+$/,"",ver)
-      print ver}')
-      echo "======> UNSTABLE VERSION:" $UNSTABLE_VER
-
-      UNSTABLE_INCREMENT=$(npm dist-tags ls "$1" | awk "/$CURRENT_TAG"":"/'{
-      ver=$NF
       rel=$NF
       sub(/.*\./,"",rel)
       sub(/\.[[:digit:]]+$/,"",ver)
       print ver"."rel+1}')
-      echo "======> Incremented UNSTABLE VERSION:" $UNSTABLE_INCREMENT
-
-      # Get last digit of the unstable version of $CURRENT_TAG
-      UNSTABLE_INCREMENT=$(echo $UNSTABLE_INCREMENT| rev | cut -d '.' -f 1 | rev)
-      echo "======> UNSTABLE_INCREMENT:" $UNSTABLE_INCREMENT
+      if [[ $UNSTABLE_VER = "" ]]; then
+        echo -e "\033[34m  ----> unstable ver is blank \033[0m"
+        UNSTABLE_INCREMENT=1
+      else
+        # Get last digit of the unstable version built above
+        UNSTABLE_INCREMENT=$(echo $UNSTABLE_VER| rev | cut -d '.' -f 1 | rev)
+      fi
+
+      echo -e "\033[32m======> UNSTABLE_INCREMENT:" $UNSTABLE_INCREMENT "\033[0m"
 
       # Append last digit with the package.json version
       export UNSTABLE_INCREMENT_VERSION=$RELEASE_VERSION.$UNSTABLE_INCREMENT
-      echo "======> UNSTABLE_INCREMENT_VERSION:" $UNSTABLE_INCREMENT_VERSION
+      echo -e "\033[32m======> UNSTABLE_INCREMENT_VERSION:" $UNSTABLE_INCREMENT_VERSION "\033[0"
 
       if [ "$1" = "fabric-network" ]; then
           sed -i 's/\(.*\"fabric-client\"\: \"\)\(.*\)/\1'$CURRENT_TAG\"\,'/' package.json
@@ -84,7 +81,7 @@ versions() {
 # START HERE
 ############
 
-echo "----------> START PUBLISHING FROM HERE"
+echo -e "\033[34m----------> START PUBLISHING FROM HERE" "\033[0m"
 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

test/fixtures/src/java_cc/example_cc/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.+'
 }
 
 shadowJar {

test/fixtures/src/java_cc/example_cc1/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+'
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.+'
 }
 
 shadowJar {