ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-27 14:49:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add the DJVM's serialisation modules to the Corda node.

Browse Source
This commit is contained in:
Chris Rankin 2019-08-28 17:22:49 +01:00
parent 6ddbe877f7
commit 5666b2406a
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
node/build.gradle
View File

@ -50,6 +50,16 @@ configurations {
cacheChangingModulesFor 0, 'seconds'
}
deterministic
// This is for the latest deterministic Corda SNAPSHOT artifacts...
[ compileClasspath, runtimeClasspath ].forEach { cfg ->
cfg.resolutionStrategy {
dependencySubstitution {
substitute module("net.corda:corda-core") with project(':core')
substitute module("net.corda:corda-serialization") with project(':serialization')
}
}
}
}
sourceSets {
@ -170,9 +180,13 @@ dependencies {
// Sandbox for deterministic contract verification
compile "net.corda:corda-djvm:$djvm_version"
compile "net.corda:corda-djvm-serialization:$djvm_version"
jdkRt "net.corda:deterministic-rt:latest.integration"
deterministic project(path: ':core-deterministic', configuration: 'deterministicArtifacts')
deterministic project(path: ':serialization-deterministic', configuration: 'deterministicArtifacts')
deterministic("net.corda:corda-djvm-deserializers:$djvm_version") {
transitive = false
}
deterministic "org.slf4j:slf4j-nop:$slf4j_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"

36
node/capsule/build.gradle
View File

@ -36,8 +36,10 @@ capsule {
version capsule_version
}
def nodeProject = project(':node')
task buildCordaJAR(type: FatCapsule, dependsOn: [
project(':node').tasks.jar,
nodeProject.tasks.jar,
project(':core-deterministic').tasks.assemble,
project(':serialization-deterministic').tasks.assemble
]) {
@ -47,27 +49,41 @@ task buildCordaJAR(type: FatCapsule, dependsOn: [
archiveClassifier = jdkClassifier
archiveName = archiveFileName.get()
applicationSource = files(
project(':node').configurations.runtimeClasspath,
project(':node').tasks.jar,
project(':node').buildDir.toString() + '/resources/main/reference.conf',
nodeProject.configurations.runtimeClasspath,
nodeProject.tasks.jar,
nodeProject.buildDir.toString() + '/resources/main/reference.conf',
"$rootDir/config/dev/log4j2.xml",
'NOTICE' // Copy CDDL notice
)
from configurations.capsuleRuntime.files.collect { zipTree(it) }
with jar
def deterministicResolved = project(':node').configurations['deterministic'].resolvedConfiguration
def deterministicLibs = deterministicResolved.firstLevelModuleDependencies.moduleArtifacts.flatten { it.file }.toSet()
def deterministicCordaDependencies = deterministicResolved.files - deterministicLibs
// The DJVM will share most of its dependencies with the node, but any extra ones that it needs
// are listed in the node's "deterministic" configuration and copied into a djvm subdirectory.
//
// Gradle may not resolve exactly rhe same transitive dependencies for both the runtimeClasspath
// and deterministic configurations - specifically, the artifacts' version numbers may differ slightly.
// And so we map the files by the resolved ModuleIdentifier objects instead, which just contain an
// artifact's group and name.
def cordaResolved = nodeProject.configurations['runtimeClasspath'].resolvedConfiguration.resolvedArtifacts.collectEntries {
[ (it.moduleVersion.id.module):it.file ]
}
def deterministicResolved = nodeProject.configurations['deterministic'].resolvedConfiguration.resolvedArtifacts.collectEntries {
[ (it.moduleVersion.id.module):it.file ]
}
def resolvedDifferences = deterministicResolved.keySet() - cordaResolved.keySet()
cordaResolved.keySet().retainAll(deterministicResolved.keySet() - resolvedDifferences)
deterministicResolved.keySet().retainAll(resolvedDifferences)
manifest {
// These are the dependencies that the deterministic Corda libraries share with Corda.
attributes('Corda-DJVM-Dependencies': deterministicCordaDependencies.collect { it.name }.join(' '))
attributes('Corda-DJVM-Dependencies': cordaResolved.values().collect { it.name }.join(' '))
}
into('djvm') {
from project(':node').configurations['jdkRt'].singleFile
from deterministicLibs
from nodeProject.configurations['jdkRt'].singleFile
from deterministicResolved.values()
fileMode = 0444
}