diff --git a/network-management/build.gradle b/network-management/build.gradle index 128a31cf06..c47f136689 100644 --- a/network-management/build.gradle +++ b/network-management/build.gradle @@ -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. diff --git a/network-management/capsule-hsm/build.gradle b/network-management/capsule-hsm/build.gradle index 05d43ffb28..6b3d54a39c 100644 --- a/network-management/capsule-hsm/build.gradle +++ b/network-management/capsule-hsm/build.gradle @@ -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'] diff --git a/network-management/capsule/build.gradle b/network-management/capsule/build.gradle index 5c2eb6912d..6b2aaf40c9 100644 --- a/network-management/capsule/build.gradle +++ b/network-management/capsule/build.gradle @@ -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'] diff --git a/settings.gradle b/settings.gradle index 2e20226e98..6a1ca989ff 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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 {