Skip to content

Commit 791fa62

Browse files
keshavpeswaniashishagg
authored andcommitted
Migrating grpc from 1.7.0 to 1.9.0 as it provides support for shaded netty jar (#50)
1 parent 22dabb7 commit 791fa62

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<dependency>
3434
<groupId>io.grpc</groupId>
35-
<artifactId>grpc-netty</artifactId>
35+
<artifactId>grpc-netty-shaded</artifactId>
3636
</dependency>
3737

3838
<dependency>

core/src/main/java/com/expedia/www/haystack/client/dispatchers/clients/GRPCAgentClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Arrays;
2020
import java.util.concurrent.TimeUnit;
2121

22+
2223
import org.slf4j.Logger;
2324
import org.slf4j.LoggerFactory;
2425

@@ -36,8 +37,8 @@
3637
import com.expedia.www.haystack.client.metrics.Timer.Sample;
3738

3839
import io.grpc.ManagedChannel;
39-
import io.grpc.netty.NegotiationType;
40-
import io.grpc.netty.NettyChannelBuilder;
40+
import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
41+
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
4142
import io.grpc.stub.StreamObserver;
4243

4344
public class GRPCAgentClient implements Client {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<mockito.version>1.9.5</mockito.version>
5252
<awaitility.version>3.0.0</awaitility.version>
5353
<commonslang3.version>3.7</commonslang3.version>
54-
<grpc.version>1.7.0</grpc.version>
54+
<grpc.version>1.9.0</grpc.version>
5555
<jaxrs.version>2.1</jaxrs.version>
5656
<micrometer.version>1.0.1</micrometer.version>
5757

@@ -115,7 +115,7 @@
115115
<!-- grpc -->
116116
<dependency>
117117
<groupId>io.grpc</groupId>
118-
<artifactId>grpc-netty</artifactId>
118+
<artifactId>grpc-netty-shaded</artifactId>
119119
<version>${grpc.version}</version>
120120
</dependency>
121121
<dependency>

0 commit comments

Comments
 (0)