From ee8eac4516301043414a77d0bc9f0e29ab309f7a Mon Sep 17 00:00:00 2001 From: Ronan Browne Date: Tue, 8 Mar 2022 10:50:59 +0000 Subject: [PATCH] NOTICK: release support optionally exclude shell dependency --- .ci/dev/regression/Jenkinsfile | 1 + samples/attachment-demo/build.gradle | 4 +++- samples/bank-of-corda-demo/build.gradle | 4 +++- samples/cordapp-configuration/build.gradle | 4 +++- samples/irs-demo/cordapp/build.gradle | 4 +++- samples/network-verifier/build.gradle | 4 +++- samples/notary-demo/build.gradle | 4 +++- samples/simm-valuation-demo/build.gradle | 5 +++-- samples/trader-demo/build.gradle | 4 +++- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 5a4137af2a..980d7a4593 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -49,6 +49,7 @@ String COMMON_GRADLE_PARAMS = [ '--info', '-Pcompilation.warningsAsErrors=false', '-Ptests.failFast=true', + '-DexcludeShell', ].join(' ') pipeline { diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle index 7d4f973a63..02fa732184 100644 --- a/samples/attachment-demo/build.gradle +++ b/samples/attachment-demo/build.gradle @@ -31,7 +31,9 @@ configurations { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version" compile "javax.servlet:javax.servlet-api:${servlet_version}" diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle index 0b12928f0b..11d398ce8b 100644 --- a/samples/bank-of-corda-demo/build.gradle +++ b/samples/bank-of-corda-demo/build.gradle @@ -6,7 +6,9 @@ apply plugin: 'net.corda.plugins.cordapp' apply plugin: 'net.corda.plugins.cordformation' dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" // The bank of corda CorDapp depends upon Cash CorDapp features diff --git a/samples/cordapp-configuration/build.gradle b/samples/cordapp-configuration/build.gradle index efa92053c5..5f1155c184 100644 --- a/samples/cordapp-configuration/build.gradle +++ b/samples/cordapp-configuration/build.gradle @@ -3,7 +3,9 @@ apply plugin: 'idea' apply plugin: 'net.corda.plugins.cordformation' dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } runtimeOnly project(':node-api') // Cordformation needs a SLF4J implementation when executing the Network // Bootstrapper, but Log4J doesn't shutdown completely from within Gradle. diff --git a/samples/irs-demo/cordapp/build.gradle b/samples/irs-demo/cordapp/build.gradle index 625a9e20e6..71d0428949 100644 --- a/samples/irs-demo/cordapp/build.gradle +++ b/samples/irs-demo/cordapp/build.gradle @@ -27,7 +27,9 @@ cordapp { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } cordapp project(':finance:contracts') cordapp project(':finance:workflows') diff --git a/samples/network-verifier/build.gradle b/samples/network-verifier/build.gradle index 9aaef448ed..1cd1c9f4b8 100644 --- a/samples/network-verifier/build.gradle +++ b/samples/network-verifier/build.gradle @@ -12,7 +12,9 @@ cordapp { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } // Cordformation needs this for the Network Bootstrapper. runtimeOnly project(':node-api') diff --git a/samples/notary-demo/build.gradle b/samples/notary-demo/build.gradle index bcaeac96af..6f87b55b35 100644 --- a/samples/notary-demo/build.gradle +++ b/samples/notary-demo/build.gradle @@ -15,7 +15,9 @@ cordapp { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" cordaCompile project(':client:rpc') // Corda integration dependencies diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle index ef95f82e5c..0609747f93 100644 --- a/samples/simm-valuation-demo/build.gradle +++ b/samples/simm-valuation-demo/build.gradle @@ -26,9 +26,10 @@ configurations { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } cordaCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - // The SIMM demo CorDapp depends upon Cash CorDapp features cordapp project(':finance:contracts') cordapp project(':finance:workflows') diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle index 8b38fdc80d..0b5272f7a7 100644 --- a/samples/trader-demo/build.gradle +++ b/samples/trader-demo/build.gradle @@ -32,7 +32,9 @@ configurations { } dependencies { - cordaDriver "net.corda:corda-shell:$corda_release_version" + if (System.getProperty('excludeShell') == null) { + cordaDriver "net.corda:corda-shell:$corda_release_version" + } compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "net.sf.jopt-simple:jopt-simple:$jopt_simple_version" cordaCompile project(':client:rpc')