Merge remote-tracking branch 'origin/release/os/4.9' into release/os/4.9

client/jfx/build.gradle

@@ -55,7 +55,9 @@ dependencies {
     // TODO: remove the forced update of commons-collections and beanutils when artemis updates them
     compile "org.apache.commons:commons-collections4:${commons_collections_version}"
     compile "commons-beanutils:commons-beanutils:${beanutils_version}"
-    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
+    compile("org.apache.activemq:artemis-core-client:${artemis_version}") {
+        exclude group: 'org.jgroups', module: 'jgroups'
+    }
 
     // Unit testing helpers.
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"

node-api/build.gradle

@@ -17,7 +17,9 @@ dependencies {
     // TODO: remove the forced update of commons-collections and beanutils when artemis updates them
     compile "org.apache.commons:commons-collections4:${commons_collections_version}"
     compile "commons-beanutils:commons-beanutils:${beanutils_version}"
-    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
+    compile("org.apache.activemq:artemis-core-client:${artemis_version}") {
+        exclude group: 'org.jgroups', module: 'jgroups'
+    }
     compile "org.apache.activemq:artemis-commons:${artemis_version}"
 
     compile "io.netty:netty-handler-proxy:$netty_version"
@@ -62,6 +64,7 @@ dependencies {
     compile ("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
         // Gains our proton-j version from core module.
         exclude group: 'org.apache.qpid', module: 'proton-j'
+        exclude group: 'org.jgroups', module: 'jgroups'
     }
 }
 

node/build.gradle

@@ -127,11 +127,17 @@ dependencies {
     // TODO: remove the forced update of commons-collections and beanutils when artemis updates them
     compile "org.apache.commons:commons-collections4:${commons_collections_version}"
     compile "commons-beanutils:commons-beanutils:${beanutils_version}"
-    compile "org.apache.activemq:artemis-server:${artemis_version}"
-    compile "org.apache.activemq:artemis-core-client:${artemis_version}"
+    compile("org.apache.activemq:artemis-server:${artemis_version}") {
+        exclude group: 'org.apache.commons', module: 'commons-dbcp2'
+        exclude group: 'org.jgroups', module: 'jgroups'
+    }
+    compile("org.apache.activemq:artemis-core-client:${artemis_version}") {
+        exclude group: 'org.jgroups', module: 'jgroups'
+    }
     runtime("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
         // Gains our proton-j version from core module.
         exclude group: 'org.apache.qpid', module: 'proton-j'
+        exclude group: 'org.jgroups', module: 'jgroups'
     }
 
     // Manifests: for reading stuff from the manifest file

samples/attachment-demo/build.gradle

@@ -31,6 +31,7 @@ configurations {
 }
 
 dependencies {
+    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}"

samples/bank-of-corda-demo/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.cordformation'
 
 dependencies {
+    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

samples/cordapp-configuration/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'idea'
 apply plugin: 'net.corda.plugins.cordformation'
 
 dependencies {
+    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.

samples/irs-demo/cordapp/build.gradle

@@ -27,6 +27,7 @@ cordapp {
 }
 
 dependencies {
+    cordaDriver "net.corda:corda-shell:$corda_release_version"
     cordapp project(':finance:contracts')
     cordapp project(':finance:workflows')
 

samples/network-verifier/build.gradle

@@ -12,6 +12,7 @@ cordapp {
 }
 
 dependencies {
+    cordaDriver "net.corda:corda-shell:$corda_release_version"
     // Cordformation needs this for the Network Bootstrapper.
     runtimeOnly project(':node-api')
 

samples/notary-demo/build.gradle

@@ -15,6 +15,7 @@ cordapp {
 }
 
 dependencies {
+    cordaDriver "net.corda:corda-shell:$corda_release_version"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     cordaCompile project(':client:rpc')
     // Corda integration dependencies

samples/simm-valuation-demo/build.gradle

@@ -26,6 +26,7 @@ configurations {
 }
 
 dependencies {
+    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

samples/trader-demo/build.gradle

@@ -32,6 +32,7 @@ configurations {
 }
 
 dependencies {
+    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')