From b937ab0eea849ebd78e9554b86bdcf318c999f94 Mon Sep 17 00:00:00 2001
From: zlt <zlt@google.com>
Date: Tue, 12 Feb 2019 10:10:55 -0800
Subject: [PATCH] Automated rollback of changelist
 cd334655f6ade9e07685b976db1572674382b157

*** Original change description ***

Internal GWT change

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=233628983
---
 .../common/annotations/Annotations.gwt.xml    |  5 +-
 .../src/com/google/common/base/Base.gwt.xml   | 14 +++--
 .../src/com/google/common/cache/Cache.gwt.xml | 20 ++++---
 .../com/google/common/collect/Collect.gwt.xml | 23 +++++---
 .../com/google/common/escape/Escape.gwt.xml   | 11 ++--
 .../src/com/google/common/html/Html.gwt.xml   | 11 ++--
 guava-gwt/src/com/google/common/io/Io.gwt.xml | 17 +++---
 .../src/com/google/common/math/Math.gwt.xml   | 14 +++--
 .../src/com/google/common/net/Net.gwt.xml     | 26 +++++----
 .../common/primitives/Primitives.gwt.xml      | 14 +++--
 .../common/util/concurrent/Concurrent.gwt.xml | 17 +++---
 .../src/com/google/common/xml/Xml.gwt.xml     | 14 +++--
 .../publicsuffix/PublicSuffixPatterns.gwt.xml | 47 +++++++++-------
 .../publicsuffix/PublicSuffixType.gwt.xml     | 41 ++++++++------
 .../common/collect/testing/Testing.gwt.xml    | 23 +++++---
 .../collect/testing/google/Google.gwt.xml     | 53 +++++++++++--------
 .../common/escape/testing/Testing.gwt.xml     | 45 +++++++++-------
 .../com/google/common/testing/Testing.gwt.xml | 20 ++++---
 18 files changed, 255 insertions(+), 160 deletions(-)

diff --git a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
index 9a44903f8f4a..d8167055b46b 100644
--- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
+++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -14,5 +13,7 @@
   <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
    
   <super-source path="super"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/base/Base.gwt.xml b/guava-gwt/src/com/google/common/base/Base.gwt.xml
index 61a206a89813..4df8ad0a81b8 100644
--- a/guava-gwt/src/com/google/common/base/Base.gwt.xml
+++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -18,4 +14,12 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.user.User"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="java.util.Util"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
index 19d0e39a9bb7..7b21cfbe3e37 100644
--- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
+++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="com.google.common.util.concurrent.Concurrent"/>
-  <inherits name="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -20,4 +14,16 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.collect.Collect"/>
+   
+  <inherits name="com.google.common.util.concurrent.Concurrent"/>
+   
+  <inherits name="java.util.Util"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
index 1292c38a5948..5c71637d869f 100644
--- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
+++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.math.Math"/>
-  <inherits name="com.google.common.primitives.Primitives"/>
-  <inherits name="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -21,4 +14,18 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.user.User"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.math.Math"/>
+   
+  <inherits name="com.google.common.primitives.Primitives"/>
+   
+  <inherits name="java.util.Util"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
index ae395d6481dd..c442ad25fbe5 100644
--- a/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
+++ b/guava-gwt/src/com/google/common/escape/Escape.gwt.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -17,4 +14,10 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/html/Html.gwt.xml b/guava-gwt/src/com/google/common/html/Html.gwt.xml
index 1ca66cf1eb19..d59eeaaceb6a 100644
--- a/guava-gwt/src/com/google/common/html/Html.gwt.xml
+++ b/guava-gwt/src/com/google/common/html/Html.gwt.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.escape.Escape"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -16,5 +13,11 @@
   <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
    
   <super-source path="super"/>
+    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.escape.Escape"/>
+   
+  <inherits name="com.google.gwt.core.Core"/>
    
 </module>
