Skip to content

Commit c1f1ac3

Browse files
authored
Merge branch 'master' into shaded
2 parents 35c7364 + 9bce19b commit c1f1ac3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protobuf {
6666
// The version of protoc must match protobuf-java. If you don't depend on
6767
// protobuf-java directly, you will be transitively depending on the
6868
// protobuf-java version that grpc depends on.
69-
artifact = "com.google.protobuf:protoc:4.28.2"
69+
artifact = "com.google.protobuf:protoc:4.28.3"
7070
}
7171
plugins {
7272
grpc {
@@ -128,7 +128,7 @@ dependencies {
128128
// Explicit matching of protobuf-java and protoc versions to address
129129
// compilation errors arising due to transitive dependency on the version of
130130
// protobuf-java that grpc depends on.
131-
implementation "com.google.protobuf:protobuf-java:4.28.2"
131+
implementation "com.google.protobuf:protobuf-java:4.28.3"
132132

133133
testImplementation "io.opencensus:opencensus-api:${openCensusVersion}"
134134
testImplementation "io.opencensus:opencensus-exporter-trace-jaeger:${openCensusVersion}"

samples/concurrent-modification/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<plugin>
2121
<groupId>org.codehaus.mojo</groupId>
2222
<artifactId>exec-maven-plugin</artifactId>
23-
<version>3.4.1</version>
23+
<version>3.5.0</version>
2424
<configuration>
2525
<mainClass>io.dgraph.example.MultiThreadedMutationLauncher</mainClass>
2626
</configuration>

0 commit comments

Comments
 (0)