diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index 822a88e4c357..7a17eec030a8 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -127,8 +127,8 @@
           <!-- (We need JDK *sources*, not just -link, so that {@inheritDoc} works.) -->
           <sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources</sourcepath>
 
-          <subpackages>com.google.common</subpackages>
-          <excludePackageNames>com.google.common.base.internal</excludePackageNames>
+          <!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
+          <excludePackageNames>com.google.common.base.internal,com.google.thirdparty.publicsuffix,com.oracle,com.sun,java,javax,jdk,org,sun</excludePackageNames>
 
           <!-- TODO(cpovirk): Move this to the parent after making the package-list files available there. -->
           <!-- We add the link ourselves, both so that we can choose Java 9 over the version that -source suggests and so that we can solve the JSR305 problem described below. -->
diff --git a/android/pom.xml b/android/pom.xml
index ae67dd8b5337..6a17e9c6b7d6 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -167,6 +167,7 @@
               <additionalOption>-Xdoclint:-html</additionalOption>
             </additionalOptions>
             <linksource>true</linksource>
+            <source>8</source>
           </configuration>
           <executions>
             <execution>
diff --git a/guava/pom.xml b/guava/pom.xml
index b7562b0b8c8d..077b9587f9b2 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -127,8 +127,8 @@
           <!-- (We need JDK *sources*, not just -link, so that {@inheritDoc} works.) -->
           <sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources</sourcepath>
 
-          <subpackages>com.google.common</subpackages>
-          <excludePackageNames>com.google.common.base.internal</excludePackageNames>
+          <!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
+          <excludePackageNames>com.google.common.base.internal,com.google.thirdparty.publicsuffix,com.oracle,com.sun,java,javax,jdk,org,sun</excludePackageNames>
 
           <!-- TODO(cpovirk): Move this to the parent after making the package-list files available there. -->
           <!-- We add the link ourselves, both so that we can choose Java 9 over the version that -source suggests and so that we can solve the JSR305 problem described below. -->
diff --git a/pom.xml b/pom.xml
index 7578dbd72086..f18cced6edc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
               <additionalOption>-Xdoclint:-html</additionalOption>
             </additionalOptions>
             <linksource>true</linksource>
+            <source>8</source>
           </configuration>
           <executions>
             <execution>