chore(release): release v1.6.0 (last release)

Signed-off-by: Sandeep Nishad <sandeep.nishad1@ibm.com>

common/protos-java-kt/gradle.properties

@@ -1,4 +1,4 @@
 name=Interop Protos
 group=com.weaver
-version=1.5.7
+version=1.6.0
 kotlin.incremental=false

common/protos-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger-labs/weaver-protos-js",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "description": "Interop protos for Node JS (Weaver)",
   "main": "index.js",
   "exports": {

common/protos-rs/pkg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "weaver_protos_rs"
-version = "1.5.7"
+version = "1.6.0"
 authors = ["Peter Somogyvari  <peter.somogyvari@accenture.com>", "Sandeep Nishad <sandeep.nishad1@ibm.com"]
 edition = "2018"
 license = "Apache-2.0"

core/drivers/corda-driver/VERSION

@@ -1 +1 @@
-1.2.14
+1.6.0

core/drivers/corda-driver/build.gradle

@@ -11,7 +11,7 @@ buildscript {
     ext.corda_core_version = "4.8"
     ext.arrow_version = "0.10.4"
     ext.weaver_protos_version = "1.5.7"
-    ext.weaver_corda_version = "1.2.14"
+    ext.weaver_corda_version = "1.6.0"
 
     repositories {
         mavenCentral()

core/drivers/corda-driver/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 name=corda-driver
 group=com.weaver.corda.driver
-version=1.2.14
+version=1.6.0
 kotlin.incremental=false

core/drivers/fabric-driver/VERSION

@@ -1 +1 @@
-1.5.14
+1.6.0

core/drivers/fabric-driver/package-local.json

@@ -1,6 +1,6 @@
 {
     "name": "fabric-driver",
-    "version": "1.5.13",
+    "version": "1.6.0",
     "description": "",
     "main": "out/server.js",
     "scripts": {

core/drivers/fabric-driver/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fabric-driver",
-    "version": "1.5.13",
+    "version": "1.6.0",
     "description": "",
     "main": "out/server.js",
     "scripts": {
@@ -19,8 +19,8 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@hyperledger-labs/weaver-protos-js": "~1.5.7",
-        "@hyperledger-labs/weaver-fabric-interop-sdk": "~1.5.14",
+        "@hyperledger-labs/weaver-protos-js": "1.6.0",
+        "@hyperledger-labs/weaver-fabric-interop-sdk": "1.6.0",
         "@fidm/x509": "^1.2.1",
         "@grpc/grpc-js": "^1.1.1",
         "@typescript-eslint/eslint-plugin": "^3.5.0",

core/identity-management/iin-agent/VERSION

@@ -1 +1 @@
-1.5.9
+1.6.0

core/identity-management/iin-agent/package-local.json

@@ -1,6 +1,6 @@
 {
     "name": "iin-agent",
-    "version": "1.5.9",
+    "version": "1.6.0",
     "description": "",
     "main": "index.js",
     "scripts": {

core/identity-management/iin-agent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iin-agent",
-    "version": "1.5.9",
+    "version": "1.6.0",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -19,8 +19,8 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@hyperledger-labs/weaver-protos-js": "~1.5.0",
-        "@hyperledger-labs/weaver-fabric-interop-sdk": "~1.5.0",
+        "@hyperledger-labs/weaver-protos-js": "1.6.0",
+        "@hyperledger-labs/weaver-fabric-interop-sdk": "1.6.0",
         "@fidm/x509": "^1.2.1",
         "@grpc/grpc-js": "^1.1.1",
         "@typescript-eslint/eslint-plugin": "^3.5.0",

core/network/corda-interop-app/constants.properties

@@ -11,4 +11,4 @@ slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
 arrowVersion=0.10.4
 
-weaverVersion=1.5.7
+weaverVersion=1.6.0

core/network/corda-interop-app/gradle.properties

@@ -1,4 +1,4 @@
 name=Interoperability CorDapp
 group=com.weaver.corda.app.interop
-version=1.2.14
+version=1.6.0
 kotlin.incremental=false

core/relay/VERSION

@@ -1 +1 @@
-1.5.12
+1.6.0

go-gen-checksum.sh

@@ -4,14 +4,21 @@
 ROOT_DIR='.'
 
 # Repo full go path
-# REPO='github.com/hyperledger/cacti'
 REPO='github.com/hyperledger-labs/weaver-dlt-interoperability'
 
+VERSION=$1
 
 GOMODULE_PATHS=("core/network/fabric-interop-cc/libs/utils"
 "core/network/fabric-interop-cc/libs/assetexchange"
 "core/network/fabric-interop-cc/interfaces/asset-mgmt"
-"core/network/fabric-interop-cc/contracts/interop")
+"core/network/fabric-interop-cc/contracts/interop"
+"sdks/fabric/go-sdk"
+"samples/fabric/go-cli"
+"samples/fabric/simpleasset"
+"samples/fabric/simpleassetandinterop"
+"samples/fabric/simpleassettransfer"
+"samples/fabric/simplestatewithacl"
+"samples/fabric/simplestate")
 
 for GOMODULE in ${GOMODULE_PATHS[@]}; do
   echo "!!!!! START !!!!!!!"
@@ -35,6 +42,9 @@ for GOMODULE in ${GOMODULE_PATHS[@]}; do
       echo "######## END ############"
       continue
     fi
+
+    (cat VERSION | grep "$VERSION") || echo $VERSION > VERSION
+
     GOMOD_VERSION=v$(cat VERSION)
     GOMOD_SUM=$(go-checksum . $GOMOD_NAME@$GOMOD_VERSION | grep "GoCheckSum" | cut -d ' ' -f 2 | cut -d '"' -f 2)
     GOMOD_DOTMOD_SUM=$(go-checksum go.mod | grep "GoCheckSum" | cut -d ' ' -f 2 | cut -d '"' -f 2)

samples/besu/besu-cli/package.json

@@ -31,8 +31,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@hyperledger-labs/weaver-besu-interop-sdk": "~1.0.0",
-    "@hyperledger-labs/weaver-protos-js": "~1.5.0",
+    "@hyperledger-labs/weaver-besu-interop-sdk": "1.6.0",
+    "@hyperledger-labs/weaver-protos-js": "1.6.0",
     "@truffle/contract": "^4.2.14",
     "gluegun": "latest",
     "winston": "^3.3.3"

samples/corda/corda-simple-application/build.gradle

@@ -13,8 +13,7 @@ buildscript {
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
-        weaver_protos_version = constants.getProperty("weaverProtosVersion")        
-        weaver_corda_version = constants.getProperty("weaverCordaVersion")        
+        weaver_version = constants.getProperty("weaverVersion")        
     }
 
     repositories {

samples/corda/corda-simple-application/clients/build.gradle

@@ -83,10 +83,10 @@ dependencies {
 
     implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0")
     implementation(group: 'com.fungiblehousetoken', name: 'workflows', version: "1.0")
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version")
+    implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_version")
+    implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_version")
 
     // gRPC and protobuf dependencies
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

samples/corda/corda-simple-application/constants.properties

@@ -9,5 +9,4 @@ log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
-weaverProtosVersion=1.5.7
-weaverCordaVersion=1.2.14
+weaverVersion=1.6.0

samples/corda/corda-simple-application/workflows-kotlin/build.gradle

@@ -41,8 +41,8 @@ configurations {
 
 dependencies {
     compile 'com.google.code.gson:gson:2.8.6'
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version")
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

samples/corda/fungible-house-token/build.gradle

@@ -18,7 +18,7 @@ buildscript {
         //TokenSDK
         tokens_release_group = 'com.r3.corda.lib.tokens'
         tokens_release_version = '1.2'
-        weaver_version = constants.getProperty("weaverCordaVersion")
+        weaver_version = constants.getProperty("weaverVersion")
     }
 
     repositories {

samples/corda/fungible-house-token/constants.properties

@@ -10,4 +10,4 @@ log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
-weaverCordaVersion=1.2.14
+weaverVersion=1.6.0

sdks/besu/interoperation-node-sdk/package-local.json

@@ -1,7 +1,7 @@
 {
   "name": "@hyperledger-labs/weaver-besu-interop-sdk",
   "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver",
-  "version": "1.0.1",
+  "version": "1.6.0",
   "description": "",
   "main": "build/index.js",
   "scripts": {

sdks/besu/interoperation-node-sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hyperledger-labs/weaver-besu-interop-sdk",
   "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver",
-  "version": "1.0.1",
+  "version": "1.6.0",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@hyperledger-labs/weaver-protos-js": "^1.5.7",
+    "@hyperledger-labs/weaver-protos-js": "1.6.0",
     "log4js": "^6.7.0",
     "web3": "^1.8.1"
   },

sdks/corda/build.gradle

@@ -13,8 +13,7 @@ buildscript {
     ext.corda_gradle_plugins_version = "5.0.12"
     ext.log4j_version = "2.16.0"
     ext.slf4j_version = "1.7.25"
-    ext.weaver_protos_version = "1.5.7"
-    ext.weaver_corda_version = "1.2.14"
+    ext.weaver_version = "1.6.0"
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -70,9 +69,9 @@ dependencies {
     // Corda dependencies.
     compile "$corda_release_group:corda-rpc:$corda_version"
 
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version")
-    implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version")
+    implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version")
+    implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_version")
 
     // gRPC and protobuf dependencies
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"

sdks/corda/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 name=weaver-corda-sdk
 group=com.weaver.corda.sdk
-version=1.2.14
+version=1.6.0
 kotlin.incremental=false

sdks/fabric/interoperation-node-sdk/package-local.json

@@ -6,7 +6,7 @@
     "blockchain",
     "interoperability"
   ],
-  "version": "1.5.14",
+  "version": "1.6.0",
   "author": "V. Ramakrishna",
   "tag": "latest",
   "main": "build/index.js",

sdks/fabric/interoperation-node-sdk/package.json

@@ -6,7 +6,7 @@
     "blockchain",
     "interoperability"
   ],
-  "version": "1.5.14",
+  "version": "1.6.0",
   "author": "V. Ramakrishna",
   "tag": "latest",
   "main": "build/index.js",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.1.3",
     "@grpc/proto-loader": "^0.6.13",
-    "@hyperledger-labs/weaver-protos-js": "~1.5.7",
+    "@hyperledger-labs/weaver-protos-js": "1.6.0",
     "elliptic": "^6.2.3",
     "fabric-common": "^2.2.8",
     "fabric-network": "^2.2.8",

tests/network-setups/corda/scripts/get-cordapps.sh

@@ -3,8 +3,7 @@
 directory=$(dirname $0)
 app=${1:-simple}
 local=$2
-weaverCordaVersion="1.2.14"
-weaverProtosVersion="1.5.7"
+weaverVersion="1.6.0"
 
 if [ "simple" = "$app" ]; then
   cordappPath=$directory/../../../../samples/corda/corda-simple-application
@@ -80,19 +79,19 @@ fi
 ######### Corda Interop App ###########
 
 if [[ $local == "local" ]]; then
-  if [[ ! -f $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverProtosVersion.jar ]]; then
+  if [[ ! -f $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverVersion.jar ]]; then
       echo "Please Build the weaver-protos-java-kt version $weaverVersion to use local components."
   fi  
-  if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverCordaVersion.jar ]]; then
+  if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverVersion.jar ]]; then
       echo "Please Build the corda-interop-app version $weaverVersion to use local components."
   fi 
-  if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverCordaVersion.jar ]]; then
+  if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverVersion.jar ]]; then
       echo "Please Build the corda-interop-app version $weaverVersion to use local components."
   fi 
   echo "Copying Corda Interop App..."
-  cp $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverCordaVersion.jar $directory/../shared/artifacts
-  cp $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverCordaVersion.jar $directory/../shared/artifacts
-  cp $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverProtosVersion.jar $directory/../shared/artifacts
+  cp $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverVersion.jar $directory/../shared/artifacts
+  cp $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverVersion.jar $directory/../shared/artifacts
+  cp $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverVersion.jar $directory/../shared/artifacts
 else
   file="$directory/../github.properties"
   if [ -f $file ]; then
@@ -101,9 +100,9 @@ else
     pkgurl=`sed '/^\#/d' $file | grep 'url=' | cut -d "=" -f2-`
     baseUrl="$pkgurl/com/weaver"
     echo "Downloading Corda Interop App from $baseUrl ..."
-    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-contracts/$weaverCordaVersion/interop-contracts-$weaverCordaVersion.jar) || exit 1
-    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-workflows/$weaverCordaVersion/interop-workflows-$weaverCordaVersion.jar) || exit 1
-    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/protos-java-kt/$weaverProtosVersion/protos-java-kt-$weaverProtosVersion.jar) || exit 1
+    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-contracts/$weaverVersion/interop-contracts-$weaverVersion.jar) || exit 1
+    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-workflows/$weaverVersion/interop-workflows-$weaverVersion.jar) || exit 1
+    (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/protos-java-kt/$weaverVersion/protos-java-kt-$weaverVersion.jar) || exit 1
   else
     echo Please copy the github.properties.template file as github.properties and replace placeholders with Github credentials.
   fi

tests/network-setups/corda/scripts/start-nodes.sh

@@ -9,8 +9,7 @@ simpleAppVersion="0.4"
 houseTokenAppVersion="1.0"
 tokenVersion="1.2"
 
-weaverCordaVersion="1.2.14"
-weaverProtosVersion="1.5.7"
+weaverVersion="1.6.0"
 
 parties="Notary PartyA PartyB PartyC"
 
@@ -31,10 +30,10 @@ for party in ${parties}; do
     echo "Cordapp not found" && exit 1
   fi
 
-  cp $directory/../shared/artifacts/interop-contracts-$weaverCordaVersion.jar dev/${nw}/build/nodes/${party}/cordapps
-  cp $directory/../shared/artifacts/interop-workflows-$weaverCordaVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+  cp $directory/../shared/artifacts/interop-contracts-$weaverVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+  cp $directory/../shared/artifacts/interop-workflows-$weaverVersion.jar dev/${nw}/build/nodes/${party}/cordapps
 
-  cp $directory/../shared/artifacts/protos-java-kt-$weaverProtosVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+  cp $directory/../shared/artifacts/protos-java-kt-$weaverVersion.jar dev/${nw}/build/nodes/${party}/cordapps
 done;
 
 dockerProject="corda"