ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1832: Configure Quasar dependency using quasar-utils plugin. (#3685)

Browse Source
This commit is contained in:
Chris Rankin 2018-07-24 20:19:12 +01:00 committed by GitHub
parent 757181e26d
commit 0b0ad71b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confidential-identities/build.gradle
View File

@ -13,11 +13,6 @@ description 'Corda Experimental Confidential Identities'
dependencies { dependencies {
compile project(':core') 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 "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"

2
constants.properties
View File

@ -1,4 +1,4 @@
gradlePluginsVersion=4.0.27 gradlePluginsVersion=4.0.28
kotlinVersion=1.2.51 kotlinVersion=1.2.51
platformVersion=4 platformVersion=4
guavaVersion=25.1-jre guavaVersion=25.1-jre

5
core/build.gradle
View File

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

6
node/build.gradle
View File

@ -48,7 +48,7 @@ sourceSets {
jib.container { jib.container {
mainClass = "net.corda.node.Corda" mainClass = "net.corda.node.Corda"
args = ['--log-to-console', '--no-local-shell', '--config-file=/config/node.conf'] 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. // Use manual resource copying of log4j2.xml rather than source sets.
@ -72,8 +72,6 @@ dependencies {
compile project(':tools:shell') compile project(':tools:shell')
compile "net.corda.plugins:cordform-common:$gradle_plugins_version" 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) // Log4J: logging framework (with SLF4J bindings)
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
compile "org.apache.logging.log4j:log4j-web:${log4j_version}" compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
@ -85,7 +83,7 @@ dependencies {
// Kryo: object graph serialization. // Kryo: object graph serialization.
compile "com.esotericsoftware:kryo:4.0.0" 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" compile "com.google.guava:guava:$guava_version"