From b009e9215671ba5a7caf3ed0298889bccbb9693b Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Tue, 22 Oct 2019 16:55:39 -0700
Subject: [PATCH] xds: Bump perfmark to 0.19.0

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

diff --git a/build.gradle b/build.gradle
index 146487635b..2dc5a4a347 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,7 +118,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.8.5",
             guava: "com.google.guava:guava:${guavaVersion}",
             hpack: 'com.twitter:hpack:0.10.1',
@@ -134,7 +134,7 @@ subprojects {
             opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
             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.17.0',
+            perfmark: 'io.perfmark:perfmark-api:0.19.0',
             pgv: 'io.envoyproxy.protoc-gen-validate:pgv-java-stub:0.2.0',
             protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
             protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
diff --git a/examples/pom.xml b/examples/pom.xml
index feb3748d81..ea29e0f38e 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 bf5a9ca906..aba171f2c9 100644
--- a/grpclb/build.gradle
+++ b/grpclb/build.gradle
@@ -18,6 +18,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 57d71f1129..d3f3070d9f 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -436,9 +436,9 @@ def io_opencensus_grpc_metrics():
 def io_perfmark():
     jvm_maven_import_external(
         name = "io_perfmark_perfmark_api",
-        artifact = "io.perfmark:perfmark-api:0.17.0",
+        artifact = "io.perfmark:perfmark-api:0.19.0",
         server_urls = ["http://central.maven.org/maven2"],
-        artifact_sha256 = "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9",
+        artifact_sha256 = "b734ba2149712409a44eabdb799f64768578fee0defe1418bb108fe32ea43e1a",
         licenses = ["notice"],  # Apache 2.0
     )
 
diff --git a/services/build.gradle b/services/build.gradle
index 2907c7007d..fc38bc91ba 100644
--- a/services/build.gradle
+++ b/services/build.gradle
@@ -25,6 +25,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 f4d452869f..7f51d6e4da 100644
--- a/xds/build.gradle
+++ b/xds/build.gradle
@@ -32,6 +32,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