Merge branch 'hyperledger-labs:main' into main

dhinakaran2705 · web-flow · commit c5f6e3e5ef4f · 2021-12-15T13:21:25.000+05:30
diff --git a/common/protos-java-kt/gradle.properties b/common/protos-java-kt/gradle.properties
@@ -1,4 +1,4 @@
 name=Interop Protos
 group=com.weaver
-version=1.2.4-alpha.6
+version=1.2.4-alpha.7
 kotlin.incremental=false
diff --git a/core/drivers/corda-driver/.env.docker.template b/core/drivers/corda-driver/.env.docker.template
@@ -4,7 +4,7 @@ DRIVER_RPC_USERNAME=driverUser1
 DRIVER_RPC_PASSWORD=test
 EXTERNAL_NETWORK=<docker-bridge-network>
 DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver
-DOCKER_TAG=1.2.3
+DOCKER_TAG=1.2.4-alpha.7
 COMPOSE_PROJECT_NAME=<docker-compose-project-name>
 COMPOSE_PROJECT_NETWORK=<docker-compose-project-network>
 RELAY_TLS=<true|false>
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"
-    ext.corda_core_version = "4.8"
+    ext.corda_version = "4.8.4"
+    ext.corda_core_version = "4.8.4"
     ext.arrow_version = "0.10.4"
     ext.weaver_version = "1.2.4-alpha.+"
 
@@ -78,10 +78,10 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.6'
 
     // Corda dependencies.
-    implementation "net.corda:corda-core:4.4"
-    implementation "net.corda:corda-node-api:4.4"
-    implementation "net.corda:corda:4.4"
-    implementation "net.corda:corda-rpc:4.4"
+    implementation "net.corda:corda-core:$corda_core_version"
+    implementation "net.corda:corda-node-api:$corda_version"
+    implementation "net.corda:corda:$corda_version"
+    implementation "net.corda:corda-rpc:$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")
diff --git a/core/drivers/corda-driver/docker-testnet-envs/.env.corda b/core/drivers/corda-driver/docker-testnet-envs/.env.corda
@@ -3,7 +3,7 @@ DRIVER_PORT=9099
 DRIVER_RPC_USERNAME=driverUser1
 DRIVER_RPC_PASSWORD=test
 DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver
-DOCKER_TAG=1.2.4-alpha.6
+DOCKER_TAG=1.2.4-alpha.7
 EXTERNAL_NETWORK=corda_default
 COMPOSE_PROJECT_NAME=corda
 COMPOSE_PROJECT_NETWORK=default
diff --git a/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls b/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls
@@ -3,7 +3,7 @@ DRIVER_PORT=9099
 DRIVER_RPC_USERNAME=driverUser1
 DRIVER_RPC_PASSWORD=test
 DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver
-DOCKER_TAG=1.2.4-alpha.6
+DOCKER_TAG=1.2.4-alpha.7
 EXTERNAL_NETWORK=corda_default
 COMPOSE_PROJECT_NAME=corda
 COMPOSE_PROJECT_NETWORK=default
diff --git a/core/drivers/corda-driver/docker-testnet-envs/.env.corda2 b/core/drivers/corda-driver/docker-testnet-envs/.env.corda2
@@ -3,7 +3,7 @@ DRIVER_PORT=9098
 DRIVER_RPC_USERNAME=driverUser1
 DRIVER_RPC_PASSWORD=test
 DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver
-DOCKER_TAG=1.2.4-alpha.6
+DOCKER_TAG=1.2.4-alpha.7
 EXTERNAL_NETWORK=corda_network2_default
 COMPOSE_PROJECT_NAME=corda_network2
 COMPOSE_PROJECT_NETWORK=default
diff --git a/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls b/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls
@@ -3,7 +3,7 @@ DRIVER_PORT=9098
 DRIVER_RPC_USERNAME=driverUser1
 DRIVER_RPC_PASSWORD=test
 DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver
