Update errorprone and checkerframework am: b1eedbcc69 am: f45b919f2c

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1740474

Change-Id: I53e937399c51de965c5b546901fdf9faf23975db

53 files changed, 177 insertions, 143 deletions

diff --git a/Android.bp b/Android.bp
index d7f9b99..6c10306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,17 +49,17 @@ license {
 java_import {
     name: "error_prone_annotations",
     host_supported: true,
-    jars: ["error_prone/error_prone_annotations-2.4.0.jar"],
+    jars: ["error_prone/error_prone_annotations-2.7.1.jar"],
 }
 
 java_import {
     name: "error_prone_core",
     host_supported: true,
     jars: [
-        "checkerframework/dataflow-2.5.3.jar",
-        "checkerframework/javacutil-2.5.3.jar",
-        "error_prone/error_prone_core-2.3.2-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.4.0.jar",
+        "checkerframework/dataflow-shaded-3.11.0.jar",
+        "checkerframework/javacutil-3.11.0.jar",
+        "error_prone/error_prone_core-2.7.1-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.7.1.jar",
         "javac/javac-9+181-r4173-1.jar",
         "jFormatString/jFormatString-3.0.0.jar",
     ],
@@ -69,7 +69,7 @@ java_import {
     name:  "error_prone_test_helpers",
     host_supported: true,
     jars: [
-        "error_prone/error_prone_test_helpers-2.3.2.jar",
+        "error_prone/error_prone_test_helpers-2.7.1.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index 89e814b..bd4565d 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -11,12 +11,12 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "http://repo1.maven.org/maven2/org/checkerframework/dataflow/2.5.3/dataflow-2.5.3-sources.jar"
+    value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/3.11.0/dataflow-shaded-3.11.0.jar"
   }
   url {
     type: ARCHIVE
-    value: "http://repo1.maven.org/maven2/org/checkerframework/javacutil/2.5.3/javacutil-2.5.3-sources.jar"
+    value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.11.0/javacutil-3.11.0.jar"
   }
-  version: "2.5.3"
-  last_upgrade_date { year: 2018 month: 10 day: 14}
+  version: "3.11.0"
+  last_upgrade_date { year: 2021 month: 6 day: 16}
 }
diff --git a/checkerframework/dataflow-2.5.3-sources.jar b/checkerframework/dataflow-2.5.3-sources.jar
deleted file mode 100644
index 490c982..0000000
--- a/checkerframework/dataflow-2.5.3-sources.jar
+++ /dev/null
diff --git a/checkerframework/dataflow-2.5.3-sources.jar.asc b/checkerframework/dataflow-2.5.3-sources.jar.asc
deleted file mode 100644
index b9e68aa..0000000
--- a/checkerframework/dataflow-2.5.3-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAABAgAGBQJbOnWZAAoJELFmmKSt9NY4SBoIAIFgbLiQsNTRyxV/3jxZoZp4
-GUB5y4NqcI1976JqZBcEOAvaL1VWibFrrnbf2V8+vV1QiNs1hO0XH8ITgFcJjQPD
-INHlI6z+CZgUqoHMqVIF+6WotlXdJD0dGlq7HkLEqqIoTv31yGpFgxmAwu3eIT/D
-yxOayfSuSCjYiJw/qaWGcuIKNVmVr2INTCeGirggDCebTKLWu3mD2IEYUFFatjMG
-xFwlAs1h42Xj8fAKQ9qDL8x9U/FOKFJ8AeQBf5ywD2B5S4zzlmzCBtxR7NDjt5qp
-8X4Akn9NFzh8V2dytvNm7kkmummZ0XxnQFBQvATEKb92DW65xRwH6E/tbx6cdfU=
-=nsvQ
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-2.5.3-sources.jar.sha1 b/checkerframework/dataflow-2.5.3-sources.jar.sha1
deleted file mode 100644
index 0720ac1..0000000
--- a/checkerframework/dataflow-2.5.3-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06742c4bc0168b46d40f691497d845bd8c7baed2
\ No newline at end of file
diff --git a/checkerframework/dataflow-2.5.3.jar b/checkerframework/dataflow-2.5.3.jar
deleted file mode 100644
index 7a93aaf..0000000
--- a/checkerframework/dataflow-2.5.3.jar
+++ /dev/null
diff --git a/checkerframework/dataflow-2.5.3.jar.asc b/checkerframework/dataflow-2.5.3.jar.asc
deleted file mode 100644
index b9aecaf..0000000
--- a/checkerframework/dataflow-2.5.3.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAABAgAGBQJbOnWSAAoJELFmmKSt9NY4/qEH/1JXhR+0CJi0Ndp4SIalm25f
-U4AF3tKn7D2O5gKkbjHu6cljpiuLRh8L6PIX4tXsSp5F73nhPKgYRAhLunoAfQyt
-IFzn9bS38GqLSVzcC4CduCY1JeitPOXM6KG5fFJJchryy9z4w2ayh5XTmEbWvNFg
-EFc/2HJ7H51Bn0G247XSfKFHepeWDPt7siP5qjJjp6AlpaJb/ToYwj/mGEeAKm38
-j1y/jNGJiTfeLWtr55rCn/5IIXDT1Cp4S1hkDbEBkqrVf9e0gvbujro9NNjt7SEs
-+k+ac7utiirqp1F2/vo/0QwEygdDI+q6RFk9vS7YclUJoa7InaQdxqalrtpBNiU=
-=E805
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-2.5.3.jar.sha1 b/checkerframework/dataflow-2.5.3.jar.sha1
deleted file mode 100644
index 85c152e..0000000
--- a/checkerframework/dataflow-2.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-edf284e0838290d661b22483ecf648065e7ec440
\ No newline at end of file
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar b/checkerframework/dataflow-shaded-3.11.0-sources.jar
new file mode 100644
index 0000000..f154e59
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0-sources.jar
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc b/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc
new file mode 100644
index 0000000..419a5c7
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgPVllAAoJELFmmKSt9NY4mGUH/il7UpoQzGkk1iElP2W2XohA
+IK7+4h+/OToWq7sCskDuhUPqkJsFgy/IdBawJ8B+dZItuNgXc6Viych1+zcxLddQ
+mFEMf70mJXatQEnjHwpCemUboDpcBqbBU1xS35zkvXlGr37LUyK6x9+RPIVGXV1h
+QoNmuIuiiSPeH2IDWHkt01PQCh6hp+MXG0458NmjvUCSGUWdR0O9j0rLEE8G4Ust
+r6jWrjM0fzE6KV3w/ZfoY505b9/+Re9rgaBZWpmdIuwanlE0LpZtkrtfpAdHcbHt
+qsKesF6vLM5dYL9lhuzC2n3yMoOn4rGieR6aP1MJ2U9UWy/As2blPo2x2zpSPtI=
+=tyll
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1 b/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1
new file mode 100644
index 0000000..1e79493
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1
@@ -0,0 +1 @@
+ef848fbb9be5eb821dcf53fce27abf1f9dbd7ba3
\ No newline at end of file
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar b/checkerframework/dataflow-shaded-3.11.0.jar
new file mode 100644
index 0000000..cf4bfeb
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0.jar
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar.asc b/checkerframework/dataflow-shaded-3.11.0.jar.asc
new file mode 100644
index 0000000..38bc2d2
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgPVllAAoJELFmmKSt9NY4I6kIAKY7QzwTAkB4mImtTI58JfVR
+MT4a+PIVMKDgyXCA7ouUeDIJPX+MJojIOboJGm1i6vhjZxX1VT10olcrDBgHNXYc
+D6Nu30R0/gWW7cqdJCXwkKFe2VaNHi31Zx6iE59EbRdhpP0tyQsY6XQsAowFafDH
+bI+ceYKTxpPnldflMBMm1ZOBBvViDt+1kWDuOsgSTiy5FsGx90M/FGbMoWwCSpPb
+gK8ixpnVV91GdoTs48yG1y4n/tlfm+WLO/lKduDsaYm5Z7rCQsFNqgUqX+o1q1Mm
+Y9Rzt7EpDnMrYc2P2rFJ0/h3wG5U7CE3Ai+dxiXaaQZL+X5coL/mtkUZRrkYj7A=
+=mDN+
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar.sha1 b/checkerframework/dataflow-shaded-3.11.0.jar.sha1
new file mode 100644
index 0000000..b17be32
--- /dev/null
+++ b/checkerframework/dataflow-shaded-3.11.0.jar.sha1
@@ -0,0 +1 @@
+a1ad6b6e1519fd5b5d684a3c1be1e7a7d87c058d
\ No newline at end of file
diff --git a/checkerframework/javacutil-2.5.3-sources.jar b/checkerframework/javacutil-2.5.3-sources.jar
deleted file mode 100644
index 9a63478..0000000
--- a/checkerframework/javacutil-2.5.3-sources.jar
+++ /dev/null
diff --git a/checkerframework/javacutil-2.5.3-sources.jar.asc b/checkerframework/javacutil-2.5.3-sources.jar.asc
deleted file mode 100644
index 2ea3dad..0000000
--- a/checkerframework/javacutil-2.5.3-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAABAgAGBQJbOnWDAAoJELFmmKSt9NY4WRcH/R5NFsKe8kB49tyT/MNIy8IG
-XXoORzIPLWgPlGwiU5Cw+jUmNLq/hMXCUf0KPc8Fut+3RGpJZhINEfyK4E3XmbuX
-q6wUcD5CUD1ne7xJWRUCne+TDj6ZJru2x+aimodsN5AWo0z8DTKu6AwkPIbqJv7j
-2mh1NOXui1XXBQumI7Kt0lkStG9oC+w/PgQ+DF10ahU9HP/xkZMEDVYJsphaGyFz
-Z0xOoEeFRS42WNIEB/ei1bPleFCXfpyY9dcHUCK0HxAAZP+wQO8Yt282Coukxw8y
-5+nYakyKWdbS94Zm1BML6dBM/FIfRrSO1BGb9ZTJw47wKjXVNIAInSiTN4Sz6jM=
-=ZP0C
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-2.5.3-sources.jar.sha1 b/checkerframework/javacutil-2.5.3-sources.jar.sha1
deleted file mode 100644
index 1b930ce..0000000
--- a/checkerframework/javacutil-2.5.3-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ab2a7e55df797e43cb5169727adf17b6f90d135
\ No newline at end of file
diff --git a/checkerframework/javacutil-2.5.3.jar b/checkerframework/javacutil-2.5.3.jar
deleted file mode 100644
index 4a324a8..0000000
--- a/checkerframework/javacutil-2.5.3.jar
+++ /dev/null
diff --git a/checkerframework/javacutil-2.5.3.jar.asc b/checkerframework/javacutil-2.5.3.jar.asc
deleted file mode 100644
index b714d7b..0000000
--- a/checkerframework/javacutil-2.5.3.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAABAgAGBQJbOnV9AAoJELFmmKSt9NY4n28H/09k63Pe4/ZHedcR1EOPHu7z
-T9L2oLxq2TQarFhDZAbyRfXEUtsL25HiY42JKcczcYIUcknSnmrtcl+aVfm0MjfR
-8LAL06mDi3dwFEYJJQbJaDCIjIEmY5qnDUna+FDTG5SsGWeYXqIYKevfIoELZM1B
-wsgo7EvSX6JNHOO801Q1nEBT7smKWvB8ATvIFXhIM5z9WWRh3xF4aUFtForEG/d2
-JXQLOBLf/XNBvtUuqEOhmBnGUJxIFXbBHimBNhZEQORPe6wXn/fAum+BUho+DPIa
-OP5n3XS26Tg61eMBaLZgpmwmnKwwBdoHCkVvJlCvl8OB9S9LKDmN8nNpIMmoMp0=
-=x03N
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-2.5.3.jar.sha1 b/checkerframework/javacutil-2.5.3.jar.sha1
deleted file mode 100644
index 05d5eb6..0000000
--- a/checkerframework/javacutil-2.5.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c545ca6fc7a57e3bc65d46e8e9438376f0db35ea
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.11.0-sources.jar b/checkerframework/javacutil-3.11.0-sources.jar
new file mode 100644
index 0000000..ba15c76
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0-sources.jar
diff --git a/checkerframework/javacutil-3.11.0-sources.jar.asc b/checkerframework/javacutil-3.11.0-sources.jar.asc
new file mode 100644
index 0000000..a9c66ca
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgPVl4AAoJELFmmKSt9NY4QHMIAJUayrd5o4S9naCRYldVJ/BE
+xBXcDCtrxDV7IgaRiB4B6R/lheV/Fq4kbHBdVF/weRxMUlN6fPEZ7ATZHmYqMAP2
+YwPh+nTXEVUIvA1Pr+kYPkD1yBJN+xoXRP71tW0QGUmPClEmERWUoSH91F4Ik8x4
+OLCzCYobJb1xxXOmeUN5MTIWYQLQbQsDVggfQXKp31/mRb+DRcXvp6MtTXnlRqq7
+EL4I8s8rTprLOR8ZN3IRm5nbR9Q2SVYFi8O+ZX7+5Xg3kxZRqPRYbAKZFyukfYQ3
+SxKh2K/2WCSc3MyM8PKGEMcqLn1mTbQvtzX0eD579PmBCfGNmUB7gYURvet81fw=
+=qNuO
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.11.0-sources.jar.sha1 b/checkerframework/javacutil-3.11.0-sources.jar.sha1
new file mode 100644
index 0000000..45addd6
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0-sources.jar.sha1
@@ -0,0 +1 @@
+ef29934e8139cf475d82c92d8bed81687767b017
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.11.0.jar b/checkerframework/javacutil-3.11.0.jar
new file mode 100644
index 0000000..8a81e46
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0.jar
diff --git a/checkerframework/javacutil-3.11.0.jar.asc b/checkerframework/javacutil-3.11.0.jar.asc
new file mode 100644
index 0000000..d19457d
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgPVl4AAoJELFmmKSt9NY4TewIAI31EmMFsFLgwuleGUmOnBj4
+D7akfYemD0+Zvd9xktw7ZgFBm0j7UPBVM+T4gCwQ1fbD+vQoER9/K9+SEubub916
+iNCl1gzX5bdLC6I4ZEAvSCl1qkzi8z/O/pjfaLfR+CzDIf5sqgj2BLj/CYkFzKaM
+PvUw9hcEBcRfCfk2MYUbbJdWVXx4PIPWVlgtR6Fy+gNIttBnfHXlymN5W6wwCgQo
+dYWPyzbWH4DdKBQBOdcaguBu1Q8VXu/+arW5gHErCt9N2KhG3RN2geOwKPphyk/D
+EbbG1bJusJbf2Ldwiv1pBT2w/isBMuUctok2e8TJIPmVSlddCSzWqOjSXVwPTEU=
+=jlSY
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.11.0.jar.sha1 b/checkerframework/javacutil-3.11.0.jar.sha1
new file mode 100644
index 0000000..ee02183
--- /dev/null
+++ b/checkerframework/javacutil-3.11.0.jar.sha1
@@ -0,0 +1 @@
+3329356cdd2b1dd8a4305c27ea9c9d511b41fa56
\ No newline at end of file
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 3c63920..019607f 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,12 +10,8 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.3.2/error_prone_core-2.3.2-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.7.1/error_prone_core-2.7.1-with-dependencies.jar"
   }
-  url {
-    type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.3.2/error_prone_core-2.3.2-with-dependencies.jar"
-  }
-  version: "2.3.2"
-  last_upgrade_date { year: 2020 month: 11 day: 3}
+  version: "2.7.1"
+  last_upgrade_date { year: 2021 month: 6 day: 16}
 }
