[jdk11u-dev] RFR: 8222091: Javadoc does not handle package annotations correctly on package-info.java

[Liam Miller-Cushon]

This is a backport of [JDK-8222091: Javadoc does not handle package annotations correctly on package-info.java](https://bugs.openjdk.java.net/browse/JDK-8222091)

This fixes a regression in 11.0.17 caused by the backport of [JDK-8193462](https://bugs.openjdk.org/browse/JDK-8193462), see [JDK-8295850](https://bugs.openjdk.org/browse/JDK-8295850)

Original patch applied cleanly, the test was updated due to some changes in test infrastructrure:


diff --git a/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java
index cd9697eede..9f04777f81 100644
--- a/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java
@@ -25,14 +25,12 @@
  * @test
  * @bug  8222091
  * @summary  Javadoc does not handle package annotations correctly on package-info.java
- * @library  ../../lib/
+ * @library  ../lib/
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build   javadoc.tester.*
+ * @build   JavadocTester
  * @run main TestPackageAnnotation
  */

-import javadoc.tester.JavadocTester;
-
 public class TestPackageAnnotation extends JavadocTester {

     public static void main(String... args) throws Exception {


Tested: tier1 langtools tests passed

-------------

Commit messages:
 - Backport 4d08dd703e4d742635c3dbc8acc4b07b3a298657

Changes: https://git.openjdk.org/jdk11u-dev/pull/1475/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1475&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8222091
  Stats: 244 lines in 9 files changed: 238 ins; 0 del; 6 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1475.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev pull/1475/head:pull/1475

PR: https://git.openjdk.org/jdk11u-dev/pull/1475