Changed dependencies of deployNodes everywhere to depend on the jar task and not build to reduce build time. (#502)

This commit is contained in:
Clinton 2017-04-04 15:45:41 +01:00 committed by GitHub
parent a93692e434
commit b5c6f6053a
10 changed files with 13 additions and 12 deletions

View File

@ -135,8 +135,9 @@ dependencies {
compile project(':node') compile project(':node')
compile "com.google.guava:guava:$guava_version" compile "com.google.guava:guava:$guava_version"
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts') // Set to compile to ensure it exists now deploy nodes no longer relies on build
runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') compile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
compile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
// For the buildCordappDependenciesJar task // For the buildCordappDependenciesJar task
runtime project(':client:jfx') runtime project(':client:jfx')
@ -173,7 +174,7 @@ tasks.withType(Test) {
reports.html.destination = file("${reporting.baseDir}/${name}") reports.html.destination = file("${reporting.baseDir}/${name}")
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" directory "./build/nodes"
networkMap "Controller" networkMap "Controller"
node { node {

View File

@ -192,7 +192,7 @@ is a three node example;
.. code-block:: text .. code-block:: text
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" // The output directory directory "./build/nodes" // The output directory
networkMap "Controller" // The artemis address of the node named here will be used as the networkMapService.address on all other nodes. networkMap "Controller" // The artemis address of the node named here will be used as the networkMapService.address on all other nodes.
node { node {

View File

@ -74,7 +74,7 @@ task integrationTest(type: Test) {
classpath = sourceSets.integrationTest.runtimeClasspath classpath = sourceSets.integrationTest.runtimeClasspath
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" directory "./build/nodes"
networkMap "Notary" networkMap "Notary"
node { node {

View File

@ -772,7 +772,7 @@ like to deploy for testing. See further details below:
.. sourcecode:: groovy .. sourcecode:: groovy
task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./kotlin-source/build/nodes" // The output directory. directory "./kotlin-source/build/nodes" // The output directory.
networkMap "Controller" // The artemis address of the node to be used as the network map. networkMap "Controller" // The artemis address of the node to be used as the network map.
node { node {

View File

@ -51,7 +51,7 @@ dependencies {
} }
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
ext.rpcUsers = [ ['user' : "demo", 'password' : "demo", 'permissions' : ["StartFlow.net.corda.flows.FinalityFlow"]] ] ext.rpcUsers = [ ['user' : "demo", 'password' : "demo", 'permissions' : ["StartFlow.net.corda.flows.FinalityFlow"]] ]
directory "./build/nodes" directory "./build/nodes"

View File

@ -48,7 +48,7 @@ dependencies {
compile "org.glassfish.jersey.core:jersey-server:${jersey_version}" compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" directory "./build/nodes"
// This name "Notary" is hard-coded into BankOfCordaClientApi so if you change it here, change it there too. // This name "Notary" is hard-coded into BankOfCordaClientApi so if you change it here, change it there too.
// In this demo the node that runs a standalone notary also acts as the network map server. // In this demo the node that runs a standalone notary also acts as the network map server.

View File

@ -54,7 +54,7 @@ dependencies {
compile "com.squareup.okhttp3:okhttp:$okhttp_version" compile "com.squareup.okhttp3:okhttp:$okhttp_version"
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" directory "./build/nodes"
networkMap "Notary" networkMap "Notary"
node { node {

View File

@ -73,7 +73,7 @@ task generateNotaryIdentity(type: JavaExec) {
args = [nodeDirs, notaryType, notaryName] args = [nodeDirs, notaryType, notaryName]
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build', 'generateNotaryIdentity']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateNotaryIdentity']) {
directory deployTo directory deployTo
networkMap "Notary 1" networkMap "Notary 1"
node { node {

View File

@ -65,7 +65,7 @@ dependencies {
compile "com.opengamma.strata:strata-math:${strata_version}" compile "com.opengamma.strata:strata-math:${strata_version}"
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
directory "./build/nodes" directory "./build/nodes"
networkMap "Controller" networkMap "Controller"
node { node {

View File

@ -58,7 +58,7 @@ dependencies {
// Specify your cordapp's dependencies below, including dependent cordapps // Specify your cordapp's dependencies below, including dependent cordapps
} }
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) { task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
ext.rpcUsers = [['user': "demo", 'password': "demo", 'permissions': [ ext.rpcUsers = [['user': "demo", 'password': "demo", 'permissions': [
'StartFlow.net.corda.flows.IssuerFlow$IssuanceRequester', 'StartFlow.net.corda.flows.IssuerFlow$IssuanceRequester',
"StartFlow.net.corda.traderdemo.flow.SellerFlow" "StartFlow.net.corda.traderdemo.flow.SellerFlow"