diff --git a/error_prone/error_prone_annotations-2.4.0.jar b/error_prone/error_prone_annotations-2.4.0.jar
deleted file mode 100644
index 902c7b1..0000000
--- a/error_prone/error_prone_annotations-2.4.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_annotations-2.4.0.jar.asc b/error_prone/error_prone_annotations-2.4.0.jar.asc
deleted file mode 100644
index 3ede198..0000000
--- a/error_prone/error_prone_annotations-2.4.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYZ4ACgkQmiWcfuY2
-xe2bABAApUalU975u4yqmvDhxxwv9OIZTEUlatLKO/Xz8vDzSoOtlIkRwkrIMqsL
-yYp49cIE8AbQcSXvkEaIZJ+DggqWm4gr4kNihqmDP4IQmURjQomLJt38FWty4AHE
-gK3LpeCud7QU2RvzHMgAxTkeZMsciibGjKqOGpNiAXhHvfHEpGiWEBXDhMeyvant
-cFqbSY7maYbITIk81vWXB5e2pYj3yoCmfCAuNj3LGXFjIkDbHiCK+XtDJWObKzut
-jPj/L2Xgv7zb5q7vRoZv50qMhwBF3jscqwpb8Pt/8NUn778OsRF1miKmMmWX3fny
-HxRVum5Ljt4o13QUbYA4fR64DSArsBAmdhHU+ELQzCpKINe68af2nlKuiobVv5N3
-dTS5a/ONUGU9hvHmjsrSZoYUaE+A53k9ieycuBhQZz1jh/pk9o+oBwjFtJvuPBpR
-Be7Fr/efA//SBcxNGP3XW4rLPXZc26gEqarYYPUk3NiKBIBZCS8s/QrfKdu9Oc1f
-BeVVTFJORQDgKFIxrHX9cCDj/r+VmSA9aKqRw5IV2t5jK1FWUuS/velvvpttULZW
-WhgS9igjFWW1K1Uig4FFX1u9i/3Y7rQuutXNODnO4Xhol5x+IPsycOduBxIZ41PU
-AOJdhxNlGg6nz3smk+hh6HjyaVo71WSymnVRMONAZv1PcfJqOrE=
-=TpCl
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_annotations-2.4.0.jar.sha1
deleted file mode 100644
index 23f0094..0000000
--- a/error_prone/error_prone_annotations-2.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-32ecccc595e4e4d813a80ee9e3ab5813d65874eb
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.7.1.jar b/error_prone/error_prone_annotations-2.7.1.jar
new file mode 100644
index 0000000..8ea5377
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.7.1.jar
diff --git a/error_prone/error_prone_annotations-2.7.1.jar.asc b/error_prone/error_prone_annotations-2.7.1.jar.asc
new file mode 100644
index 0000000..5a6960e
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.7.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAhUACgkQmiWcfuY2
+xe3I6w/+JHJGbwRUpSw/+lu6OVxU8dezW5/UUIz/UA82cNDsP5lpIBN4XNBrKAGk
+MwlFi+rP12FyIfUkIuYzhd0RerdWAdJMjF/Ap5Fy7kRxIexa7jPDAl17EmLpraUd
+4O+OxFPUOku3XAgpKEuF5WoZmPJmzqB53hymDP53s3603WgCLCsCEzf+h8M1hinI
+Nkaw8m6V8bbuecNQQXjVHjGxubS+owLKfzK3GPNcPttVMNUgCQ2qI9ijbIzZP7Ua
+u5iJhSJXsrAtiQA3DddTtphi0MFWmPFBCj0xyBYqKWG6rIkYLPCv6ytlyQRCSZ5s
++M83hvZKmVdkYsxuMt2SY/OyWIoxGsJ1C5PdNGXjp9xArtc+p7L+EXKkv0SZuvf6
+mogpGsLaEuoVdmDWemC5piEBxgE3lZl3axf1pQfUfSjZH1d1IQdr3eYgFjZuPbwn
+rTJLU1denCyin0Z/k8+nc7dSyH8VGlmN75UBx05mQU18syfdoO85Jp34JHVgYv4U
+OsQYLLCSZlQ4IduBT1AdtevZNkVkavjMjtFsneYuWcCsHabFzep7iogcT7WNb6Ve
+2PhaSWZW9zzW7+qOR2vpqU5uBLjU+5L4XbmUqrQf+iAPU5aDVKwMJEzq0wy4/KaT
+6SVEZRBxI81Vta38Y+aGWvMv1rkzbqhgN52Ko4J1uyQPL2F33D8=
+=RZbr
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.7.1.jar.sha1 b/error_prone/error_prone_annotations-2.7.1.jar.sha1
new file mode 100644
index 0000000..398b7b8
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.7.1.jar.sha1
@@ -0,0 +1 @@
+458d9042f7aa6fa9a634df902b37f544e15aacac
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc b/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc
deleted file mode 100644
index 6fa70a7..0000000
--- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9L3AACgkQkS0sDsza
-VcCwCwwAjR2NzT2eWnueWlW/BbnGjFa8mdQNKzmt6dJwM81ZEhOp7sjnIRWbnVj4
-2fPAWKRO0VkBj3yViY0I93fwt+/O4jr0c7vfeMOGOZ7UNVTQUbZz1cxgf90UXkSL
-AZWE416ezcfVglR/V/d5/8NtHojH6uTePJozt/K0N+GFMkRvEaaLZ/s/ooy0NUHk
-SYsgsKFZpX5PvhOypCraiUEcMNQIXPv10oIFIr5Vv8Gvv0a25y9vhIT7XQih65vC
-8dtK9M3ma8R1/QRsgRyMTHuFqcqmp+oHN01g68nS3C8kUnKz1IG9asSZ/XDmVFW7
-xgs70faB7Lc0w8RzO+LOaZ16YGMdii/ImFLsuZ89qrZBRhdeCc+2L1lCutixDC4W
-XMjT4341TE3s8mQqCqIo81hdjxBnnA0HSsNlFGJE0+AEBQB/R9VbbD223HBiT/3x
-jP0Ypu+2qbw+JNrpic/zXKYl7aQ+kOLOKqIKmfIRoNRW5lrVYVVzCwUJMmL0g79l
-fI9gsh+L
-=mr8i
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1
deleted file mode 100644
index 66890cf..0000000
--- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecc5f1035d25598942789de7b34e826d020557bb
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.3.2-with-dependencies.jar b/error_prone/error_prone_core-2.7.1-with-dependencies.jar
index 046faee..f0a64be 100644
--- a/error_prone/error_prone_core-2.3.2-with-dependencies.jar
+++ b/error_prone/error_prone_core-2.7.1-with-dependencies.jar
diff --git a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc
new file mode 100644
index 0000000..7d016e1
--- /dev/null
+++ b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAsgACgkQmiWcfuY2
+xe2hOg//V7um0fDaIlHPKZATZfK7cLaAUe2u8HhShvUD+4+fdlFIH1us5mE26QR6
+v+OofgOagy7HLDN/jKU5b3tDPQdh2D8vHIBOu1m8QRGjgLkYs1uwXpBifDWyCpOb
+QQ2ThkHSxpTQofxh+RvNB1axuFSbqgXi2NbObbaPhVyLjcc2LbPghv7G1kbXBF5a
+Zid9tbf4Ezq5zhMf9YLMDXC4Xb6OMDCtCUAeSlKUBE39QbiiGa9++NAaL3bHvq3r
+UDbXQn3/9r5/6+NP7V3YkXH5cSPhkuvGDziJlMiGS/mmYQaUszCvyUuMBoYAeGno
+S4OGdhc8UNapwI8yLRLbSqPGvhhG+9aOBZqWFa4VkM1BmP+WLaVvq6JcPWoPKIiQ
+XTQuWru0ec19y3ULFnOsKilPgUu/wCMUofXiv+mA9tJROkyUfMqF8n5A95WqOsDF
+FAs1dtZ1/N/gIhem0Ze6KF/2zFS5vuaFdG3bXFvSUevQyNyWQZ9vkyEJNfG4zKgC
+NKy4C9lOiIZYKlJHst78N2QrRT/PliUUhAcMYLmWXBUWoP1IkI/MVu1RVQODe30M
+yO3BQMYG0IFGLkIuKTTWb6UaUbhMzkYyI5Z2USbCRZ1Hs8i6SI+KfurxwYjBWJRM
+z34nL/k98iFjrJaKqMsncYNGKFsVcSIitO8ig2/qfwP/0qojK/c=
+=5k+G
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1
new file mode 100644
index 0000000..515f691
--- /dev/null
+++ b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+d1a7e0479262bb4b7f3a33cbd189abb5369488aa
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar b/error_prone/error_prone_test_helpers-2.3.2.jar
deleted file mode 100644
index 825b179..0000000
--- a/error_prone/error_prone_test_helpers-2.3.2.jar
+++ /dev/null
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.asc b/error_prone/error_prone_test_helpers-2.3.2.jar.asc
deleted file mode 100644
index 92213ce..0000000
--- a/error_prone/error_prone_test_helpers-2.3.2.jar.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCgAdFiEEXOMlmWo1ITMmrixokS0sDszaVcAFAlu9LagACgkQkS0sDsza
-VcBvTQwAoKDBdanv5a0mnSj/eGaODZXoq6KRkQmWAut1+Z1FlbwGLwEoB0D1wDsW
-oCqFvfp8gu1nZWh/VFH/JImqmPKdFW8rM0+EvNK3w+sh2gJEjL+bYJ8/SIwr2B8z
-i56NuDtXRIXTYXo7cLDMCg5sldqGwOnyZr/L9HkKS3ZD/FEI+a2fhTu9ety7EYI9
-bBNLKh+KMv7SBpRRuW6CTcNl17FV1lbMLRN+UKS2NZpKY7zWbJad9ANXLfNp5Cnu
-WPZbX9DZgIbktARdRjUpBihDiisqjkzrrQZciiPvTRHiyywG07dECDGMRR9xxuuD
-lsNFE7HL7eO/bJZKOSKazDFhten7SmxLQd8ieTtpNp9PS7VUnY7hGJjS/+1pzU5x
-E9WFmUrVFuyf06ZpXervn7h+myDMrO7ohB9clipT9In4LOlPvy8oviKQGx49BRMK
-mz194g/RlYOGWSl3Or98qndlQZcKFI4oN8zuMznDmfHvzKvNrfmCZ/UaOiRojfFM
-63am+Wz5
-=ZpSE
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.3.2.jar.sha1 b/error_prone/error_prone_test_helpers-2.3.2.jar.sha1
deleted file mode 100644
index 966875d..0000000
--- a/error_prone/error_prone_test_helpers-2.3.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f67ad60cdad7412996bf20559461f31745b9dfa8
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar b/error_prone/error_prone_test_helpers-2.7.1.jar
new file mode 100644
index 0000000..26a1bd7
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.7.1.jar
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar.asc b/error_prone/error_prone_test_helpers-2.7.1.jar.asc
new file mode 100644
index 0000000..bf503c8
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.7.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAkgACgkQmiWcfuY2
+xe3mjw/5AWnOnKm8vO52jFEC2YiyS5DEorEvZUz6xPpUJVlGnN+wXDauj7DGb9vT
+KoZnUK8vQPFdLiZoqmeopFSB58AYkvca2UxL75wdFv7mHZNSW2ZpXfcpVwtKkx0R
+pl9JA1GnEvVyVhaAre9/hOBv18ONxBfblPHZOwDZh+prIgHZQ4nl1hMrF483Y4/X
+oJu3LVXxS5lhuRo0MuiLwo8SBa/26lZKMjpFbDHX7vcZQghZP6+FgS270ot6jX7O
+nontAufBrATxwVCE1/P8Tm7qL0WScuyWmAZTkDxVkvJQ2pXsnCS8+R89NfsiBWF5
+cOYW7F1kGEaqX0SA191NiZ4j6s+4w9rzCTi0GJLRW/YjYPQjxjombcrcczALRere
+gUBXGa12K4pd/xtppr7uHDmDDp6eFMOqGIQOWoSZLEs/zVT6aBd7lStFVRt1A6Yd
+J/rQVqvv5iex7RG1vq9IgqS53L/3l/qJVDa1t0RyqKtmvxmyhEwmL0QkNEhkh8Vg
+0nM0SD/mS3j+sfaLg97qfEvBHjmusQhbLggFhtNp2L/yvFeILbm57AKztUnTE7kN
+bwOcZBwdCdm5nBb4T0vz5REXxem0JDyIWfHV1o+sbtq5UqDQMVYeu8HpuQxUmSFa
+cOYcZ2pyUaZWsknxQfHIIFba2Dxq6gcDBAD4vsKq3H23q8g59lk=
+=FHx/
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar.sha1 b/error_prone/error_prone_test_helpers-2.7.1.jar.sha1
new file mode 100644
index 0000000..d10b284
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.7.1.jar.sha1
@@ -0,0 +1 @@
+98b373ee9228679f40cfb0558c254e4e22850d1d
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar b/error_prone/error_prone_type_annotations-2.4.0.jar
deleted file mode 100644
index ce90baf..0000000
--- a/error_prone/error_prone_type_annotations-2.4.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.asc b/error_prone/error_prone_type_annotations-2.4.0.jar.asc
deleted file mode 100644
index a354c0e..0000000
--- a/error_prone/error_prone_type_annotations-2.4.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAl7RYdcACgkQmiWcfuY2
-xe3/ig//YBmI7uXHdG8Mej6oClbClD2oA1PXlc4OLcQ+uNrSJfvatEajIxylMvxD
-+P2RBCj/9/1F8KCPy6+md5eRiQ+rvoAGCKxVBLlqEnXEQhA6BSMy45dA4m1xDuvs
-vyUc9ICFiZJ5qvxe4ENRKHliwjiG5wXbQj0ArKPvdZrhUhLDFTPmCV4LvrVBf5GG
-bg9Ek1EHTlMXIC4GI+hSX0wrH+D2H2rxlN7jhyaXXHs7hUpzheRRWw+W3DLFvgb2
-3zMzKPHQzeYEJK180V0BXOWWQew69PgNtdebK4khEYZQT2jvngpzZ/BIpRRBUG4c
-3mT0u9IoJiXAsZivz9pMuNktuCU3pCa8l3+gEQUkRFO/oAt/qT6o4iG9FPm1Uwe5
-agx6aA4Nhx6jDTw9jQXhcBT/yCagZvYdSQDWF0FBWwc8PHWCaQfXP+W+MSTXQo6l
-d+KtGz74fLTj19dFVy/m7GogTsGHy0awTK1bG24HFVLwpo/a91Yl+kCkxq5JgtGE
-Uw4MYB8X5+CX0PyvDjMR/cVvlg1QbRmduBCxGK2YqLjPmcRONu/Lipi5utrjPgjV
-oNtJ2RNc/MYoQsDmXYcGTJ8CiijWoWeqczasoqoL2QPrZ0bquHTFFutzxKCW8gfZ
-Vc7pNKZ8P/TDPKmBBuM4njp8E4O4i5xvT1tGT5HcK5tOCJvOlVQ=
-=bcXN
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.4.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.4.0.jar.sha1
deleted file mode 100644
index c9c6d2a..0000000
--- a/error_prone/error_prone_type_annotations-2.4.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-101b970285e1e464d0c39e4402e2395c20c70a4f
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar b/error_prone/error_prone_type_annotations-2.7.1.jar
new file mode 100644
index 0000000..af6ac61
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.7.1.jar
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar.asc b/error_prone/error_prone_type_annotations-2.7.1.jar.asc
new file mode 100644
index 0000000..284f698
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.7.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAlQACgkQmiWcfuY2
+xe2gxw//QW/K+VUCtpGZP9MZFcZIM7G20Z5t7F0Ags3eQB30UYZ+3wJStTWUQzfL
+mh+cKWF59KiqPJPhSYFmHt702au4eVn0GzyN77+vzB/rw5WVTz/qUuKZ/NdpPMVj
+lqCnoL+Lgjpc/rvD9F/kC8Xag7fSecOnk+afqCbgGNeS1jdU+PEWEKEbN+33vOE+
+m9bDMCZ80LGt4UDj5jv9xyYVSSt9vKTe1K9e42UGAyEKtlsMkSnIYv9BZwtJGhX+
+egithecxHHFoSgGqYQk/6KLyjGS2tC/JFopRToiK4abnhI598EvnLNR6MAvwZ816
+CbsukCdUd9Wo/re4R1PDi7/rVIqkz+u8g0uFxuNDOYyR5bMKxmMBmL9Zy3LcvKmT
+szAKSaTkUXN6Q+/R4LLfdLcU76oDsKZwH0i8U4BJf2VBQkTaqUg8Am2QQray50DS
+sla5dWFvcmHUH4EIRv8vM9NHOcUVuf5py7Th7r4dhh9/OftZyjBGff44Bp3hZG/F
+CxCrMyGylPqnepktveY0CSZEO92CR8gtnuHYTakXJPsO4jCIOq2n6G7Y9Aj2O3vU
+XTcXmuw/scCh/3OGK/Q0P50P8p7j+rBSthv3vRjdAWa+NUjGU7o4JeVzMGQ3IoST
+DyhzYFxdQ+xDHbpBAn1UYrnZZaQ1CYrKwhnH0eCAB6vOfQP6BYo=
+=/KaH
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar.sha1 b/error_prone/error_prone_type_annotations-2.7.1.jar.sha1
new file mode 100644
index 0000000..341af7a
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.7.1.jar.sha1
@@ -0,0 +1 @@
+d24ac6464d955ae28431e1fc71f80e2de1bcffc2
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index 4cc6c75..be6255c 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@ third_party {
     value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar"
   }
   version: "9+181-r4173-1"
