Merge branch 'master2'

This commit is contained in:
djmil 2023-08-03 16:23:25 +02:00
commit 164bc0e70f
3 changed files with 9 additions and 4 deletions

4
.gitignore vendored
View File

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

View File

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

View File

@ -34,4 +34,7 @@ kotlin.stdlib.default.dependency=false
junitVersion = 5.8.2 junitVersion = 5.8.2
mockitoKotlinVersion=4.0.0 mockitoKotlinVersion=4.0.0
mockitoVersion=4.6.1 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