From 70eaaf7869b89e6c4aa46ce93fa126af80e7334b Mon Sep 17 00:00:00 2001
From: Jendrik Johannes <jendrik@gradle.com>
Date: Mon, 12 Oct 2020 11:53:42 +0200
Subject: [PATCH] Define version of 'checker-compat-qual' in
 dependencyManagement

---
 android/pom.xml   |  4 ++--
 guava/module.json |  4 ++--
 pom.xml           | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 9898a222f21a..1146921070b2 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -22,10 +22,10 @@
     <module.status>integration</module.status>
     <module.parentVersion>HEAD-jre-SNAPSHOT</module.parentVersion>
     <variant.jvmVersion>6</variant.jvmVersion>
-    <variant.checkerframework>"checker-compat-qual", "version": { "requires": "2.5.5" }</variant.checkerframework>
+    <variant.checkerframework>checker-compat-qual</variant.checkerframework>
     <otherVariant.version>HEAD-jre-SNAPSHOT</otherVariant.version>
     <otherVariant.jvmVersion>8</otherVariant.jvmVersion>
-    <otherVariant.checkerframework>"checker-qual"</otherVariant.checkerframework>
+    <otherVariant.checkerframework>checker-qual</otherVariant.checkerframework>
   </properties>
   <issueManagement>
     <system>GitHub Issues</system>
diff --git a/guava/module.json b/guava/module.json
index 67fd6c86939a..c8e12495d077 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -48,7 +48,7 @@
         },
         {
           "group": "org.checkerframework",
-          "module": ${variant.checkerframework}
+          "module": "${variant.checkerframework}"
         },
         {
           "group": "com.google.errorprone",
@@ -168,7 +168,7 @@
         },
         {
           "group": "org.checkerframework",
-          "module": ${otherVariant.checkerframework}
+          "module": "${otherVariant.checkerframework}"
         },
         {
           "group": "com.google.errorprone",
diff --git a/pom.xml b/pom.xml
index 6768506567d9..9daaaa4ae5cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,10 @@
     <module.status>integration</module.status>
     <module.parentVersion>HEAD-jre-SNAPSHOT</module.parentVersion>
     <variant.jvmVersion>8</variant.jvmVersion>
-    <variant.checkerframework>"checker-qual"</variant.checkerframework>
+    <variant.checkerframework>checker-qual</variant.checkerframework>
     <otherVariant.version>HEAD-android-SNAPSHOT</otherVariant.version>
     <otherVariant.jvmVersion>6</otherVariant.jvmVersion>
-    <otherVariant.checkerframework>"checker-compat-qual", "version": { "requires": "2.5.5" }</otherVariant.checkerframework>
+    <otherVariant.checkerframework>checker-compat-qual</otherVariant.checkerframework>
   </properties>
   <issueManagement>
     <system>GitHub Issues</system>
@@ -262,10 +262,17 @@
         <version>3.0.2</version>
       </dependency>
       <dependency>
+        <!-- This variant of the checkerframework is used by the 'jre' variant of Guava -->
         <groupId>org.checkerframework</groupId>
         <artifactId>checker-qual</artifactId>
         <version>3.5.0</version>
       </dependency>
+      <dependency>
+        <!-- This variant of the checkerframework is used by the 'android' variant of Guava -->
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-compat-qual</artifactId>
+        <version>2.5.5</version>
+      </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>