diff --git a/guava-gwt/src/com/google/common/io/Io.gwt.xml b/guava-gwt/src/com/google/common/io/Io.gwt.xml
index 94b9f999196c..c4287c1e0d2b 100644
--- a/guava-gwt/src/com/google/common/io/Io.gwt.xml
+++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.math.Math"/>
-  <inherits name="com.google.common.primitives.Primitives"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -19,4 +14,14 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.math.Math"/>
+   
+  <inherits name="com.google.common.primitives.Primitives"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/math/Math.gwt.xml b/guava-gwt/src/com/google/common/math/Math.gwt.xml
index 8b0eb749fa90..686f3c531b44 100644
--- a/guava-gwt/src/com/google/common/math/Math.gwt.xml
+++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.primitives.Primitives"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -18,4 +14,12 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.primitives.Primitives"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/net/Net.gwt.xml b/guava-gwt/src/com/google/common/net/Net.gwt.xml
index 7b1c5d956478..f1da2e724b07 100644
--- a/guava-gwt/src/com/google/common/net/Net.gwt.xml
+++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="com.google.common.escape.Escape"/>
-  <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixPatterns"/>
-  <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -22,4 +14,20 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.user.User"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.collect.Collect"/>
+   
+  <inherits name="com.google.common.escape.Escape"/>
+    
+  <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixPatterns"/>
+   
+  <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
index 1a3c2506caf1..b52382ddcd70 100644
--- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
+++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -18,4 +14,12 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.user.User"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
index 95545d7455fd..4981b291ed05 100644
--- a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
+++ b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -19,4 +14,14 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.collect.Collect"/>
+   
+  <inherits name="java.util.Util"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
index e8b3e70403ca..8fad4a6acfcc 100644
--- a/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
+++ b/guava-gwt/src/com/google/common/xml/Xml.gwt.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.escape.Escape"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -18,4 +14,12 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.escape.Escape"/>
+    
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
index 1984797a562d..beb498b406bb 100644
--- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
+++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixPatterns.gwt.xml
@@ -1,22 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="com.google.gwt.core.Core"/>
-   
-  <source path="">
-     
-    <!-- Hack to keep collect from hiding collect.testing supersource: -->
-     
-    <exclude name="**/testing/**"/>
-     
-  </source>
-    
-  <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
-   
-  <super-source path="super"/>
-   
+<source path="">
+  <!-- Hack to keep collect from hiding collect.testing supersource: -->
+  <exclude name="**/testing/**"/>
+</source>
+
+<!--
+     We used to set this only for packages that had manual supersource.
+     That worked everywhere that I know of except for one place:
+     when running the GWT util.concurrent tests under Guava.
+     The problem is that GWT responds poorly to two .gwt.xml files in the same Java package:
+     https://goo.gl/pRV3Yn
+     The summary is that it ignores one file in favor of the other.
+     util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests.
+     util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource.
+     GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either.
+     This causes it to fail to find AtomicLongMapTest.
+     Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none.
+     GWT is happy to ignore us when we specify a nonexistent path.
+     (I hope that this workaround does not cause its own problems in the future.)
+-->
+<super-source path="super"/>
+<inherits name="com.google.thirdparty.publicsuffix.PublicSuffixType"/>
+<inherits name="com.google.common.annotations.Annotations"/>
+<inherits name="com.google.common.base.Base"/>
+<inherits name="com.google.common.collect.Collect"/>
+<inherits name="com.google.gwt.core.Core"/>
 </module>
diff --git a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
index 0838ee8e55ab..d95b658c750d 100644
--- a/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
+++ b/guava-gwt/src/com/google/thirdparty/publicsuffix/PublicSuffixType.gwt.xml
@@ -1,19 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.gwt.core.Core"/>
-   
-  <source path="">
-     
-    <!-- Hack to keep collect from hiding collect.testing supersource: -->
-     
-    <exclude name="**/testing/**"/>
-     
-  </source>
-    
-  <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
-   
-  <super-source path="super"/>
-   
+<source path="">
+  <!-- Hack to keep collect from hiding collect.testing supersource: -->
+  <exclude name="**/testing/**"/>
+</source>
+
+<!--
+     We used to set this only for packages that had manual supersource.
+     That worked everywhere that I know of except for one place:
+     when running the GWT util.concurrent tests under Guava.
+     The problem is that GWT responds poorly to two .gwt.xml files in the same Java package:
+     https://goo.gl/pRV3Yn
+     The summary is that it ignores one file in favor of the other.
+     util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests.
+     util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource.
+     GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either.
+     This causes it to fail to find AtomicLongMapTest.
+     Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none.
+     GWT is happy to ignore us when we specify a nonexistent path.
+     (I hope that this workaround does not cause its own problems in the future.)
+-->
+<super-source path="super"/>
+<inherits name="com.google.common.annotations.Annotations"/>
+<inherits name="com.google.gwt.core.Core"/>
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
index ec21d39d8754..978168748f16 100644
--- a/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testing/Testing.gwt.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.junit.JUnit"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="com.google.common.primitives.Primitives"/>
-  <inherits name="com.google.common.testing.Testing"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -21,4 +14,18 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.junit.JUnit"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.collect.Collect"/>
+   
+  <inherits name="com.google.common.primitives.Primitives"/>
+   
+  <inherits name="com.google.common.testing.Testing"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>
diff --git a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
index 7eb9a79bdc0b..0f7ee40a9818 100644
--- a/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
+++ b/guava-gwt/test/com/google/common/collect/testing/google/Google.gwt.xml
@@ -1,25 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.junit.JUnit"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="com.google.common.collect.testing.Testing"/>
-  <inherits name="com.google.common.primitives.Primitives"/>
-  <inherits name="com.google.common.testing.Testing"/>
-  <inherits name="com.google.gwt.core.Core"/>
-   
-  <source path="">
-     
-    <!-- Hack to keep collect from hiding collect.testing supersource: -->
-     
-    <exclude name="**/testing/**"/>
-     
-  </source>
-    
-  <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
-   
-  <super-source path="super"/>
-   
+<source path="">
+  <!-- Hack to keep collect from hiding collect.testing supersource: -->
+  <exclude name="**/testing/**"/>
+</source>
+
+<!--
+     We used to set this only for packages that had manual supersource.
+     That worked everywhere that I know of except for one place:
+     when running the GWT util.concurrent tests under Guava.
+     The problem is that GWT responds poorly to two .gwt.xml files in the same Java package:
+     https://goo.gl/pRV3Yn
+     The summary is that it ignores one file in favor of the other.
+     util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests.
+     util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource.
+     GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either.
+     This causes it to fail to find AtomicLongMapTest.
+     Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none.
+     GWT is happy to ignore us when we specify a nonexistent path.
+     (I hope that this workaround does not cause its own problems in the future.)
+-->
+<super-source path="super"/>
+<inherits name="com.google.gwt.junit.JUnit"/>
+<inherits name="com.google.common.annotations.Annotations"/>
+<inherits name="com.google.common.base.Base"/>
+<inherits name="com.google.common.collect.Collect"/>
+<inherits name="com.google.common.collect.testing.Testing"/>
+<inherits name="com.google.common.primitives.Primitives"/>
+<inherits name="com.google.common.testing.Testing"/>
+<inherits name="com.google.gwt.core.Core"/>
 </module>