-DOCKER_TAG=1.2.4-alpha.6
+DOCKER_TAG=1.2.4-alpha.7
 EXTERNAL_NETWORK=corda_network2_default
 COMPOSE_PROJECT_NAME=corda_network2
 COMPOSE_PROJECT_NETWORK=default
diff --git a/core/drivers/corda-driver/gradle.properties b/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.1
+version=1.2.4-alpha.7
 kotlin.incremental=false
diff --git a/core/drivers/corda-driver/makefile b/core/drivers/corda-driver/makefile
@@ -1,5 +1,5 @@
 DOCKER_IMAGE_NAME ?= weaver-corda-driver
-DOCKER_TAG ?= 1.2.4-alpha.6
+DOCKER_TAG ?= 1.2.4-alpha.7
 DOCKER_REGISTRY ?= ghcr.io/hyperledger-labs
 GIT_URL = https://github.com/hyperledger-labs/weaver-dlt-interoperability/core/drivers/corda-driver
 COMPOSE_ARG ?=
diff --git a/core/network/corda-interop-app/constants.properties b/core/network/corda-interop-app/constants.properties
@@ -1,11 +1,11 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
+cordaVersion=4.8.4
+cordaCoreVersion=4.8.4
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12
-log4jVersion =2.11.2
+log4jVersion=2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
diff --git a/core/network/corda-interop-app/gradle.properties b/core/network/corda-interop-app/gradle.properties
@@ -1,4 +1,4 @@
 name=Interoperability CorDapp
 group=com.weaver.corda.app.interop
-version=1.2.4-alpha.6
+version=1.2.4-alpha.7
 kotlin.incremental=false
diff --git a/samples/corda/corda-simple-application/constants.properties b/samples/corda/corda-simple-application/constants.properties
@@ -1,12 +1,12 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
+cordaVersion=4.8.4
+cordaCoreVersion=4.8.4
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12
-log4jVersion =2.11.2
+log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
-weaverVersion=1.2.4-alpha.6
+weaverVersion=1.2.4-alpha.7
diff --git a/samples/corda/fungible-house-token/.gitignore b/samples/corda/fungible-house-token/.gitignore
@@ -1,2 +1 @@
 source
-constants.properties
diff --git a/samples/corda/fungible-house-token/constants.properties b/samples/corda/fungible-house-token/constants.properties
@@ -0,0 +1,12 @@
+cordaReleaseGroup=net.corda
+cordaCoreReleaseGroup=net.corda
+cordaVersion=4.8.4
+cordaCoreVersion=4.8.4
+gradlePluginsVersion=5.0.12
+kotlinVersion=1.2.71
+junitVersion=4.12
+quasarVersion=0.7.10
+log4jVersion =2.16.0
+platformVersion=10
+slf4jVersion=1.7.25
+nettyVersion=4.1.22.Final
diff --git a/samples/corda/fungible-house-token/makefile b/samples/corda/fungible-house-token/makefile
@@ -1,7 +1,7 @@
 source:
 	git clone https://github.com/corda/samples-kotlin.git
 	mv samples-kotlin/Tokens/fungiblehousetoken source
-	mv samples-kotlin/Tokens/constants.properties .
+	#mv samples-kotlin/Tokens/constants.properties .
 	rm -rf samples-kotlin
 
 .PHONY: build
diff --git a/sdks/corda/build.gradle b/sdks/corda/build.gradle
@@ -7,13 +7,13 @@ 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"
-    ext.corda_core_version = "4.8"
+    ext.corda_version = "4.8.4"
+    ext.corda_core_version = "4.8.4"
     ext.arrow_version = "0.10.4"
     ext.corda_gradle_plugins_version = "5.0.12"
-    ext.log4j_version = "2.11.2"
+    ext.log4j_version = "2.16.0"
     ext.slf4j_version = "1.7.25"
