Skip to content

Commit

Permalink
Issue pravega#3299: Reduce dependencies in client (pravega#3300)
Browse files Browse the repository at this point in the history
- Reduce overly broad scope of dependencies on Netty and Grpc in the client.
- Remove unneeded dependency on Apache Curator.

Signed-off-by: Tom Kaitchuck <[email protected]>
  • Loading branch information
tkaitchuck authored and andreipaduroiu committed Jan 21, 2019
1 parent 488e111 commit 679c7b7
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 9 deletions.
20 changes: 12 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ project('shared:authplugin') {
}
}

project ('shared') {
project ('shared:cluster') {
dependencies {
compile project(':common')
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
Expand Down Expand Up @@ -174,19 +174,21 @@ project ('shared:metrics') {

project('shared:protocol') {
dependencies {
compile group: 'io.netty', name: 'netty-all', version: nettyVersion
compile project(':common')
compile group: 'io.netty', name: 'netty-transport', version: nettyVersion
compile group: 'io.netty', name: 'netty-handler', version: nettyVersion
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
testCompile project(':test:testcommon')
}
}

project('client') {
dependencies {
compile project(':common')
compile project(':shared')
compile project(':shared:authplugin')
compile project(':shared:protocol')
compile project(":shared:controller-api")
compile group: 'io.netty', name: 'netty-all', version: nettyVersion
compile group: 'io.netty', name: 'netty-transport-native-epoll', version: nettyVersion
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
testCompile project(':test:testcommon')
testCompile group: 'org.slf4j', name: 'log4j-over-slf4j', version: slf4jApiVersion
Expand Down Expand Up @@ -221,7 +223,7 @@ project('segmentstore:contracts') {
project('segmentstore:storage') {
dependencies {
compile project(':common')
compile project(':shared')
compile project(':shared:protocol')
compile project(':segmentstore:contracts')
compile project(':shared:metrics')
testCompile project(':test:testcommon')
Expand All @@ -233,6 +235,7 @@ project('segmentstore:storage:impl') {
compile project(':common')
compile project(':segmentstore:storage')
compile project(':shared:metrics')
compile group: 'org.apache.curator', name: 'curator-framework', version: apacheCuratorVersion
compile group: 'org.apache.bookkeeper', name: 'bookkeeper-server', version: bookKeeperVersion, withoutLogger
compile group: 'org.rocksdb', name: 'rocksdbjni', version: rocksdbjniVersion
testCompile project(':test:testcommon')
Expand Down Expand Up @@ -266,7 +269,6 @@ project ('bindings') {
project('segmentstore:server') {
dependencies {
compile project(':common')
compile project(':shared')
compile project(':segmentstore:contracts')
compile project(':segmentstore:storage')
compile project(':shared:metrics')
Expand Down Expand Up @@ -302,6 +304,7 @@ project('segmentstore:server:host') {
dependencies {
compile project(':common')
compile project(":shared:authplugin")
compile project(':shared:cluster')
compile project(':segmentstore:contracts')
compile project(':client')
compile project(':segmentstore:storage')
Expand Down Expand Up @@ -454,7 +457,7 @@ project('shared:controller-api') {
compile group: 'io.netty', name: 'netty-all', version: nettyVersion

compile "io.grpc:grpc-netty:" + grpcVersion
compile "io.grpc:grpc-all:" + grpcVersion
compile "io.grpc:grpc-auth:" + grpcVersion
compile "io.grpc:grpc-protobuf:" + grpcVersion
compile "io.grpc:grpc-stub:" + grpcVersion
compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: nettyBoringSSLVersion
Expand Down Expand Up @@ -506,8 +509,9 @@ project('controller') {

dependencies {
compile project(':common')
compile project(":shared:controller-api")
compile project(":shared:authplugin")
compile project(":shared:controller-api")
compile project(':shared:cluster')
compile project(":client")
compile project(":shared:metrics")
runtime group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
rootProject.name = 'pravega'

include 'common',
'shared',
'shared:cluster',
'shared:authplugin',
'shared:metrics',
'shared:protocol',
Expand Down

0 comments on commit 679c7b7

Please sign in to comment.