diff --git a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
index 26ad24aae0a9..c06ebbb4b817 100644
--- a/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/escape/testing/Testing.gwt.xml
@@ -1,21 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.junit.JUnit"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.escape.Escape"/>
-  <inherits name="com.google.gwt.core.Core"/>
-   
-  <source path="">
-     
-    <!-- Hack to keep collect from hiding collect.testing supersource: -->
-     
-    <exclude name="**/testing/**"/>
-     
-  </source>
-    
-  <!-- We used to set this only for packages that had manual supersource. That worked everywhere that I know of except for one place: when running the GWT util.concurrent tests under Guava. The problem is that GWT responds poorly to two .gwt.xml files in the same Java package: https://goo.gl/pRV3Yn The summary is that it ignores one file in favor of the other. util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests. util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource. GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either. This causes it to fail to find AtomicLongMapTest. Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none. GWT is happy to ignore us when we specify a nonexistent path. (I hope that this workaround does not cause its own problems in the future.) -->
-   
-  <super-source path="super"/>
-   
+<source path="">
+  <!-- Hack to keep collect from hiding collect.testing supersource: -->
+  <exclude name="**/testing/**"/>
+</source>
+
+<!--
+     We used to set this only for packages that had manual supersource.
+     That worked everywhere that I know of except for one place:
+     when running the GWT util.concurrent tests under Guava.
+     The problem is that GWT responds poorly to two .gwt.xml files in the same Java package:
+     https://goo.gl/pRV3Yn
+     The summary is that it ignores one file in favor of the other.
+     util.concurrent, like nearly all our packages, has two .gwt.xml files: one for prod and one for tests.
+     util.concurrent, unlike our other packages, has, as of this writing, test supersource but no prod supersource.
+     GWT happens to use the prod .gwt.xml, so it looks for no supersource for tests, either.
+     This causes it to fail to find AtomicLongMapTest.
+     Our workaround is to tell GWT that util.concurrent and all other packages have prod supersource, even if they have none.
+     GWT is happy to ignore us when we specify a nonexistent path.
+     (I hope that this workaround does not cause its own problems in the future.)
+-->
+<super-source path="super"/>
+<inherits name="com.google.gwt.junit.JUnit"/>
+<inherits name="com.google.common.annotations.Annotations"/>
+<inherits name="com.google.common.escape.Escape"/>
+<inherits name="com.google.gwt.core.Core"/>
 </module>
diff --git a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
index 3ce62b0e39e4..9e815a494c8f 100644
--- a/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
+++ b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- semi-autogenerated module descriptor -->
 <module>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.junit.JUnit"/>
-  <inherits name="com.google.common.annotations.Annotations"/>
-  <inherits name="com.google.common.base.Base"/>
-  <inherits name="com.google.common.collect.Collect"/>
-  <inherits name="java.util.Util"/>
-  <inherits name="com.google.gwt.core.Core"/>
    
   <source path="">
      
@@ -20,4 +14,16 @@
    
   <super-source path="super"/>
    
+  <inherits name="com.google.gwt.junit.JUnit"/>
+   
+  <inherits name="com.google.common.annotations.Annotations"/>
+   
+  <inherits name="com.google.common.base.Base"/>
+   
+  <inherits name="com.google.common.collect.Collect"/>
+   
+  <inherits name="java.util.Util"/>
+     
+  <inherits name="com.google.gwt.core.Core"/>
+   
 </module>