Merge commit '0b0ad71b3c38c176f85501882de0d4f4c884bfc6' into chrisr3-os-merge

bridge/build.gradle

@@ -55,6 +55,7 @@ dependencies {
     // Here we pull in dependencies that would normally be pulled in transitively from :core and :node-api, but we need more fine grained control
     // For AMQP serialisation.
     compile "org.apache.qpid:proton-j:${protonj_version}"
+    compile "com.google.guava:guava:$guava_version"
     // RxJava: observable streams of events.
     compile "io.reactivex:rxjava:$rxjava_version"
     compile("org.apache.activemq:artemis-core-client:${artemis_version}")

confidential-identities/build.gradle

@@ -23,11 +23,6 @@ description 'Corda Experimental Confidential Identities'
 dependencies {
     compile project(':core')
 
-    // Quasar, for suspendable fibres.
-    compileOnly("$quasar_group:quasar-core:$quasar_version:jdk8") {
-        transitive = false
-    }
-
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile "junit:junit:$junit_version"
 

constants.properties

@@ -8,7 +8,7 @@
 # Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
 #
 
-gradlePluginsVersion=4.0.27
+gradlePluginsVersion=4.0.28
 kotlinVersion=1.2.51
 platformVersion=4
 guavaVersion=25.1-jre

core/build.gradle

@@ -84,11 +84,6 @@ dependencies {
     // Hamkrest, for fluent, composable matchers
     testCompile "com.natpryce:hamkrest:$hamkrest_version"
 
-    // Quasar, for suspendable fibres.
-    compileOnly("$quasar_group:quasar-core:$quasar_version:jdk8") {
-        transitive = false
-    }
-
     // Thread safety annotations
     compile "com.google.code.findbugs:jsr305:$jsr305_version"
 

node/build.gradle

@@ -58,7 +58,7 @@ sourceSets {
 jib.container {
   mainClass = "net.corda.node.Corda"
   args = ['--log-to-console', '--no-local-shell', '--config-file=/config/node.conf']
-  jvmFlags = ['-Xmx1g', '-javaagent:/app/libs/quasar-core-0.7.10.jar']
+  jvmFlags = ['-Xmx1g', "-javaagent:/app/libs/quasar-core-${quasar_version}.jar"]
 }
 
 // Use manual resource copying of log4j2.xml rather than source sets.
@@ -83,8 +83,6 @@ dependencies {
 
     compile "net.corda.plugins:cordform-common:$gradle_plugins_version"
 
-    compile group: 'co.paralleluniverse', name: 'quasar-core', version: '0.7.10:jdk8@jar'
-
     // Log4J: logging framework (with SLF4J bindings)
     compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
     compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
@@ -96,7 +94,7 @@ dependencies {
 
     // Kryo: object graph serialization.
     compile "com.esotericsoftware:kryo:4.0.0"
-    compile "de.javakaffee:kryo-serializers:0.41"
+    compile "de.javakaffee:kryo-serializers:0.42"
 
     compile "com.google.guava:guava:$guava_version"