diff --git a/confidential-identities/build.gradle b/confidential-identities/build.gradle index dc60215773..6b5616d000 100644 --- a/confidential-identities/build.gradle +++ b/confidential-identities/build.gradle @@ -13,11 +13,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" diff --git a/constants.properties b/constants.properties index 5316805e68..17c2da9942 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=4.0.27 +gradlePluginsVersion=4.0.28 kotlinVersion=1.2.51 platformVersion=4 guavaVersion=25.1-jre diff --git a/core/build.gradle b/core/build.gradle index 999cd1c053..0039fa25af 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -71,11 +71,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" diff --git a/node/build.gradle b/node/build.gradle index 5be94a98bd..5dd2c2503b 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -48,7 +48,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. @@ -72,8 +72,6 @@ dependencies { compile project(':tools:shell') 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}" @@ -85,7 +83,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"