Merge branch 'master2'

.gitignore

@@ -88,4 +88,6 @@ workspace/**
 #GroupPolicy.json
 
 # Ignore temporary data files
-*.dat
+*.dat
+
+.vscode/

build.gradle

@@ -19,13 +19,13 @@ allprojects {
     csde {
         cordaClusterURL = "https://localhost:8888"
         networkConfigFile = "$rootDir/config/static-network-config.json"
-        r3RootCertFile = "$rootDir/config/r3-ca-key.pem"
+        r3RootCertFile = "config/r3-ca-key.pem"
         corDappCpiName = "MyCorDapp"
         notaryCpiName = "NotaryServer"
         cordaRpcUser = "admin"
         cordaRpcPasswd ="admin"
         workflowsModuleName = workflowsModule
-        csdeWorkspaceDir = "workspace"
+        csdeWorkspaceDir = "$rootDir/workspace"
         notaryVersion = cordaNotaryPluginsVersion
         combinedWorkerVersion = combinedWorkerJarVersion
         postgresJdbcVersion = "42.4.3"

gradle.properties

@@ -34,4 +34,7 @@ kotlin.stdlib.default.dependency=false
 junitVersion = 5.8.2
 mockitoKotlinVersion=4.0.0
 mockitoVersion=4.6.1
-hamcrestVersion=2.2
+hamcrestVersion=2.2
+
+# Use JDK Zulu 11
+org.gradle.java.home=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home