From 1ca9f03a39f57482e0939240a124b53f96b6fae8 Mon Sep 17 00:00:00 2001
From: Jendrik Johannes <jendrik@gradle.com>
Date: Wed, 14 Oct 2020 20:43:48 +0200
Subject: [PATCH] Use correct version for parents

The 'android' and 'jre' variant each have their own parent and they
should use that one in Gradle Module Metadata.
---
 android/pom.xml     |  5 ++---
 guava/module.json   | 12 ++++++------
 pom.xml             |  5 ++---
 util/set_version.sh |  2 --
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 9898a222f21a..6536946853c0 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -20,12 +20,11 @@
     <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <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..c9316795e557 100644
--- a/guava/module.json
+++ b/guava/module.json
@@ -29,7 +29,7 @@
           "group": "com.google.guava",
           "module": "guava-parent",
           "version": {
-            "requires": "${module.parentVersion}"
+            "requires": "${pom.version}"
           },
           "attributes": {
             "org.gradle.category": "platform"
@@ -48,7 +48,7 @@
         },
         {
           "group": "org.checkerframework",
-          "module": ${variant.checkerframework}
+          "module": "${variant.checkerframework}"
         },
         {
           "group": "com.google.errorprone",
@@ -97,7 +97,7 @@
           "group": "com.google.guava",
           "module": "guava-parent",
           "version": {
-            "requires": "${module.parentVersion}"
+            "requires": "${pom.version}"
           },
           "attributes": {
             "org.gradle.category": "platform"
@@ -149,7 +149,7 @@
           "group": "com.google.guava",
           "module": "guava-parent",
           "version": {
-            "requires": "${module.parentVersion}"
+            "requires": "${otherVariant.version}"
           },
           "attributes": {
             "org.gradle.category": "platform"
@@ -168,7 +168,7 @@
         },
         {
           "group": "org.checkerframework",
-          "module": ${otherVariant.checkerframework}
+          "module": "${otherVariant.checkerframework}"
         },
         {
           "group": "com.google.errorprone",
@@ -217,7 +217,7 @@
           "group": "com.google.guava",
           "module": "guava-parent",
           "version": {
-            "requires": "${module.parentVersion}"
+            "requires": "${otherVariant.version}"
           },
           "attributes": {
             "org.gradle.category": "platform"
diff --git a/pom.xml b/pom.xml
index 6768506567d9..77326dd18081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,11 @@
     <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <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>
diff --git a/util/set_version.sh b/util/set_version.sh
index d05866eca660..fd94d66399c0 100755
--- a/util/set_version.sh
+++ b/util/set_version.sh
@@ -19,6 +19,4 @@ mvn versions:set-property -Dproperty=otherVariant.version -DnewVersion="${versio
 mvn versions:set-property -Dproperty=otherVariant.version -DnewVersion="${version}-jre" -f android
 mvn versions:set-property -Dproperty=module.status -DnewVersion="${status}"
 mvn versions:set-property -Dproperty=module.status -DnewVersion="${status}" -f android
-mvn versions:set-property -Dproperty=module.parentVersion -DnewVersion="${version}-jre"
-mvn versions:set-property -Dproperty=module.parentVersion -DnewVersion="${version}-jre" -f android
 git commit -am "Set version numbers to ${version}"