mirror of
https://github.com/corda/corda.git
synced 2024-12-18 20:47:57 +00:00
6dd33fb8f7
Major changes due to JDK 17: 1. JDK17 JCE Provider now has built-in support for eddsas, corda uses the bouncycastle (i2p) implementation. This PR removes the conflicting algorithms from the built-in JCE provider. 2. JavaScript scripting has been removed from the JDK, the corda log4j config was using scripting to conditionally output additional diagnostic info if the MDC was populated. This PR has removed the scripting. 3. The artifactory plug-ins used are now deprecated, this PR has removed them and uses the same code as Corda 5 for publishing to artifactory. 4. Javadoc generation has been modified to use the latest dokka plug-ins. 5. Gradle 7.6 has implemented an incredibly annoying change where transitive dependencies are not put on the compile classpath, so that they have to be explicitly added as dependencies to projects. 6. Mockito has been updated, which sadly meant that quite a few source files have to changes to use the new (org.mockito.kotlin) package name. This makes this PR appear much larger than it is. 7. A number of tests have been marked as ignored to get a green, broadly they fall into 3 classes. The first is related to crypto keypair tests, it appears some logic in the JDK prefers to use the SunJCE implementation and we prefer to use bouncycastle. I believe this issue can be fixed with better test setup. The second group is related to our use of a method called "uncheckedCast(..)", the purpose of this method was to get rid of the annoying unchecked cast compiler warning that would otherwise exist. It looks like the Kotlin 1.9 compiler type inference differs and at runtime sometimes the type it infers is "Void" which causes an exception at runtime. The simplest solution is to use an explicit cast instead of unchecked cast, Corda 5 have removed unchecked cast from their codebase. The third class are a number of ActiveMQ tests which appear to have a memory leak somewhere.
296 lines
8.7 KiB
Groovy
296 lines
8.7 KiB
Groovy
import net.corda.plugins.Cordform
|
|
|
|
apply plugin: 'org.jetbrains.kotlin.jvm'
|
|
apply plugin: 'idea'
|
|
apply plugin: 'net.corda.plugins.cordapp'
|
|
apply plugin: 'net.corda.plugins.cordformation'
|
|
|
|
cordapp {
|
|
targetPlatformVersion corda_platform_version.toInteger()
|
|
}
|
|
|
|
dependencies {
|
|
if (System.getProperty('excludeShell') == null) {
|
|
cordaDriver "net.corda:corda-shell:$corda_shell_version"
|
|
}
|
|
|
|
cordaProvided project(':core')
|
|
cordaProvided project(':client:rpc')
|
|
|
|
cordaBootstrapper "org.slf4j:slf4j-simple:$slf4j_version"
|
|
cordaBootstrapper project(":node-api")
|
|
|
|
// Corda integration dependencies
|
|
corda project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
|
corda project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts')
|
|
|
|
// Notary implementations
|
|
cordapp project(':samples:notary-demo:contracts')
|
|
cordapp project(':samples:notary-demo:workflows')
|
|
}
|
|
|
|
task deployNodes(dependsOn: ['deployNodesSingle', 'deployNodesRaft', 'deployNodesBFT', 'deployNodesCustom'])
|
|
|
|
configurations.cordaCordapp.canBeResolved = true
|
|
task deployNodesSingle(type: Cordform) {
|
|
directory file("$buildDir/nodes/nodesSingle")
|
|
nodeDefaults {
|
|
projectCordapp {
|
|
deploy = false
|
|
}
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':samples:notary-demo:contracts')
|
|
cordapp project(':samples:notary-demo:workflows')
|
|
runSchemaMigration = true
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Bob Plc,L=Rome,C=IT"
|
|
p2pPort 10005
|
|
rpcSettings {
|
|
address "localhost:10006"
|
|
adminAddress "localhost:10007"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Node,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [validating: true,
|
|
serviceLegalName: "O=Notary Service,L=Zurich,C=CH"
|
|
]
|
|
}
|
|
}
|
|
|
|
task deployNodesCustom(type: Cordform) {
|
|
directory file("$buildDir/nodes/nodesCustom")
|
|
nodeDefaults {
|
|
projectCordapp {
|
|
deploy = false
|
|
}
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':samples:notary-demo:contracts')
|
|
cordapp project(':samples:notary-demo:workflows')
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Bob Plc,L=Rome,C=IT"
|
|
p2pPort 10005
|
|
rpcSettings {
|
|
address "localhost:10006"
|
|
adminAddress "localhost:10007"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Node,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
className: "net.corda.notarydemo.MyCustomValidatingNotaryService",
|
|
serviceLegalName: "O=Notary Service,L=Zurich,C=CH"
|
|
]
|
|
}
|
|
}
|
|
|
|
task deployNodesRaft(type: Cordform) {
|
|
directory file("$buildDir/nodes/nodesRaft")
|
|
nodeDefaults {
|
|
projectCordapp {
|
|
deploy = false
|
|
}
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':samples:notary-demo:contracts')
|
|
cordapp project(':samples:notary-demo:workflows')
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Bob Plc,L=Rome,C=IT"
|
|
p2pPort 10005
|
|
rpcSettings {
|
|
address "localhost:10006"
|
|
adminAddress "localhost:10007"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service 0,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
raft: [
|
|
nodeAddress: "localhost:10008"
|
|
]
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 1,L=Zurich,C=CH"
|
|
p2pPort 10013
|
|
rpcSettings {
|
|
address "localhost:10014"
|
|
adminAddress "localhost:10114"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
raft: [
|
|
nodeAddress: "localhost:10012",
|
|
clusterAddresses: ["localhost:10008"]
|
|
]
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 2,L=Zurich,C=CH"
|
|
p2pPort 10017
|
|
rpcSettings {
|
|
address "localhost:10018"
|
|
adminAddress "localhost:10118"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
raft: [
|
|
nodeAddress: "localhost:10016",
|
|
clusterAddresses: ["localhost:10008"]
|
|
]
|
|
]
|
|
}
|
|
}
|
|
|
|
task deployNodesBFT(type: Cordform) {
|
|
def clusterAddresses = ["localhost:11000", "localhost:11010", "localhost:11020", "localhost:11030"]
|
|
directory file("$buildDir/nodes/nodesBFT")
|
|
nodeDefaults {
|
|
projectCordapp {
|
|
deploy = false
|
|
}
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':samples:notary-demo:contracts')
|
|
cordapp project(':samples:notary-demo:workflows')
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Bob Plc,L=Rome,C=IT"
|
|
p2pPort 10005
|
|
rpcSettings {
|
|
address "localhost:10006"
|
|
adminAddress "localhost:10007"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service 0,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
bftSMaRt: [
|
|
replicaId: 0,
|
|
clusterAddresses: clusterAddresses
|
|
]
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 1,L=Zurich,C=CH"
|
|
p2pPort 10013
|
|
rpcSettings {
|
|
address "localhost:10014"
|
|
adminAddress "localhost:10114"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
bftSMaRt: [
|
|
replicaId: 1,
|
|
clusterAddresses: clusterAddresses
|
|
]
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 2,L=Zurich,C=CH"
|
|
p2pPort 10017
|
|
rpcSettings {
|
|
address "localhost:10018"
|
|
adminAddress "localhost:10118"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
bftSMaRt: [
|
|
replicaId: 2,
|
|
clusterAddresses: clusterAddresses
|
|
]
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 3,L=Zurich,C=CH"
|
|
p2pPort 10021
|
|
rpcSettings {
|
|
address "localhost:10022"
|
|
adminAddress "localhost:10122"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
bftSMaRt: [
|
|
replicaId: 3,
|
|
clusterAddresses: clusterAddresses
|
|
]
|
|
]
|
|
}
|
|
}
|
|
|
|
task notarise(type: JavaExec, dependsOn: jar) {
|
|
classpath = sourceSets.main.runtimeClasspath
|
|
main = 'net.corda.notarydemo.client.NotariseKt'
|
|
}
|