build(corda-sample): upgrade corda token sdk version to 1.2.5 to fix …

…the build Signed-off-by: Sandeep Nishad <[email protected]>
hyperledger-cacti · Sep 14, 2023 · 4ee6919 · 4ee6919
1 parent ee41066
commit 4ee6919
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/weaver/samples/corda/corda-simple-application/build.gradle b/weaver/samples/corda/corda-simple-application/build.gradle
@@ -13,7 +13,9 @@ buildscript {
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
-        cacti_version = constants.getProperty("cactiVersion")        
+        cacti_version = constants.getProperty("cactiVersion")  
+        tokens_release_group = constants.getProperty('cordaTokenSDKGroup')
+        tokens_release_version = constants.getProperty('cordaTokenSDKVersion')      
     }
 
     repositories {

diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle
@@ -6,8 +6,6 @@ buildscript {
     ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION
     ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION
     ext.arrow_version = "0.10.4"
-    ext.tokens_release_group = 'com.r3.corda.lib.tokens'
-    ext.tokens_release_version = '1.2'
 
     repositories {
         mavenCentral()

diff --git a/weaver/samples/corda/corda-simple-application/constants.properties b/weaver/samples/corda/corda-simple-application/constants.properties
@@ -9,4 +9,6 @@ log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
+cordaTokenSDKGroup=com.r3.corda.lib.tokens
+cordaTokenSDKVersion=1.2.5
 cactiVersion=2.0.0-alpha.1
diff --git a/weaver/samples/corda/fungible-house-token/build.gradle b/weaver/samples/corda/fungible-house-token/build.gradle
@@ -16,8 +16,8 @@ buildscript {
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
 
         //TokenSDK
-        tokens_release_group = 'com.r3.corda.lib.tokens'
-        tokens_release_version = '1.2'
+        tokens_release_group = constants.getProperty('cordaTokenSDKGroup')
+        tokens_release_version = constants.getProperty('cordaTokenSDKVersion')
         cacti_version = constants.getProperty("cactiVersion")
     }
 

diff --git a/weaver/samples/corda/fungible-house-token/constants.properties b/weaver/samples/corda/fungible-house-token/constants.properties
@@ -10,4 +10,6 @@ log4jVersion =2.16.0
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
-cactiVersion=2.0.0-alpha.1
+cordaTokenSDKGroup=com.r3.corda.lib.tokens
+cordaTokenSDKVersion=1.2.5
+cactiVersion=2.0.0-alpha.1
diff --git a/weaver/tests/network-setups/corda/constants.properties b/weaver/tests/network-setups/corda/constants.properties
@@ -1 +1,2 @@
+cordaTokenSDKVersion=1.2.5
 cactiVersion=2.0.0-alpha.1
diff --git a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh
@@ -39,7 +39,6 @@ if [ "simple" = "$app" ]; then
 elif [ "house" = "$app" ]; then
   cordappPath=$directory/../../../../samples/corda/fungible-house-token
   houseTokenAppVersion="1.0"
-  tokenVersion="1.2"
 
   ########## Fungible House Token App ##############
 
@@ -70,8 +69,8 @@ elif [ "house" = "$app" ]; then
   ### Token SDK ###
 
   (cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/ci/ci-workflows/1.0/ci-workflows-1.0.jar) || exit 1
-  (cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$tokenVersion/tokens-contracts-$tokenVersion.jar) || exit 1
-  (cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$tokenVersion/tokens-workflows-$tokenVersion.jar) || exit 1
+  (cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$cordaTokenSDKVersion/tokens-contracts-$cordaTokenSDKVersion.jar) || exit 1
+  (cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$cordaTokenSDKVersion/tokens-workflows-$cordaTokenSDKVersion.jar) || exit 1
 
 else
   echo "Cordapp not found" && exit 1

diff --git a/weaver/tests/network-setups/corda/scripts/start-nodes.sh b/weaver/tests/network-setups/corda/scripts/start-nodes.sh
@@ -7,7 +7,6 @@ nw=${3:-Corda_Network}
 
 simpleAppVersion="0.4"
 houseTokenAppVersion="1.0"
-tokenVersion="1.2"
 
 . $directory/../constants.properties
 
@@ -23,8 +22,8 @@ for party in ${parties}; do
     cp $directory/../shared/artifacts/contracts-$houseTokenAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
     cp $directory/../shared/artifacts/workflows-$houseTokenAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
 
-    cp $directory/../shared/artifacts/tokens-contracts-$tokenVersion.jar dev/${nw}/build/nodes/${party}/cordapps
-    cp $directory/../shared/artifacts/tokens-workflows-$tokenVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+    cp $directory/../shared/artifacts/tokens-contracts-$cordaTokenSDKVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+    cp $directory/../shared/artifacts/tokens-workflows-$cordaTokenSDKVersion.jar dev/${nw}/build/nodes/${party}/cordapps
     cp $directory/../shared/artifacts/ci-workflows-1.0.jar dev/${nw}/build/nodes/${party}/cordapps
   else
     echo "Cordapp not found" && exit 1
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		cordaTokenSDKVersion=1.2.5
		cactiVersion=2.0.0-alpha.1