Skip to content

Commit 877ab03

Browse files
authored
Merge branch 'master' into feature/2pc
2 parents 5d22be4 + ca8a622 commit 877ab03

17 files changed

+18
-10546
lines changed

metrics/grafana/client_java_summary.json

Lines changed: 0 additions & 2105 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
<protobuf.version>3.18.0</protobuf.version>
5858
<log4j.version>1.2.17</log4j.version>
5959
<slf4j.version>1.7.16</slf4j.version>
60-
<grpc.version>1.48.0</grpc.version>
60+
<grpc.version>1.60.0</grpc.version>
6161
<netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
6262
<gson.version>2.8.9</gson.version>
6363
<powermock.version>1.6.6</powermock.version>
6464
<jackson-annotations.version>2.13.2</jackson-annotations.version>
6565
<jackson.version>2.13.4.2</jackson.version>
6666
<trove4j.version>3.0.1</trove4j.version>
67-
<jetcd.version>0.4.1</jetcd.version>
67+
<jetcd.version>0.7.7</jetcd.version>
6868
<joda-time.version>2.9.9</joda-time.version>
6969
<joda-convert.version>1.9.2</joda-convert.version>
7070
<proto.folder>${basedir}/proto</proto.folder>
@@ -188,20 +188,6 @@
188188
<dependency>
189189
<groupId>io.etcd</groupId>
190190
<artifactId>jetcd-core</artifactId>
191-
<exclusions>
192-
<exclusion>
193-
<groupId>io.etcd</groupId>
194-
<artifactId>jetcd-resolver</artifactId>
195-
</exclusion>
196-
<exclusion>
197-
<groupId>io.etcd</groupId>
198-
<artifactId>jetcd-common</artifactId>
199-
</exclusion>
200-
<exclusion>
201-
<groupId>io.grpc</groupId>
202-
<artifactId>grpc-grpclb</artifactId>
203-
</exclusion>
204-
</exclusions>
205191
<version>${jetcd.version}</version>
206192
</dependency>
207193
<dependency>

0 commit comments

Comments
 (0)