From 29639a1bb0b11447ec768560bbaaf0487318d585 Mon Sep 17 00:00:00 2001
From: Dmitry Timofeev <dmitrytimofeev@google.com>
Date: Wed, 1 Dec 2021 16:05:53 +0000
Subject: [PATCH] Fix Javadoc search on JDK 11:

Fixed Javadoc search feature on JDK 11, currently used in our
scripts updating snapshot Javadocs on guava.dev and building
Guava releases, by adding no-module-directories.

Note that this option is not present in javadoc tool from JDK 8
and 13+, making javadoc generation there *not supported*.
Whilst we could solve that with profiles, the extra complexity
is deemed unnecessary given we plan to eventually migrate to 17+,
removing this option (and supported for any JDKs before 17).

Fixes #5457

TESTED=Locally with `mvn javadoc:javadoc` for `guava` module and its android flavour
---
 android/pom.xml | 10 ++++++++++
 pom.xml         | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/android/pom.xml b/android/pom.xml
index f040407448f3..f9c85505e610 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -190,6 +190,16 @@
             </additionalOptions>
             <linksource>true</linksource>
             <source>8</source>
+            <!--
+                no-module-directories is required on JDK 11 so that
+                Javadoc search works correctly.
+
+                This option is not present on 8 and 13+ (https://bugs.openjdk.java.net/browse/JDK-8215582),
+                hence, building Javadocs is only supported on JDK 11.
+
+                Remove it once our release and test scripts are migrated to a recent JDK (17+).
+             -->
+            <additionalJOption>--no-module-directories</additionalJOption>
           </configuration>
           <executions>
             <execution>
diff --git a/pom.xml b/pom.xml
index 87dae7e9b713..a0762f8c96da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,16 @@
             </additionalOptions>
             <linksource>true</linksource>
             <source>8</source>
+            <!--
+                no-module-directories is required on JDK 11 so that
+                Javadoc search works correctly.
+
+                This option is not present on 8 and 13+ (https://bugs.openjdk.java.net/browse/JDK-8215582),
+                hence, building Javadocs is only supported on JDK 11.
+
+                Remove it once our release and test scripts are migrated to a recent JDK (17+).
+             -->
+            <additionalJOption>--no-module-directories</additionalJOption>
           </configuration>
           <executions>
             <execution>