MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve gRPC/Netty version conflicts

This commit is contained in:
Jon Chambers 2022-10-06 16:08:06 -04:00 committed by Jon Chambers
parent d3d4916d6c
commit 308437ec93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -49,7 +49,7 @@
<commons-io.version>2.9.0</commons-io.version> <commons-io.version>2.9.0</commons-io.version>
<dropwizard.version>2.0.32</dropwizard.version> <dropwizard.version>2.0.32</dropwizard.version>
<dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version> <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
<grpc.version>1.46.0</grpc.version> <grpc.version>1.49.0</grpc.version>
<gson.version>2.9.0</gson.version> <gson.version>2.9.0</gson.version>
<guava.version>30.1.1-jre</guava.version> <guava.version>30.1.1-jre</guava.version>
<jackson.version>2.13.3</jackson.version> <jackson.version>2.13.3</jackson.version>
@ -62,7 +62,7 @@
<logstash.logback.version>7.0.1</logstash.logback.version> <logstash.logback.version>7.0.1</logstash.logback.version>
<micrometer.version>1.9.3</micrometer.version> <micrometer.version>1.9.3</micrometer.version>
<mockito.version>4.7.0</mockito.version> <mockito.version>4.7.0</mockito.version>
<netty.version>4.1.79.Final</netty.version> <netty.version>4.1.82.Final</netty.version>
<opentest4j.version>1.2.0</opentest4j.version> <opentest4j.version>1.2.0</opentest4j.version>
<protobuf.version>3.21.7</protobuf.version> <protobuf.version>3.21.7</protobuf.version>
<pushy.version>0.15.1</pushy.version> <pushy.version>0.15.1</pushy.version>
@ -97,7 +97,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId> <artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version> <version>${grpc.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>