Merge pull request #320 from VRamakrishna/main

Minor Version Changes
hyperledger · Oct 3, 2022 · 4bcac88 · 4bcac88
2 parents 6d8051d + e6694ce
commit 4bcac88
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/deploy_go-pkgs.yml b/.github/workflows/deploy_go-pkgs.yml
@@ -36,7 +36,7 @@ jobs:
           echo "MODULE_DESC=GO Weaver Protos" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: common/protos-go
 
       - name: Create Release
@@ -80,7 +80,7 @@ jobs:
           echo "MODULE_DESC=GO Fabric Utils Library for Interoperation" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: core/network/fabric-interop-cc/libs/utils
 
       - name: Build test
@@ -128,7 +128,7 @@ jobs:
           echo "MODULE_DESC=GO Fabric Library for Asset Exchange" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: core/network/fabric-interop-cc/libs/assetexchange
 
       - name: Build test
@@ -176,7 +176,7 @@ jobs:
           echo "MODULE_DESC=GO Fabric Asset Management Interface" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: core/network/fabric-interop-cc/interfaces/asset-mgmt
 
       - name: Build test
@@ -224,7 +224,7 @@ jobs:
           echo "MODULE_DESC=GO Fabric Interop Chaincode" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: core/network/fabric-interop-cc/contracts/interop
 
       - name: Build test
@@ -272,7 +272,7 @@ jobs:
             echo "MODULE_DESC=GO Fabric Weaver SDK" >> $GITHUB_ENV
         
       - name: Set module version
-        run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+        run: echo "VERSION=v$(cat VERSION)" >> $GITHUB_ENV
         working-directory: sdks/fabric/go-sdk
 
       - name: Build test

diff --git a/core/drivers/corda-driver/build.gradle b/core/drivers/corda-driver/build.gradle
@@ -7,8 +7,8 @@ buildscript {
     ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
     ext.corda_release_group = "net.corda"
     ext.corda_core_release_group = "net.corda"
-    ext.corda_version = "4.8.4"
-    ext.corda_core_version = "4.8.4"
+    ext.corda_version = "4.8"
+    ext.corda_core_version = "4.8"
     ext.arrow_version = "0.10.4"
     ext.weaver_protos_version = "1.4.2"
     ext.weaver_corda_version = "1.2.9"

diff --git a/core/network/corda-interop-app/constants.properties b/core/network/corda-interop-app/constants.properties
@@ -1,7 +1,7 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.4
-cordaCoreVersion=4.8.4
+cordaVersion=4.8
+cordaCoreVersion=4.8
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12

diff --git a/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION b/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION
@@ -1 +1 @@
-1.4.3
+1.5.1
diff --git a/core/network/fabric-interop-cc/libs/assetexchange/VERSION b/core/network/fabric-interop-cc/libs/assetexchange/VERSION
@@ -1 +1 @@
-1.4.3
+1.5.1
diff --git a/core/network/fabric-interop-cc/libs/utils/VERSION b/core/network/fabric-interop-cc/libs/utils/VERSION
@@ -1 +1 @@
-1.4.3
+1.5.1
diff --git a/sdks/corda/build.gradle b/sdks/corda/build.gradle
@@ -7,8 +7,8 @@ buildscript {
     ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
     ext.corda_release_group = "net.corda"
     ext.corda_core_release_group = "net.corda"
-    ext.corda_version = "4.8.4"
-    ext.corda_core_version = "4.8.4"
+    ext.corda_version = "4.8"
+    ext.corda_core_version = "4.8"
     ext.arrow_version = "0.10.4"
     ext.corda_gradle_plugins_version = "5.0.12"
     ext.log4j_version = "2.16.0"

diff --git a/tests/network-setups/corda/dev/Corda_Network/constants.properties b/tests/network-setups/corda/dev/Corda_Network/constants.properties
@@ -1,7 +1,7 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.4
-cordaCoreVersion=4.8.4
+cordaVersion=4.8
+cordaCoreVersion=4.8
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12
@@ -17,4 +17,4 @@ partyAAdminRpcAddress=localhost:10046
 partyBRpcAddress=localhost:10009
 partyBAdminRpcAddress=localhost:10049
 partyCRpcAddress=localhost:10012
-partyCAdminRpcAddress=localhost:10052
+partyCAdminRpcAddress=localhost:10052
diff --git a/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml b/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     ports:
       - 10003:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_notary_1
   partya:
     profiles: ["1-node", "2-nodes", "3-nodes"]
@@ -41,7 +41,7 @@ services:
     ports:
       - 10006:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_partya_1
   partyb:
     profiles: ["2-nodes", "3-nodes"]
@@ -60,7 +60,7 @@ services:
     ports:
       - 10009:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_partyb_1
   partyc:
     profiles: ["3-nodes"]
@@ -79,5 +79,5 @@ services:
     ports:
       - 10012:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_partyc_1
diff --git a/tests/network-setups/corda/dev/Corda_Network2/constants.properties b/tests/network-setups/corda/dev/Corda_Network2/constants.properties
@@ -1,7 +1,7 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.4
-cordaCoreVersion=4.8.4
+cordaVersion=4.8
+cordaCoreVersion=4.8
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12

diff --git a/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml b/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     ports:
       - 30003:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_network2_notary_1
   partya:
     profiles: ["1-node", "2-nodes", "3-nodes"]
@@ -41,7 +41,7 @@ services:
     ports:
       - 30006:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_network2_partya_1
   partyb:
     profiles: ["2-nodes", "3-nodes"]
@@ -60,7 +60,7 @@ services:
     ports:
       - 30009:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_network2_partyb_1
   partyc:
     profiles: ["3-nodes"]
@@ -79,5 +79,5 @@ services:
     ports:
       - 30012:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8.4
+    image: corda/corda-zulu-java1.8-4.8
     container_name: corda_network2_partyc_1
diff --git a/tests/network-setups/corda/scripts/start-nodes.sh b/tests/network-setups/corda/scripts/start-nodes.sh
@@ -14,7 +14,7 @@ weaverProtosVersion="1.4.2"
 
 parties="Notary PartyA PartyB PartyC"
 
-echo "Starting Netowrk: ${nw}, profile: ${profile}, with App: ${app} Cordapp..."
+echo "Starting Network: ${nw}, profile: ${profile}, with App: ${app} Cordapp..."
 
 for party in ${parties}; do
   if [ "simple" = "$app" ]; then