NOTICK: release support optionally exclude shell dependency

This commit is contained in:
Ronan Browne 2022-03-08 10:50:59 +00:00
parent 3c2d6555cc
commit ee8eac4516
9 changed files with 25 additions and 9 deletions

View File

@ -49,6 +49,7 @@ String COMMON_GRADLE_PARAMS = [
'--info',
'-Pcompilation.warningsAsErrors=false',
'-Ptests.failFast=true',
'-DexcludeShell',
].join(' ')
pipeline {

View File

@ -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}"

View File

@ -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

View File

@ -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.

View File

@ -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')

View File

@ -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')

View File

@ -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

View File

@ -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')

View File

@ -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')