Skip to content

Commit 4fe0776

Browse files
authored
all: Bump perfmark to 0.19.0 (backport to v1.24.x)
Resolves #6217
1 parent 105d41a commit 4fe0776

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ subprojects {
185185
libraries = [
186186
android_annotations: "com.google.android:annotations:4.1.1.4",
187187
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
188-
errorprone: "com.google.errorprone:error_prone_annotations:2.3.2",
188+
errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
189189
gson: "com.google.code.gson:gson:2.7",
190190
guava: "com.google.guava:guava:${guavaVersion}",
191191
hpack: 'com.twitter:hpack:0.10.1',
@@ -201,7 +201,7 @@ subprojects {
201201
opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
202202
opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
203203
instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
204-
perfmark: 'io.perfmark:perfmark-api:0.17.0',
204+
perfmark: 'io.perfmark:perfmark-api:0.19.0',
205205
protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
206206
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
207207
protoc_lite: "com.google.protobuf:protoc-gen-javalite:3.0.0",

examples/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@
6262
<artifactId>protobuf-java-util</artifactId>
6363
<version>${protobuf.version}</version>
6464
</dependency>
65+
<dependency>
66+
<groupId>com.google.errorprone</groupId>
67+
<artifactId>error_prone_annotations</artifactId>
68+
<version>2.3.3</version> <!-- prefer to use 2.3.3 or later -->
69+
</dependency>
6570
<dependency>
6671
<groupId>junit</groupId>
6772
<artifactId>junit</artifactId>

grpclb/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ dependencies {
1616
compile (libraries.protobuf_util) {
1717
// prefer 26.0-android from libraries instead of 20.0
1818
exclude group: 'com.google.guava', module: 'guava'
19+
// prefer 2.3.3 from libraries instead of 2.3.2
20+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
1921
}
2022
compileOnly libraries.javax_annotation
2123
testCompile libraries.truth,

repositories.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,9 @@ def io_opencensus_grpc_metrics():
450450
def io_perfmark():
451451
jvm_maven_import_external(
452452
name = "io_perfmark_perfmark_api",
453-
artifact = "io.perfmark:perfmark-api:0.17.0",
453+
artifact = "io.perfmark:perfmark-api:0.19.0",
454454
server_urls = ["http://central.maven.org/maven2"],
455-
artifact_sha256 = "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9",
455+
artifact_sha256 = "b734ba2149712409a44eabdb799f64768578fee0defe1418bb108fe32ea43e1a",
456456
licenses = ["notice"], # Apache 2.0
457457
)
458458

services/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ dependencies {
2424
compile (libraries.protobuf_util) {
2525
// prefer 26.0-android from libraries instead of 20.0
2626
exclude group: 'com.google.guava', module: 'guava'
27+
// prefer 2.3.3 from libraries instead of 2.3.2
28+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
2729
}
2830

2931
compileOnly libraries.javax_annotation

xds/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ dependencies {
3030
compile (libraries.protobuf_util) {
3131
// prefer 26.0-android from libraries instead of 20.0
3232
exclude group: 'com.google.guava', module: 'guava'
33+
// prefer 2.3.3 from libraries instead of 2.3.2
34+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
3335
}
3436

3537
testCompile project(':grpc-core').sourceSets.test.output

0 commit comments

Comments
 (0)