From 06bc91f4c90aebe78ded27282fba6949acc69478 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Wed, 23 Oct 2019 11:39:17 -0700
Subject: [PATCH] all: Bump perfmark to 0.19.0

Resolves #6217
---
 build.gradle          | 3 ++-
 examples/pom.xml      | 5 +++++
 grpclb/build.gradle   | 2 ++
 repositories.bzl      | 4 ++--
 services/build.gradle | 2 ++
 xds/build.gradle      | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 21f1848c3e6..7518e4f60d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,7 +185,7 @@ subprojects {
         libraries = [
             android_annotations: "com.google.android:annotations:4.1.1.4",
             animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
-            errorprone: "com.google.errorprone:error_prone_annotations:2.3.2",
+            errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
             gson: "com.google.code.gson:gson:2.7",
             guava: "com.google.guava:guava:${guavaVersion}",
             hpack: 'com.twitter:hpack:0.10.1',
@@ -202,6 +202,7 @@ subprojects {
             opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
             instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
             perfmark: 'io.perfmark:perfmark-api:0.16.0',
+            perfmark: 'io.perfmark:perfmark-api:0.19.0',
             protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
             protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
             protoc_lite: "com.google.protobuf:protoc-gen-javalite:3.0.0",
diff --git a/examples/pom.xml b/examples/pom.xml
index 246580b8be1..1b2c6f7507a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -62,6 +62,11 @@
       <artifactId>protobuf-java-util</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+      <version>2.3.3</version> <!-- prefer to use 2.3.3 or later -->
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/grpclb/build.gradle b/grpclb/build.gradle
index e141bcd346a..42dff514f3c 100644
--- a/grpclb/build.gradle
+++ b/grpclb/build.gradle
@@ -16,6 +16,8 @@ dependencies {
     compile (libraries.protobuf_util) {
         // prefer 26.0-android from libraries instead of 20.0
         exclude group: 'com.google.guava', module: 'guava'
+        // prefer 2.3.3 from libraries instead of 2.3.2
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
     }
     compileOnly libraries.javax_annotation
     testCompile libraries.truth,
diff --git a/repositories.bzl b/repositories.bzl
index c77df330382..3fea3c19191 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -408,9 +408,9 @@ def io_opencensus_grpc_metrics():
 def io_perfmark():
     jvm_maven_import_external(
         name = "io_perfmark_perfmark_api",
-        artifact = "io.perfmark:perfmark-api:0.16.0",
+        artifact = "io.perfmark:perfmark-api:0.19.0",
         server_urls = ["http://central.maven.org/maven2"],
-        artifact_sha256 = "a93667875ea9d10315177768739a18d6c667df041c982d2841645ae8558d0af0",
+        artifact_sha256 = "b734ba2149712409a44eabdb799f64768578fee0defe1418bb108fe32ea43e1a",
         licenses = ["notice"],  # Apache 2.0
     )
 
diff --git a/services/build.gradle b/services/build.gradle
index 9c87031d269..a95b1182b2e 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -24,6 +24,8 @@ dependencies {
     compile (libraries.protobuf_util) {
         // prefer 26.0-android from libraries instead of 20.0
         exclude group: 'com.google.guava', module: 'guava'
+        // prefer 2.3.3 from libraries instead of 2.3.2
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
     }
 
     compileOnly libraries.javax_annotation
diff --git a/xds/build.gradle b/xds/build.gradle
index e4be55bafce..8d4fea437c5 100644
--- a/xds/build.gradle
+++ b/xds/build.gradle
@@ -29,6 +29,8 @@ dependencies {
     compile (libraries.protobuf_util) {
         // prefer 26.0-android from libraries instead of 20.0
         exclude group: 'com.google.guava', module: 'guava'
+        // prefer 2.3.3 from libraries instead of 2.3.2
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
     }
 
     testCompile project(':grpc-core').sourceSets.test.output