-    ext.weaver_version = "1.2.4-alpha.6"
+    ext.weaver_version = "1.2.4-alpha.7"
     
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/sdks/corda/gradle.properties b/sdks/corda/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 name=weaver-corda-sdk
 group=com.weaver.corda.sdk
-version=1.2.4-alpha.6
+version=1.2.4-alpha.7
 kotlin.incremental=false
diff --git a/tests/network-setups/corda/dev/Corda_Network/build.gradle b/tests/network-setups/corda/dev/Corda_Network/build.gradle
@@ -135,7 +135,7 @@ task deployNodes(type: net.corda.plugins.Cordform) {
 }
 
 task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) {
-    dockerImage = "corda/corda-zulu-java1.8-4.8"
+    dockerImage = "corda/corda-zulu-java1.8-$corda_release_version"
     nodeDefaults {
         projectCordapp {
             deploy = false
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
-cordaCoreVersion=4.8
+cordaVersion=4.8.4
+cordaCoreVersion=4.8.4
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.3.72
 junitVersion=4.12
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
+    image: corda/corda-zulu-java1.8-4.8.4
   partya:
     profiles: ["1-node", "2-nodes", "3-nodes"]
     volumes:
@@ -40,7 +40,7 @@ services:
     ports:
       - 10006:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
   partyb:
     profiles: ["2-nodes", "3-nodes"]
     volumes:
@@ -58,7 +58,7 @@ services:
     ports:
       - 10009:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
   partyc:
     profiles: ["3-nodes"]
     volumes:
@@ -76,4 +76,4 @@ services:
     ports:
       - 10012:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
diff --git a/tests/network-setups/corda/dev/Corda_Network2/build.gradle b/tests/network-setups/corda/dev/Corda_Network2/build.gradle
@@ -135,7 +135,7 @@ task deployNodes(type: net.corda.plugins.Cordform) {
 }
 
 task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) {
-    dockerImage = "corda/corda-zulu-java1.8-4.8"
+    dockerImage = "corda/corda-zulu-java1.8-$corda_release_version"
     nodeDefaults {
         projectCordapp {
             deploy = false
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
-cordaCoreVersion=4.8
+cordaVersion=4.8.4
+cordaCoreVersion=4.8.4
 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
+    image: corda/corda-zulu-java1.8-4.8.4
   partya:
     profiles: ["1-node", "2-nodes", "3-nodes"]
     volumes:
@@ -40,7 +40,7 @@ services:
     ports:
       - 30006:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
   partyb:
     profiles: ["2-nodes", "3-nodes"]
     volumes:
@@ -58,7 +58,7 @@ services:
     ports:
       - 30009:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
   partyc:
     profiles: ["3-nodes"]
     volumes:
@@ -76,4 +76,4 @@ services:
     ports:
       - 30012:10003
       - 22022
-    image: corda/corda-zulu-java1.8-4.8
+    image: corda/corda-zulu-java1.8-4.8.4
diff --git a/tests/network-setups/corda/scripts/get-cordapps.sh b/tests/network-setups/corda/scripts/get-cordapps.sh
@@ -3,7 +3,7 @@
 directory=$(dirname $0)
 app=${1:-simple}
 local=$2
-weaverVersion="1.2.4-alpha.6"
+weaverVersion="1.2.4-alpha.7"
 
 if [ "simple" = "$app" ]; then
   cordappPath=$directory/../../../../samples/corda/corda-simple-application
diff --git a/tests/network-setups/corda/scripts/start-nodes.sh b/tests/network-setups/corda/scripts/start-nodes.sh
@@ -9,7 +9,7 @@ simpleAppVersion="0.4"
 houseTokenAppVersion="1.0"
 tokenVersion="1.2"
 
-weaverVersion="1.2.4-alpha.6"
+weaverVersion="1.2.4-alpha.7"
 
 parties="Notary PartyA PartyB PartyC"
 
