ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Re-enabled Doorman build and removed hard dependency on specific OS branch.

Browse Source
This commit is contained in:
josecoll 2017-12-12 11:31:52 +00:00
parent 499de12620
commit cc770e1145
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
network-management/build.gradle
View File

@ -1,10 +1,3 @@
ext {
// We use Corda release artifact dependencies instead of project dependencies to make sure each doorman releases are
// aligned with the corresponding Corda release.
corda_dependency_version = '3.0-NETWORKMAP-20171204.134345-6'
}
version "$corda_dependency_version"
description 'Network management module encapsulating components such as Doorman, HSM Signing Service and Network Map'
@ -59,12 +52,12 @@ dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "net.corda:corda-node-api:$corda_dependency_version"
compile "net.corda:corda-node-api:$corda_release_version"
// TODO remove this when AMQP P2P serialization context is supported.
compile "net.corda:corda-rpc:$corda_dependency_version"
testCompile "net.corda:corda-node-driver:$corda_dependency_version"
testCompile "net.corda:corda-test-common:$corda_dependency_version"
compile "net.corda:corda-rpc:$corda_release_version"
testCompile "net.corda:corda-node-driver:$corda_release_version"
testCompile "net.corda:corda-test-common:$corda_release_version"
// Log4J: logging framework (with SLF4J bindings)
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
@ -94,9 +87,9 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile "org.assertj:assertj-core:${assertj_version}"
testCompile "com.nhaarman:mockito-kotlin:0.6.1"
testRuntime "net.corda:corda-rpc:$corda_dependency_version"
testRuntime "net.corda:corda-rpc:$corda_release_version"
testCompile "com.spotify:docker-client:8.9.1"
integrationTestRuntime "net.corda:corda-rpc:$corda_dependency_version"
integrationTestRuntime "net.corda:corda-rpc:$corda_release_version"
compile('com.atlassian.jira:jira-rest-java-client-core:4.0.0') {
// The jira client includes jersey-core 1.5 which breaks everything.

2
network-management/capsule-hsm/build.gradle
View File

@ -14,7 +14,7 @@ task buildHsmJAR(type: FatCapsule, dependsOn: 'jar') {
applicationClass 'com.r3.corda.networkmanage.hsm.MainKt'
archiveName "hsm-${version}.jar"
capsuleManifest {
applicationVersion = corda_dependency_version
applicationVersion = corda_release_version
systemProperties['visualvm.display.name'] = 'HSM Signing Service'
minJavaVersion = '1.8.0'
jvmArgs = ['-XX:+UseG1GC']

2
network-management/capsule/build.gradle
View File

@ -14,7 +14,7 @@ task buildDoormanJAR(type: FatCapsule, dependsOn: ':network-management:jar') {
applicationClass 'com.r3.corda.networkmanage.doorman.MainKt'
archiveName "doorman-${version}.jar"
capsuleManifest {
applicationVersion = corda_dependency_version
applicationVersion = corda_release_version
systemProperties['visualvm.display.name'] = 'Doorman'
minJavaVersion = '1.8.0'
jvmArgs = ['-XX:+UseG1GC']

3
settings.gradle
View File

@ -49,6 +49,9 @@ include 'samples:notary-demo'
include 'samples:bank-of-corda-demo'
include 'samples:business-network-demo'
include 'cordform-common'
include 'network-management'
include 'network-management:capsule'
include 'network-management:capsule-hsm'
include 'verify-enclave'
include 'hsm-tool'
project(':hsm-tool').with {