Update Advanced samples to Corda 4.10

ja9-look · ja9-look · commit a232a1286ca6 · 2023-01-13T18:47:59.000Z
diff --git a/Advanced/auction-cordapp/build.gradle b/Advanced/auction-cordapp/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-
+        jcenter()
         maven { url 'https://software.r3.com/artifactory/corda' }
     }
 
@@ -37,7 +37,7 @@ allprojects {
 
     repositories {
         mavenLocal()
-
+        jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
         maven { url 'https://jitpack.io' }
@@ -87,7 +87,8 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaCompile "org.jetbrains.kotlinx:kotlinx-html-jvm-0.6.12"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 
diff --git a/Advanced/constants.properties b/Advanced/constants.properties
@@ -1,12 +1,12 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.9
-cordaCoreVersion=4.9
+cordaVersion=4.10
+cordaCoreVersion=4.10
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.2.71
 junitVersion=4.12
 quasarVersion=0.7.10
 log4jVersion =2.17.1
-platformVersion=10
+platformVersion=12
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
diff --git a/Advanced/duediligence-cordapp/build.gradle b/Advanced/duediligence-cordapp/build.gradle
@@ -83,7 +83,7 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 
diff --git a/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java b/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java
@@ -18,7 +18,7 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 public class FlowTests {
     private MockNetwork network;
diff --git a/Advanced/negotiation-cordapp/build.gradle b/Advanced/negotiation-cordapp/build.gradle
@@ -94,7 +94,7 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 
diff --git a/Advanced/obligation-cordapp/README.md b/Advanced/obligation-cordapp/README.md
@@ -1,6 +1,6 @@
 # Obligation Cordap
 
-This Cordapp is the complete implementation of our signature IOU (I-owe-you) demonstration.
+This CorDapp is the complete implementation of our signature IOU (I-owe-you) demonstration.
 
 ## Concepts
 
@@ -9,12 +9,12 @@ An IOU is someone who has cash that is paying it back to someone they owe it to.
 
 ### Flows
 
-The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issurance in `IOUIssueFlow.java`.
+The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issuance in `IOUIssueFlow.java`.
 
 The next flow is the one that transfers ownership of that asset over to another party. That can be found in `IOUTransferFlow.java`.
 
 
-Finally, once we have the ability to transfer assets, we just need to settle up. That functiionality can be found here in `IOUSettleFlow.java`
+Finally, once we have the ability to transfer assets, we just need to settle up. That functionality can be found here in `IOUSettleFlow.java`
 
 
 
diff --git a/Advanced/obligation-cordapp/build.gradle b/Advanced/obligation-cordapp/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-
+        jcenter()
         maven { url 'https://software.r3.com/artifactory/corda-releases' }
     }
 
@@ -41,7 +41,7 @@ allprojects {
 
     repositories {
         mavenLocal()
-
+        jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
         maven { url 'https://jitpack.io' }
@@ -92,7 +92,8 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaCompile "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 
diff --git a/Advanced/secretsanta-cordapp/build.gradle b/Advanced/secretsanta-cordapp/build.gradle
@@ -105,7 +105,7 @@ dependencies {
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 
diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java
@@ -18,7 +18,7 @@
 import java.time.Instant;
 import java.util.*;
 
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class CheckAssignedSantaFlowTests {
diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java
@@ -20,8 +20,8 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 
-import static org.jgroups.util.Util.assertEquals;
-import static org.jgroups.util.Util.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class CreateSantaSessionFlowTests {
diff --git a/Advanced/snakesandladders-cordapp/README.md b/Advanced/snakesandladders-cordapp/README.md
@@ -2,13 +2,13 @@
 
 This sample implements a simple Snakes And Ladder Game on Corda.
 
-Its a simple game which has a board with numbers from 1 to 100. Each player starts at 1. 
-Players takes turn to roll a dice and move as many places as they rolled. If a player lands on a number 
-with a ladder thay climb up using the ladder or if they land in a number with a snake they move down on the board.
+It's a simple game which has a board with numbers from 1 to 100. Each player starts at 1. 
+Players take turn to roll a dice and move as many places as they rolled. If a player lands on a number 
+with a ladder they climb up using the ladder or if they land in a number with a snake they move down on the board.
 The player who reach 100 first wins.
 
-The cordapp runs  a network having 4 nodes, 
-1. Classis Games
+The CorDapp runs  a network having 4 nodes, 
+1. Classic Games
 2. Mega Games
 3. Oracle
 4. Notary
diff --git a/Advanced/snakesandladders-cordapp/build.gradle b/Advanced/snakesandladders-cordapp/build.gradle
@@ -98,7 +98,7 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 
     //accounts
diff --git a/Advanced/syndicated-lending/README.md b/Advanced/syndicated-lending/README.md
@@ -15,7 +15,7 @@ and agreeing on loan terms.
 See https://docs.corda.net/getting-set-up.html.
 
 # Usage
-
+ 
 ## Running the CorDapp
 
 Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
diff --git a/Advanced/syndicated-lending/build.gradle b/Advanced/syndicated-lending/build.gradle
@@ -83,7 +83,7 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
-    cordaDriver "net.corda:corda-shell:4.9"
+    cordaDriver "net.corda:corda-shell:4.10"
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ dependencies {`
`83`	`83`	`cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"`
`84`	`84`	`cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"`
`85`	`85`	`cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"`
`86`		`- cordaDriver "net.corda:corda-shell:4.9"`
	`86`	`+ cordaDriver "net.corda:corda-shell:4.10"`
`87`	`87`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ dependencies {`
`94`	`94`	`cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"`
`95`	`95`	`cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"`
`96`	`96`	`cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"`
`97`		`- cordaDriver "net.corda:corda-shell:4.9"`
	`97`	`+ cordaDriver "net.corda:corda-shell:4.10"`
`98`	`98`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ dependencies {`
`105`	`105`	`cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"`
`106`	`106`	`cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"`
`107`	`107`	`cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"`
`108`		`- cordaDriver "net.corda:corda-shell:4.9"`
	`108`	`+ cordaDriver "net.corda:corda-shell:4.10"`
`109`	`109`
`110`	`110`	`}`
`111`	`111`