Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<modules>
<module>client</module>
<module>example</module>
<module>grpc-client</module>
<module>grpc-client</module>
<module>hadoop</module>
<module>jdbc</module>
</modules>
Expand Down Expand Up @@ -68,6 +68,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Define versions which are also used by grpc-client/pom.xml. -->
<grpc.version>1.16.0</grpc.version>
<!-- NOTE Netty handler and boring SSL must be kept compatible with grpc
https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty -->
<netty.handler.version>4.1.30.Final</netty.handler.version>
<tcnative.boring.ssl.version>2.0.17.Final</tcnative.boring.ssl.version>

<protobuf.java.version>3.6.1</protobuf.java.version>
<protobuf.protoc.version>3.6.1</protobuf.protoc.version>
</properties>
Expand Down Expand Up @@ -130,14 +135,14 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.27.Final</version>
<version>${netty.handler.version}</version>
</dependency>
<!-- TODO(mberlin): When we upgrade grpc, check if we can remove this. Without,
grpc-client TLS tests fail with error "Jetty ALPN/NPN has not been properly configured.". -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.17.Final</version>
<version>${tcnative.boring.ssl.version}</version>
</dependency>

<dependency>
Expand Down