-  last_upgrade_date { year: 2020 month: 11 day: 3}
+  last_upgrade_date { year: 2021 month: 6 day: 16}
 }
diff --git a/soong/error_prone.go b/soong/error_prone.go
index ef416f5..72f219b 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,11 +22,11 @@ func init() {
 	// These values are set into build/soong/java/config/config.go so that soong doesn't have any
 	// references to external/error_prone, which may not always exist.
 	config.ErrorProneClasspath = []string{
-		"external/error_prone/error_prone/error_prone_core-2.3.2-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.4.0.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.4.0.jar",
-		"external/error_prone/checkerframework/dataflow-2.5.3.jar",
-		"external/error_prone/checkerframework/javacutil-2.5.3.jar",
+		"external/error_prone/error_prone/error_prone_core-2.7.1-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.7.1.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.7.1.jar",
+		"external/error_prone/checkerframework/dataflow-shaded-3.11.0.jar",
+		"external/error_prone/checkerframework/javacutil-3.11.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
 	}
 
@@ -80,7 +80,6 @@ func init() {
 		"-Xep:LiteByteStringUtf8:ERROR",
 		"-Xep:LoopConditionChecker:ERROR",
 		"-Xep:MissingTestCall:ERROR",
-		"-Xep:MockitoCast:ERROR",
 		"-Xep:MockitoUsage:ERROR",
 		"-Xep:MoreThanOneInjectableConstructor:ERROR",
 		"-Xep:MustBeClosedChecker:ERROR",
@@ -90,9 +89,6 @@ func init() {
 		"-Xep:OptionalEquality:ERROR",
 		"-Xep:OverlappingQualifierAndScopeAnnotation:ERROR",
 		"-Xep:PackageInfo:ERROR",
-		"-Xep:PreconditionsCheckNotNull:ERROR",
-		"-Xep:PreconditionsCheckNotNullPrimitive:ERROR",
-		"-Xep:PredicateIncompatibleType:ERROR",
 		"-Xep:PrivateSecurityContractProtoAccess:ERROR",
 		"-Xep:ProtoFieldNullComparison:ERROR",
 		"-Xep:ProtoStringFieldReferenceEquality:ERROR",
@@ -122,21 +118,34 @@ func init() {
 		"-Xep:ArrayHashCode:WARN",
 		"-Xep:ArrayToString:WARN",
 		"-Xep:ArraysAsListPrimitiveArray:WARN",
+		"-Xep:BadAnnotationImplementation:WARN",
 		"-Xep:BadShiftAmount:WARN",
 		"-Xep:ComparableType:WARN",
 		"-Xep:ComplexBooleanConstant:WARN",
+		"-Xep:CollectionToArraySafeParameter:WARN",
 		"-Xep:ConditionalExpressionNumericPromotion:WARN",
+		"-Xep:DangerousLiteralNull:WARN",
+		"-Xep:DurationFrom:WARN",
+		"-Xep:DurationTemporalUnit:WARN",
+		"-Xep:EqualsHashCode:WARN",
 		"-Xep:EqualsReference:WARN",
 		"-Xep:FormatString:WARN",
+		"-Xep:FromTemporalAccessor:WARN",
 		"-Xep:GetClassOnAnnotation:WARN",
 		"-Xep:GetClassOnClass:WARN",
 		"-Xep:GuardedBy:WARN",
 		"-Xep:HashtableContains:WARN",
 		"-Xep:IdentityBinaryExpression:WARN",
+		"-Xep:IdentityHashMapBoxing:WARN",
+		"-Xep:InstantTemporalUnit:WARN",
 		"-Xep:InvalidTimeZoneID:WARN",
+		"-Xep:InvalidZoneId:WARN",
+		"-Xep:IsInstanceIncompatibleType:WARN",
 		"-Xep:IsLoggableTagLength:WARN",
+		"-Xep:JUnitParameterMethodNotFound:WARN",
 		"-Xep:MathRoundIntLong:WARN",
 		"-Xep:MislabeledAndroidString:WARN",
+		"-Xep:MisusedDayOfYear:WARN",
 		"-Xep:MissingSuperCall:WARN",
 		"-Xep:MisusedWeekYear:WARN",
 		"-Xep:ModifyingCollectionWithItself:WARN",
@@ -144,16 +153,24 @@ func init() {
 		"-Xep:NullTernary:WARN",
 		"-Xep:OverridesJavaxInjectableMethod:WARN",
 		"-Xep:ParcelableCreator:WARN",
+		"-Xep:PeriodFrom:WARN",
+		"-Xep:PreconditionsInvalidPlaceholder:WARN",
+		"-Xep:ProtoBuilderReturnValueIgnored:WARN",
 		"-Xep:ProtocolBufferOrdinal:WARN",
+		"-Xep:ProtoFieldNullComparison:WARN",
 		"-Xep:RandomModInteger:WARN",
 		"-Xep:RectIntersectReturnValueIgnored:WARN",
+		"-Xep:RemovedInJDK11:WARN",
 		"-Xep:ReturnValueIgnored:WARN",
+		"-Xep:SelfAssignment:WARN",
 		"-Xep:SelfComparison:WARN",
 		"-Xep:SelfEquals:WARN",
 		"-Xep:SizeGreaterThanOrEqualsZero:WARN",
 		"-Xep:StringBuilderInitWithChar:WARN",
 		"-Xep:TryFailThrowable:WARN",
+		"-Xep:UnnecessaryCheckNotNull:WARN",
 		"-Xep:UnusedCollectionModifiedInPlace:WARN",
+		"-Xep:XorPower:WARN",
 
 		// Errorprone default severity WARNING
 		// "-Xep:AmbiguousMethodReference:WARN",
@@ -395,6 +412,23 @@ func init() {
 		// b/170172949
 		"-Xep:MissingOverride:OFF",
 		"-Xep:UnnecessaryParentheses:OFF",
+		// This triggers on android R classes, disable until we can ignore
+		// the generated R classes
+		"-Xep:MutablePublicArray:OFF",
+		// These checks crash
+		"-Xep:RethrowReflectiveOperationExceptionAsLinkageError:OFF",
+		"-Xep:InvalidLink:OFF",
+		// DoNotCall is a check with severity ERROR. Errorprone
+		// adds some hardcoded methods to be considered @DoNotCall,
+		// and they cause findings in external/junit. Disable this
+		// hardcoded list until we can exclude external code from errorprone.
+		"-XepOpt:DoNotCallChecker:CheckThirdPartyMethods=false",
+		// Commonly triggers for stubbed methods
+		"-Xep:DoNotCallSuggester:OFF",
+		"-Xep:MissingSummary:OFF",
+		// This check increates the `platformprotos` module's build
+		// time by ~15 minutes
+		"-Xep:SameNameButDifferent:OFF",
 	}
 
 	config.ErrorProneFlags = []string{
diff --git a/update.sh b/update.sh
index 20e8e85..f34394f 100755
--- a/update.sh
+++ b/update.sh
@@ -20,10 +20,10 @@ EP_TYPE_ANNO_JAR_URL="${JAR_REPO}/error_prone_type_annotations/${EP_VERSION}/err
 EP_TEST_HELPERS_JAR_URL="${JAR_REPO}/error_prone_test_helpers/${EP_VERSION}/error_prone_test_helpers-${EP_VERSION}.jar"
 JAVAC_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}.jar"
 JAVAC_SOURCES_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}-sources.jar"
-CF_DATAFLOW_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/dataflow/${CF_VERSION}/dataflow-${CF_VERSION}.jar"
-CF_DATAFLOW_SOURCES_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/dataflow/${CF_VERSION}/dataflow-${CF_VERSION}-sources.jar"
-CF_JAVACUTIL_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar"
-CF_JAVACUTIL_SOURCES_JAR_URL="http://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar"
+CF_DATAFLOW_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/${CF_VERSION}/dataflow-shaded-${CF_VERSION}.jar"
+CF_DATAFLOW_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/${CF_VERSION}/dataflow-shaded-${CF_VERSION}-sources.jar"
+CF_JAVACUTIL_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar"
+CF_JAVACUTIL_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar"
 TOOLS_DIR=$(dirname $0)
 
 function update_jar {