mirror of
https://github.com/corda/corda.git
synced 2025-06-19 23:53:52 +00:00
Ensure Node uses only a single version of Netty. (#343)
* Ensure Node uses only a single version of Netty. * Use string version of Gradle dependency.
This commit is contained in:
@ -24,6 +24,7 @@ buildscript {
|
|||||||
ext.guava_version = '19.0'
|
ext.guava_version = '19.0'
|
||||||
ext.quickcheck_version = '0.7'
|
ext.quickcheck_version = '0.7'
|
||||||
ext.okhttp_version = '3.5.0'
|
ext.okhttp_version = '3.5.0'
|
||||||
|
ext.netty_version = '4.1.5.Final'
|
||||||
ext.typesafe_config_version = '1.3.1'
|
ext.typesafe_config_version = '1.3.1'
|
||||||
ext.junit_version = '4.12'
|
ext.junit_version = '4.12'
|
||||||
ext.jopt_simple_version = '5.0.2'
|
ext.jopt_simple_version = '5.0.2'
|
||||||
|
@ -23,6 +23,12 @@ configurations {
|
|||||||
// we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
|
// we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
|
||||||
runtime.exclude module: 'isolated'
|
runtime.exclude module: 'isolated'
|
||||||
|
|
||||||
|
compile {
|
||||||
|
// We don't need these because we already include netty-all.
|
||||||
|
exclude group: 'io.netty', module: 'netty-transport'
|
||||||
|
exclude group: 'io.netty', module: 'netty-handler'
|
||||||
|
}
|
||||||
|
|
||||||
integrationTestCompile.extendsFrom testCompile
|
integrationTestCompile.extendsFrom testCompile
|
||||||
integrationTestRuntime.extendsFrom testRuntime
|
integrationTestRuntime.extendsFrom testRuntime
|
||||||
}
|
}
|
||||||
@ -145,7 +151,10 @@ dependencies {
|
|||||||
// Java Atomix: RAFT library
|
// Java Atomix: RAFT library
|
||||||
compile 'io.atomix.copycat:copycat-client:1.1.4'
|
compile 'io.atomix.copycat:copycat-client:1.1.4'
|
||||||
compile 'io.atomix.copycat:copycat-server:1.1.4'
|
compile 'io.atomix.copycat:copycat-server:1.1.4'
|
||||||
compile 'io.atomix.catalyst:catalyst-netty:1.1.1'
|
compile 'io.atomix.catalyst:catalyst-netty:1.1.2'
|
||||||
|
|
||||||
|
// Netty: All of it.
|
||||||
|
compile "io.netty:netty-all:$netty_version"
|
||||||
|
|
||||||
// OkHTTP: Simple HTTP library.
|
// OkHTTP: Simple HTTP library.
|
||||||
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
|
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
|
||||||
|
Reference in New Issue
Block a user