changeset 2937:fd6bda430d96 jdk9-b66

Merge
author lana
date Thu, 21 May 2015 16:19:29 -0700
parents 82d0e10df078 1391795f35fe
children a3f6beca1df2 36935753933f
files test/tools/javac/5005368.java test/tools/javac/generics/InterfaceCast1.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java test/tools/javac/generics/wildcards/AssignmentSameType1.java test/tools/javac/generics/wildcards/AssignmentSameType2.java test/tools/javac/generics/wildcards/AssignmentSameType3.java test/tools/javac/generics/wildcards/AssignmentSameType4.java test/tools/javac/generics/wildcards/AssignmentSameType5.java test/tools/javac/generics/wildcards/AssignmentSameType6.java test/tools/javac/generics/wildcards/AssignmentSameType7.java test/tools/javac/generics/wildcards/AssignmentSameType8.java test/tools/javac/generics/wildcards/neg/CastFail1.java test/tools/javac/generics/wildcards/neg/CastFail10.java test/tools/javac/generics/wildcards/neg/CastFail11.java test/tools/javac/generics/wildcards/neg/CastFail12.java test/tools/javac/generics/wildcards/neg/CastFail13.java test/tools/javac/generics/wildcards/neg/CastFail14.java test/tools/javac/generics/wildcards/neg/CastFail15.java test/tools/javac/generics/wildcards/neg/CastFail16.java test/tools/javac/generics/wildcards/neg/CastFail17.java test/tools/javac/generics/wildcards/neg/CastFail18.java test/tools/javac/generics/wildcards/neg/CastFail19.java test/tools/javac/generics/wildcards/neg/CastFail2.java test/tools/javac/generics/wildcards/neg/CastFail20.java test/tools/javac/generics/wildcards/neg/CastFail21.java test/tools/javac/generics/wildcards/neg/CastFail3.java test/tools/javac/generics/wildcards/neg/CastFail4.java test/tools/javac/generics/wildcards/neg/CastFail5.java test/tools/javac/generics/wildcards/neg/CastFail6.java test/tools/javac/generics/wildcards/neg/CastFail7.java test/tools/javac/generics/wildcards/neg/CastFail8.java test/tools/javac/generics/wildcards/neg/CastFail9.java test/tools/javac/generics/wildcards/neg/CastWarn10.java test/tools/javac/generics/wildcards/neg/CastWarn11.java test/tools/javac/generics/wildcards/neg/CastWarn12.java test/tools/javac/generics/wildcards/neg/CastWarn13.java test/tools/javac/generics/wildcards/neg/CastWarn14.java test/tools/javac/generics/wildcards/neg/CastWarn2.java test/tools/javac/generics/wildcards/neg/CastWarn3.java test/tools/javac/generics/wildcards/neg/CastWarn4.java test/tools/javac/generics/wildcards/neg/CastWarn5.java test/tools/javac/generics/wildcards/neg/CastWarn6.java test/tools/javac/generics/wildcards/neg/CastWarn7.java test/tools/javac/generics/wildcards/neg/CastWarn8.java test/tools/javac/generics/wildcards/neg/CastWarn9.java
diffstat 1436 files changed, 5016 insertions(+), 6344 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Thu May 21 10:07:40 2015 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Thu May 21 16:19:29 2015 -0700
@@ -1317,6 +1317,9 @@
                         return isSimpleReceiver(((JCAnnotatedType)rec).underlyingType);
                     case APPLY:
                         return true;
+                    case NEWCLASS:
+                        JCNewClass nc = (JCNewClass) rec;
+                        return nc.encl == null && nc.def == null && !TreeInfo.isDiamond(nc);
                     default:
                         return false;
                 }
@@ -1371,17 +1374,24 @@
             Type site;
 
             if (rec != null) {
-                if (rec.hasTag(APPLY)) {
-                    Symbol recSym = quicklyResolveMethod(env, (JCMethodInvocation) rec);
-                    if (recSym == null)
-                        return null;
-                    Symbol resolvedReturnType =
-                            analyzeCandidateMethods(recSym, syms.errSymbol, returnSymbolAnalyzer);
-                    if (resolvedReturnType == null)
-                        return null;
-                    site = resolvedReturnType.type;
-                } else {
-                    site = attribSpeculative(rec, env, attr.unknownTypeExprInfo).type;
+                switch (rec.getTag()) {
+                    case APPLY:
+                        Symbol recSym = quicklyResolveMethod(env, (JCMethodInvocation) rec);
+                        if (recSym == null)
+                            return null;
+                        Symbol resolvedReturnType =
+                                analyzeCandidateMethods(recSym, syms.errSymbol, returnSymbolAnalyzer);
+                        if (resolvedReturnType == null)
+                            return null;
+                        site = resolvedReturnType.type;
+                        break;
+                    case NEWCLASS:
+                        JCNewClass nc = (JCNewClass) rec;
+                        site = attribSpeculative(nc.clazz, env, attr.unknownTypeExprInfo).type;
+                        break;
+                    default:
+                        site = attribSpeculative(rec, env, attr.unknownTypeExprInfo).type;
+                        break;
                 }
             } else {
                 site = env.enclClass.sym.type;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java	Thu May 21 10:07:40 2015 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -278,12 +278,12 @@
 
             ZipFileObject o = (ZipFileObject) other;
             return zarch.getAbsoluteFile().equals(o.zarch.getAbsoluteFile())
-                    && name.equals(o.name);
+                    && entry.getName().equals(o.entry.getName());
         }
 
         @Override
         public int hashCode() {
-            return zarch.getAbsoluteFile().hashCode() + name.hashCode();
+            return zarch.getAbsoluteFile().hashCode() + entry.getName().hashCode();
         }
     }
 
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Thu May 21 10:07:40 2015 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -228,12 +228,12 @@
 
             ZipFileIndexFileObject o = (ZipFileIndexFileObject) other;
             return zfIndex.getAbsoluteFile().equals(o.zfIndex.getAbsoluteFile())
-                    && name.equals(o.name);
+                    && entry.equals(o.entry);
         }
 
         @Override
         public int hashCode() {
-            return zfIndex.getAbsoluteFile().hashCode() + name.hashCode();
+            return zfIndex.getAbsoluteFile().hashCode() + entry.hashCode();
         }
 
         private String getPrefixedEntryName() {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java	Thu May 21 10:07:40 2015 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java	Thu May 21 16:19:29 2015 -0700
@@ -145,8 +145,8 @@
 
     /**
      * This class creates a graph of all dependencies as symbols are completed;
-     * when compilation finishes, the resulting dependecy graph is then dumped
-     * onto a dot file. Several options are provided to customise the output of the graph.
+     * when compilation finishes, the resulting dependency graph is then dumped
+     * onto a dot file. Several options are provided to customize the output of the graph.
      */
     public static class GraphDependencies extends Dependencies implements Closeable, Completer {
 
@@ -233,13 +233,13 @@
          * (either from source or classfile); (ii) attribution nodes, corresponding to
          * attribution actions triggered during (source) completion.
          */
-        static abstract class Node extends GraphUtils.AbstractNode<String, Node>
+        public static abstract class Node extends GraphUtils.AbstractNode<String, Node>
                 implements GraphUtils.DottableNode<String, Node> {
 
             /**
              * Model the dependencies between nodes.
              */
-            enum DependencyKind implements GraphUtils.DependencyKind {
+            public enum DependencyKind implements GraphUtils.DependencyKind {
                 /**
                  * standard dependency - i.e. completion of the source node depends
                  * on completion of the sink node.
@@ -326,7 +326,7 @@
          * This is a dependency node used to model symbol completion requests.
          * Completion requests can come from either source or class.
          */
-        static class CompletionNode extends Node {
+        public static class CompletionNode extends Node {
 
             /**
              * Completion kind (source vs. classfile)
@@ -349,9 +349,11 @@
             }
 
             final Kind ck;
+            final ClassSymbol sym;
 
             CompletionNode(ClassSymbol sym) {
                 super(sym.getQualifiedName().toString());
+                this.sym = sym;
                 //infer completion kind by looking at the symbol fields
                 boolean fromClass = (sym.classfile == null && sym.sourcefile == null) ||
                         (sym.classfile != null && sym.classfile.getKind() == JavaFileObject.Kind.CLASS);
@@ -367,6 +369,10 @@
                 p.put("shape", "ellipse");
                 return p;
             }
+
+            public ClassSymbol getClassSymbol() {
+                return sym;
+            }
         }
 
         /**
@@ -437,23 +443,23 @@
 
         @Override
         public void close() throws IOException {
+            if (!dependenciesModes.contains(DependenciesMode.REDUNDANT)) {
+                //prune spurious edges
+                new PruneVisitor().visit(dependencyNodeMap.values(), null);
+            }
+            if (!dependenciesModes.contains(DependenciesMode.CLASS)) {
+                //filter class completions
+                new FilterVisitor(CompletionNode.Kind.SOURCE).visit(dependencyNodeMap.values(), null);
+            }
+            if (!dependenciesModes.contains(DependenciesMode.SOURCE)) {
+                //filter source completions
+                new FilterVisitor(CompletionNode.Kind.CLASS).visit(dependencyNodeMap.values(), null);
+            }
+            if (dependenciesModes.contains(DependenciesMode.SIDE_EFFECTS)) {
+                //add side-effects edges
+                new SideEffectVisitor().visit(dependencyNodeMap.values(), null);
+            }
             if (dependenciesFile != null) {
-                if (!dependenciesModes.contains(DependenciesMode.REDUNDANT)) {
-                    //prune spurious edges
-                    new PruneVisitor().visit(dependencyNodeMap.values(), null);
-                }
-                if (!dependenciesModes.contains(DependenciesMode.CLASS)) {
-                    //filter class completions
-                    new FilterVisitor(CompletionNode.Kind.SOURCE).visit(dependencyNodeMap.values(), null);
-                }
-                if (!dependenciesModes.contains(DependenciesMode.SOURCE)) {
-                    //filter source completions
-                    new FilterVisitor(CompletionNode.Kind.CLASS).visit(dependencyNodeMap.values(), null);
-                }
-                if (dependenciesModes.contains(DependenciesMode.SIDE_EFFECTS)) {
-                    //add side-effects edges
-                    new SideEffectVisitor().visit(dependencyNodeMap.values(), null);
-                }
                 //write to file
                 try (FileWriter fw = new FileWriter(dependenciesFile)) {
                     fw.append(GraphUtils.toDot(dependencyNodeMap.values(), "CompletionDeps", ""));
@@ -473,6 +479,10 @@
             return true;
         }
 
+        public Collection<Node> getNodes() {
+            return dependencyNodeMap.values();
+        }
+
         /**
          * This visitor is used to generate the special side-effect dependencies
          * given a graph containing only standard dependencies.
--- a/test/com/sun/javadoc/5093723/T5093723.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/5093723/T5093723.java	Thu May 21 16:19:29 2015 -0700
@@ -26,6 +26,7 @@
  * @bug      5093723
  * @summary  REGRESSION: ClassCastException in SingleIndexWriter
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main T5093723
  */
--- a/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Add text equivalent of class tree ASCII art for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessAsciiArt
  */
--- a/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Add title attribute to <FRAME> tags for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessFrameTitle
  */
--- a/test/com/sun/javadoc/AccessH1/AccessH1.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AccessH1/AccessH1.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessH1
  */
--- a/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Add ability to skip over nav bar for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessSkipNav
  */
--- a/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the tables for summary attribute
  * @author   dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main AccessSummary
  */
--- a/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AuthorDD
  */
--- a/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary stddoclet: {@docRoot} inserts an extra trailing "/"
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main DocRootSlash
  */
--- a/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Using {@inheritDoc} in simple tag defined via -tag fails
  * @author Mike Duigou
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main DocTest
  */
--- a/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           Window title shouldn't change when loading left frames (javascript)
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main JavascriptWinTitle
  */
--- a/test/com/sun/javadoc/MetaTag/MetaTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/MetaTag/MetaTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           class and member names to improve API search
  * @author   dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main MetaTag
  */
--- a/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           (2) -packagesheader, and (3) -header -packagesheader
  * @author   dkramer
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main PackagesHeader
  */
--- a/test/com/sun/javadoc/T6735320/T6735320.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/T6735320/T6735320.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6735320
  * @summary javadoc throws exception if serialField value is missing
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main T6735320
  */
--- a/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Thu May 21 16:19:29 2015 -0700
@@ -30,6 +30,7 @@
  *           HTML table tags inserted in wrong place in pakcage use page
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main ValidHtml
  */
--- a/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  com.sun.tools.doclets.standard.Standard contains hard-coded version number
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main VersionNumber
  */
--- a/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary stddoclet: With frames off, window titles have "()" appended
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main WindowTitles
  */
--- a/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test the generation of constant-values.html.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstantValuesDriver
  */
--- a/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Determine if duplicate throws tags can be used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDupThrowsTags
  */
--- a/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifys that the -link option handles absolute paths.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestAbsLinkPath
  */
--- a/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           if the abstract modifier is present explicitly or implicitly.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAbstractMethod
  */
--- a/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test for valid name attribute in HTML anchors.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestAnchorNames
  */
--- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Thu May 21 16:19:29 2015 -0700
@@ -28,6 +28,7 @@
  *           element headers
  * @author   Mahmood Ali
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAnnotationOptional
  */
--- a/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           extra HR tags.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAnnotationTypes
  */
--- a/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * has a forward slash.  It would be wrong to use a back slash.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBackSlashInLink
  */
--- a/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * when a bad package.html file is in the JAR.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBadPackageFileInJar
  */
--- a/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           file in the same directory as the file being documented.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestBadSourceFile
  */
--- a/test/com/sun/javadoc/testBaseClass/TestBaseClass.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testBaseClass/TestBaseClass.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc does not process base class.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build BaseClass
  * @build JavadocTester
  * @run main TestBaseClass
--- a/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * Wrong Answer: "The class is empty (i.e."
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBreakIterator
  */
--- a/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure tool parses CR line separators properly.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestCRLineSeparator
  */
--- a/test/com/sun/javadoc/testCharset/TestCharset.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testCharset/TestCharset.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           part of the meta tag.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestCharset
  */
--- a/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifies that class cross references work properly.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestClassCrossReferences
  * @run main TestClassCrossReferences
--- a/test/com/sun/javadoc/testClassTree/TestClassTree.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testClassTree/TestClassTree.java	Thu May 21 16:19:29 2015 -0700
@@ -30,6 +30,7 @@
  *           types.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestClassTree
  */
--- a/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * classes.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestCmndLineClass
  */
--- a/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to verify javadoc executes without CompletionFailure exception.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestCompletionFailure
  */
--- a/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * generated when doclet has nothing to document.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstantValuesPage
  */
--- a/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           <dl></dl>.  Check for this in the output.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestConstructorIndent
  */
--- a/test/com/sun/javadoc/testConstructors/TestConstructors.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testConstructors/TestConstructors.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test for constructor name which should be a non-qualified name.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstructors
  */
--- a/test/com/sun/javadoc/testCustomTag/TestCustomTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testCustomTag/TestCustomTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary  Test custom tag. Verify that an unknown tag generates appropriate warnings.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build    JavadocTester taglets.CustomTag
  * @run main TestCustomTag
  */
--- a/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  <DESC>
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDeprecatedDocs
  */
--- a/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
              used for stylesheet as well.
  * @author   jayashree viswanathan
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDocEncoding
  */
--- a/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           DocErrorReporter.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDocErrorReporter
  */
--- a/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *          Also test that -docfilessubdirs and -excludedocfilessubdir both work.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocFileDir
  */
--- a/test/com/sun/javadoc/testDocFiles/TestDocFiles.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocFiles/TestDocFiles.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8008949
  * @summary verify that doc-files get copied
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocFiles
  */
--- a/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * Make sure that the docRoot tag works with the -bottom option.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocRootInlineTag
  */
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifies the -Xdocrootparent option.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocRootLink
  */
--- a/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * warning messages about duplicate param tags.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDupParamWarn
  */
--- a/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * run on a completely empty class (no comments or members).
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestEmptyClass
  */
--- a/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Check the outer class when documenting enclosing class/interface.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestEnclosingClass
  */
--- a/test/com/sun/javadoc/testEncoding/TestEncoding.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testEncoding/TestEncoding.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * properly passed from Javadoc to the source file parser.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestEncoding
  */
--- a/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * "overrides" documentation even though the method is external.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester TestExternalOverridenMethod
  * @run main TestExternalOverridenMethod
  */
--- a/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8000418 8024288
  * @summary Verify that files use a common Generated By string
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestGeneratedBy
  */
--- a/test/com/sun/javadoc/testGroupOption/TestGroupOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testGroupOption/TestGroupOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           to be printed.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestGroupOption
  */
--- a/test/com/sun/javadoc/testHeadings/TestHeadings.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHeadings/TestHeadings.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that headings use the TH tag instead of the TD tag.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @build    TestHeadings
  * @run main TestHeadings
--- a/test/com/sun/javadoc/testHelpFile/TestHelpFile.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHelpFile/TestHelpFile.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that the help file is generated correctly.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHelpFile
  */
--- a/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           the help link appears in the documentation.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester TestHelpOption
  * @run main TestHelpOption
  */
--- a/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * documented as inherited.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHiddenMembers
  */
--- a/test/com/sun/javadoc/testHref/TestHref.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHref/TestHref.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Verify that spaces do not appear in hrefs and anchors.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHref
  */
--- a/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * appear in doc comments.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHrefInDocComment
  */
--- a/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           are no fields to document.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHtmlComments
  */
--- a/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the nesting of definition list tags.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlDefinitionListTag
  */
--- a/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java	Thu May 21 16:19:29 2015 -0700
@@ -28,6 +28,8 @@
  * @bug 6851834
  * @summary This test verifies the HTML document generation for javadoc output.
  * @library ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.formats.html.markup
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit
  * @build JavadocTester
  * @author Bhavesh Patel
  * @run main TestHtmlDocument
--- a/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the use of <strong> HTML tag instead of <B> by Javadoc std doclet.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlStrongTag
  */
--- a/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test styles on HTML tables generated by javadoc.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlTableStyles
  */
--- a/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  HTML tables should have table summary, caption and table headers.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHtmlTableTags
  */
--- a/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the use of lang attribute by <HTML>.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlTag
  */
--- a/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test the version of HTML generated by the javadoc tool.
  * @author bpatel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlVersion
  */
--- a/test/com/sun/javadoc/testIndentation/TestIndentation.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testIndentation/TestIndentation.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8011288
  * @summary  Erratic/inconsistent indentation of signatures
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestIndentation
  */
--- a/test/com/sun/javadoc/testIndex/TestIndex.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testIndex/TestIndex.java	Thu May 21 16:19:29 2015 -0700
@@ -29,6 +29,7 @@
  *           Test for unnamed package in index.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestIndex
  */
--- a/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to make sure label is used for inline links.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestInlineLinkLabel
  */
--- a/test/com/sun/javadoc/testInterface/TestInterface.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testInterface/TestInterface.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *           implementing classes in the documentation for I.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestInterface
  */
--- a/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test of the JavaFX doclet features.
  * @author jvalenta
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestJavaFX
  */
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Verify that the output has the right javascript.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestJavascript
  */
--- a/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           javadoc.
  * @author   bpatel
  * @library  ../lib/
+ * @modules jdk.javadoc
  * @build    JavadocTester TestLambdaFeature
  * @run main TestLambdaFeature
  */
--- a/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *    spaces stripped
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main LeadingSpaces
  */
--- a/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * doclet still works with Taglets that implement the 1.4.0 interface.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester ToDoTaglet UnderlineTaglet Check
  * @run main TestLegacyTaglet
  */
--- a/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Make sure that bad -link arguments trigger warnings.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBadLinkOption
  */
--- a/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * right files, and URLs with and without trailing slash are accepted.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestLinkOption
  */
--- a/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * link and label.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestNewLineInLink
  */
--- a/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           non-qualified name, furthermore, ensure the right one is linked.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestLinkTaglet
  */
--- a/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Thu May 21 16:19:29 2015 -0700
@@ -28,6 +28,7 @@
  * from a serializable class to serialized-form.html.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestLinkToSerialForm
  */
--- a/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002387 8014636
  * @summary  Improve rendered HTML formatting for {@code}
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestLiteralCodeInPre
  */
--- a/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *          Verify that inheritence labels are correct.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestMemberInheritence
  */
--- a/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Thu May 21 16:19:29 2015 -0700
@@ -29,6 +29,7 @@
  *           documentation is inherited but the return type isn't.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMemberSummary
  */
--- a/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test for various method types in the method summary table
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMethodTypes
  */
--- a/test/com/sun/javadoc/testModifier/TestModifier.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testModifier/TestModifier.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc declares interfaces to be "abstract".
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build ModifierAbstract
  * @build JavadocTester
  * @run main TestModifier
--- a/test/com/sun/javadoc/testNavigation/TestNavigation.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNavigation/TestNavigation.java	Thu May 21 16:19:29 2015 -0700
@@ -28,6 +28,7 @@
  *           Make sure the navagation is 2 columns, not 3.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNavigation
  */
--- a/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test HTML output for nested generic types.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNestedGenerics
  */
--- a/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @summary Test for nested inline tags. *
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build JavadocTester
  * @build testtaglets.UnderlineTaglet
  * @build testtaglets.BoldTaglet
--- a/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           language features are properly documented.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNewLanguageFeatures
  */
--- a/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           longer used.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNoPackagesFile
  */
--- a/test/com/sun/javadoc/testNotifications/TestNotifications.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testNotifications/TestNotifications.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           Make sure classname is not include in javadoc usage message.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNotifications
  */
--- a/test/com/sun/javadoc/testOptions/TestOptions.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOptions/TestOptions.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the output for -header and -footer options.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestOptions
  */
--- a/test/com/sun/javadoc/testOrdering/TestOrdering.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOrdering/TestOrdering.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary test to determine if members are ordered correctly
  * @author ksrini
  * @library ../lib/
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOrdering
  */
--- a/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           interfaces are documented
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMultiInheritence
  */
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           class
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestOverridenMethodDocCopy
  */
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethods
  */
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethodsWithPackageFlag
  */
--- a/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethodsWithPrivateFlag
  */
--- a/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test package deprecation.
  * @author   bpatel
  * @library  ../lib/
+ * @modules jdk.javadoc
  * @build    JavadocTester TestPackageDeprecation
  * @run main TestPackageDeprecation
  */
--- a/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * when single or multiple packages are documented.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestPackagePage
  */
--- a/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           Make sure inheritDoc cannot be used in an invalid param tag.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestParamTaglet
  */
--- a/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
  *           signature is displayed correctly without extra space at the beginning.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestPrivateClasses
  */
--- a/test/com/sun/javadoc/testProfiles/TestProfiles.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testProfiles/TestProfiles.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Test javadoc support for profiles.
  * @author   Bhavesh Patel, Evgeniya Stepanova
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestProfiles
  */
--- a/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test javadoc options support for profiles.
  * @author   Evgeniya Stepanova
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestProfilesConfiguration
  */
--- a/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Make Javadoc capable of traversing/recursing all of given subpackages.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestRecurseSubPackages
  */
--- a/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           output so that they are not broken.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestRelativeLinks
  */
--- a/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test repeated annotations output.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestRepeatedAnnotations
  */
--- a/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Warn when a return tag is used on a method without a return type.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestReturnTag
  */
--- a/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Javadoc is confused by at-link to imported classes outside of the set of generated packages
  * @author   jjg
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSeeTag
  */
--- a/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * documented in the serialized form.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSerialVersionUID
  */
--- a/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * Make sure see tags work in serialized form.
  * @author jamieh
  * @library ../lib/
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestSerializedForm
  * @run main TestSerializedForm
--- a/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies deprecation info in serialized-form.html.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSerializedFormDeprecationInfo
  */
--- a/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * considered a separator when parsing the simple tag argument.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSimpleTag
  */
--- a/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * exclude a simple tag by using -tag tagname:X
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSimpleTagExclude
  */
--- a/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8008768 8026567
  * @summary  Using {@inheritDoc} in simple tag defined via -tag fails
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSimpleTagInherit
  */
--- a/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test to make sure that the since tag works correctly
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSinceTag
  */
--- a/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify that a link in single quotes copied to the class-use page as is.
  * @author Yuri Nesterenko
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSingleQuotedLink
  */
--- a/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * when -linksourcetab is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSourceTab
  */
--- a/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestStylesheet
  */
--- a/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test for correct sub title generation.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSubTitle
  */
--- a/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           inherits methods.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSummaryHeading
  */
--- a/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * each class in serialized form page.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSuperClassInSerialForm
  */
--- a/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *    characters correctly.  This test case needs to be run in en_US locale.
  * @author Naoto Sato
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSupplementary
  */
--- a/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Determine if the new Tag.holder() method works properly.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestTagHolderMethod
  * @run main TestTagHolderMethod
--- a/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary <DESC>
  * @author  jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTagInheritence
  */
--- a/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Determine if proper warning messages are printed when know.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestTagMisuse
  * @run main TestTagMisuse
--- a/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test checks the generated tag output.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTagOutput
  */
--- a/test/com/sun/javadoc/testTaglets/TestTaglets.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTaglets/TestTaglets.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,9 @@
  *           sure that only the first sentence shows up in the summary table.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build    JavadocTester taglets.Foo
  * @run main TestTaglets
  */
--- a/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * throws section.  Make sure that the link is below a Throws heading.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestThrowsHead
  */
--- a/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * the case where the name of one exception is not fully qualified.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestThrowsTagInheritence
  */
--- a/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           correct order.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestThrowsTag
  */
--- a/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to make sure that the title attribute shows up in links.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTitleInHref
  */
--- a/test/com/sun/javadoc/testTopOption/TestTopOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTopOption/TestTopOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the new -top option.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestTopOption
  */
--- a/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that type annotations are displayed correctly
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @ignore 8006735 output type annotations in javadoc
  * @build    JavadocTester
  * @run main TestTypeAnnotations
--- a/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Thu May 21 16:19:29 2015 -0700
@@ -31,6 +31,7 @@
  *           parameter links in the class/annotation signature section when -linksource is set.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestTypeParameters
  */
--- a/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           Generate a package summary for the unnamed package.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestUnnamedPackage
  */
--- a/test/com/sun/javadoc/testUseOption/TestUseOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testUseOption/TestUseOption.java	Thu May 21 16:19:29 2015 -0700
@@ -27,6 +27,7 @@
  * @summary A simple test to ensure class-use files are correct.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestUseOption
  */
--- a/test/com/sun/javadoc/testValueTag/TestValueTag.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testValueTag/TestValueTag.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * use cases. The explainations for each test case are written below.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestValueTag
  */
--- a/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * name is used with param.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestWarnBadParamNames
  */
--- a/test/com/sun/javadoc/testWarnings/TestWarnings.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testWarnings/TestWarnings.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  *           Make sure error message starts with "error -".
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestWarnings
  */
--- a/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test for window title.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestWindowTitle
  */
--- a/test/com/sun/javadoc/testXOption/TestXOption.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/testXOption/TestXOption.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8007687
  * @summary  Make sure that the -X option works properly.
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestXOption
  */
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *
  * @author   Mahmood Ali <mali>
  * @library  ../../lib
+ * @modules jdk.javadoc
  * @ignore
  * @build    JavadocTester
  * @run main TestSmoke
--- a/test/tools/all/RunCodingRules.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/all/RunCodingRules.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8043643
  * @summary Run the langtools coding rules over the langtools source code.
+ * @modules java.base/sun.reflect.annotation
+ *          java.logging
+ *          java.xml
+ *          jdk.compiler/com.sun.tools.javac.resources
  */
 
 
--- a/test/tools/doclint/AccessTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AccessTest.protected.out AccessTest.java
  * @run main DocLintTester -Xmsgs -ref AccessTest.private.out AccessTest.java
--- a/test/tools/doclint/AccessTest.package.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessTest.package.out	Thu May 21 16:19:29 2015 -0700
@@ -1,19 +1,19 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:33: error: malformed HTML
+AccessTest.java:34: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:46: error: malformed HTML
+AccessTest.java:47: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:51: error: malformed HTML
+AccessTest.java:52: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:56: error: malformed HTML
+AccessTest.java:57: error: malformed HTML
      * package-private a < b
                          ^
 6 errors
--- a/test/tools/doclint/AccessTest.private.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessTest.private.out	Thu May 21 16:19:29 2015 -0700
@@ -1,25 +1,25 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:33: error: malformed HTML
+AccessTest.java:34: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:38: error: malformed HTML
+AccessTest.java:39: error: malformed HTML
      * private a < b
                  ^
-AccessTest.java:46: error: malformed HTML
+AccessTest.java:47: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:51: error: malformed HTML
+AccessTest.java:52: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:56: error: malformed HTML
+AccessTest.java:57: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:61: error: malformed HTML
+AccessTest.java:62: error: malformed HTML
      * private a < b
                  ^
 8 errors
--- a/test/tools/doclint/AccessTest.protected.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessTest.protected.out	Thu May 21 16:19:29 2015 -0700
@@ -1,7 +1,7 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
 2 errors
--- a/test/tools/doclint/AccessTest.public.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessTest.public.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
 1 error
--- a/test/tools/doclint/AccessibilityTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessibilityTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-accessibility AccessibilityTest.java
  * @run main DocLintTester -ref AccessibilityTest.out AccessibilityTest.java
--- a/test/tools/doclint/AccessibilityTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AccessibilityTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,13 +1,13 @@
-AccessibilityTest.java:14: error: header used out of sequence: <H2>
+AccessibilityTest.java:15: error: header used out of sequence: <H2>
      * <h2> ... </h2>
        ^
-AccessibilityTest.java:20: error: header used out of sequence: <H3>
+AccessibilityTest.java:21: error: header used out of sequence: <H3>
      * <h3> ... </h3>
        ^
-AccessibilityTest.java:25: error: no "alt" attribute for image
+AccessibilityTest.java:26: error: no "alt" attribute for image
      * <img src="x.jpg">
        ^
-AccessibilityTest.java:40: error: no summary or caption for table
+AccessibilityTest.java:41: error: no summary or caption for table
      * <table><tr><th>head<tr><td>data</table>
                                       ^
 4 errors
--- a/test/tools/doclint/AnchorTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AnchorTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorTest.out AnchorTest.java
  */
--- a/test/tools/doclint/AnchorTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AnchorTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,49 +1,49 @@
-AnchorTest.java:19: error: anchor already defined: "foo"
+AnchorTest.java:20: error: anchor already defined: "foo"
      * <a name=foo></a>
           ^
-AnchorTest.java:24: error: invalid name for anchor: ""
+AnchorTest.java:25: error: invalid name for anchor: ""
      * <a name=></a>
           ^
-AnchorTest.java:29: error: invalid name for anchor: "123"
+AnchorTest.java:30: error: invalid name for anchor: "123"
      * <a name=123 ></a>
           ^
-AnchorTest.java:34: error: no value given for anchor
+AnchorTest.java:35: error: no value given for anchor
      * <a name ></a>
           ^
-AnchorTest.java:46: error: anchor already defined: "foo"
+AnchorTest.java:47: error: anchor already defined: "foo"
      * <a id=foo></a>
           ^
-AnchorTest.java:51: error: invalid name for anchor: ""
+AnchorTest.java:52: error: invalid name for anchor: ""
      * <a id=></a>
           ^
-AnchorTest.java:51: error: anchor already defined: ""
+AnchorTest.java:52: error: anchor already defined: ""
      * <a id=></a>
           ^
-AnchorTest.java:56: error: invalid name for anchor: "123"
+AnchorTest.java:57: error: invalid name for anchor: "123"
      * <a id=123 ></a>
           ^
-AnchorTest.java:56: error: anchor already defined: "123"
+AnchorTest.java:57: error: anchor already defined: "123"
      * <a id=123 ></a>
           ^
-AnchorTest.java:61: error: no value given for anchor
+AnchorTest.java:62: error: no value given for anchor
      * <a id ></a>
           ^
-AnchorTest.java:73: error: anchor already defined: "foo"
+AnchorTest.java:74: error: anchor already defined: "foo"
      * <p id=foo>text</p>
           ^
-AnchorTest.java:78: error: invalid name for anchor: ""
+AnchorTest.java:79: error: invalid name for anchor: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:78: error: anchor already defined: ""
+AnchorTest.java:79: error: anchor already defined: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:83: error: invalid name for anchor: "123"
+AnchorTest.java:84: error: invalid name for anchor: "123"
      * <p id=123 >text</p>
           ^
-AnchorTest.java:83: error: anchor already defined: "123"
+AnchorTest.java:84: error: anchor already defined: "123"
      * <p id=123 >text</p>
           ^
-AnchorTest.java:88: error: no value given for anchor
+AnchorTest.java:89: error: no value given for anchor
      * <p id >text</p>
           ^
 16 errors
--- a/test/tools/doclint/AnchorTest2.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AnchorTest2.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8020313
  * @summary doclint doesn't reset HTML anchors correctly
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorTest2.out AnchorTest2.java AnchorTest2a.java
  * @run main DocLintTester -ref AnchorTest2.out AnchorTest2a.java AnchorTest2.java
--- a/test/tools/doclint/AnchorTest2.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/AnchorTest2.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-AnchorTest2.java:15: error: anchor already defined: "AnchorTest2"
+AnchorTest2.java:16: error: anchor already defined: "AnchorTest2"
     /** <a name="AnchorTest2"> </a> */
            ^
 1 error
--- a/test/tools/doclint/BadPackageCommentTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/BadPackageCommentTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8020278
  * @summary NPE in javadoc (bad handling of bad tag in package-info.java)
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref BadPackageCommentTest.out BadPackageCommentTest.java
  */
--- a/test/tools/doclint/BadPackageCommentTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/BadPackageCommentTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,13 +1,13 @@
-BadPackageCommentTest.java:13: warning: documentation comment not expected here
+BadPackageCommentTest.java:14: warning: documentation comment not expected here
 package p;
 ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
    ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
     ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
      ^
 3 errors
--- a/test/tools/doclint/CoverageExtras.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/CoverageExtras.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import com.sun.tools.doclint.Checker;
--- a/test/tools/doclint/CustomTagTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/CustomTagTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006248 8028318
  * @summary DocLint should report unknown tags
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester CustomTagTest.java
  * @run main DocLintTester -XcustomTags: -ref CustomTagTest.out CustomTagTest.java
--- a/test/tools/doclint/CustomTagTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/CustomTagTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,10 +1,10 @@
-CustomTagTest.java:14: error: unknown tag: customTag
+CustomTagTest.java:15: error: unknown tag: customTag
  * @customTag Text for a custom tag.
    ^
-CustomTagTest.java:15: error: unknown tag: custom.tag
+CustomTagTest.java:16: error: unknown tag: custom.tag
  * @custom.tag Text for another custom tag.
    ^
-CustomTagTest.java:16: error: unknown tag: unknownTag
+CustomTagTest.java:17: error: unknown tag: unknownTag
  * @unknownTag Text for an unknown tag.
    ^
 3 errors
--- a/test/tools/doclint/CustomTagTestWithOption.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/CustomTagTestWithOption.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-CustomTagTest.java:16: error: unknown tag: unknownTag
+CustomTagTest.java:17: error: unknown tag: unknownTag
  * @unknownTag Text for an unknown tag.
    ^
 1 error
--- a/test/tools/doclint/EmptyAuthorTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyAuthorTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyAuthorTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyAuthorTest.out EmptyAuthorTest.java
--- a/test/tools/doclint/EmptyAuthorTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyAuthorTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptyAuthorTest.java:10: warning: no description for @author
+EmptyAuthorTest.java:11: warning: no description for @author
 /** @author */
     ^
 1 warning
--- a/test/tools/doclint/EmptyExceptionTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyExceptionTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyExceptionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyExceptionTest.out EmptyExceptionTest.java
--- a/test/tools/doclint/EmptyExceptionTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyExceptionTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptyExceptionTest.java:12: warning: no description for @exception
+EmptyExceptionTest.java:13: warning: no description for @exception
     /** @exception NullPointerException */
         ^
 1 warning
--- a/test/tools/doclint/EmptyParamTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyParamTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyParamTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyParamTest.out EmptyParamTest.java
--- a/test/tools/doclint/EmptyParamTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyParamTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptyParamTest.java:12: warning: no description for @param
+EmptyParamTest.java:13: warning: no description for @param
     /** @param i */
         ^
 1 warning
--- a/test/tools/doclint/EmptyPreTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyPreTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8010317
  * @summary DocLint incorrectly reports some <pre> tags as empty
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:html EmptyPreTest.java
  */
--- a/test/tools/doclint/EmptyReturnTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyReturnTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyReturnTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyReturnTest.out EmptyReturnTest.java
--- a/test/tools/doclint/EmptyReturnTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyReturnTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptyReturnTest.java:12: warning: no description for @return
+EmptyReturnTest.java:13: warning: no description for @return
     /** @return */
         ^
 1 warning
--- a/test/tools/doclint/EmptySerialDataTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySerialDataTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialDataTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialDataTest.out EmptySerialDataTest.java
--- a/test/tools/doclint/EmptySerialDataTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySerialDataTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptySerialDataTest.java:15: warning: no description for @serialData
+EmptySerialDataTest.java:16: warning: no description for @serialData
     /** @serialData */
         ^
 1 warning
--- a/test/tools/doclint/EmptySerialFieldTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySerialFieldTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialFieldTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialFieldTest.out EmptySerialFieldTest.java
--- a/test/tools/doclint/EmptySerialFieldTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySerialFieldTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptySerialFieldTest.java:17: warning: no description for @serialField
+EmptySerialFieldTest.java:18: warning: no description for @serialField
      * @serialField empty    String
        ^
 1 warning
--- a/test/tools/doclint/EmptySinceTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySinceTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySinceTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySinceTest.out EmptySinceTest.java
--- a/test/tools/doclint/EmptySinceTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptySinceTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptySinceTest.java:12: warning: no description for @since
+EmptySinceTest.java:13: warning: no description for @since
     /** @since */
         ^
 1 warning
--- a/test/tools/doclint/EmptyVersionTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyVersionTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyVersionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyVersionTest.out EmptyVersionTest.java
--- a/test/tools/doclint/EmptyVersionTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EmptyVersionTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-EmptyVersionTest.java:12: warning: no description for @version
+EmptyVersionTest.java:13: warning: no description for @version
     /** @version */
         ^
 1 warning
--- a/test/tools/doclint/EndTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EndTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006236
  * @summary doclint: structural issue hidden
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EndTagsTest.java
  * @run main DocLintTester -ref EndTagsTest.out EndTagsTest.java
--- a/test/tools/doclint/EndTagsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EndTagsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,25 +1,25 @@
-EndTagsTest.java:18: error: unexpected end tag: </a>
+EndTagsTest.java:19: error: unexpected end tag: </a>
     /** </a> */
         ^
-EndTagsTest.java:21: error: unexpected end tag: </a>
+EndTagsTest.java:22: error: unexpected end tag: </a>
     /** <p> </a> */
             ^
-EndTagsTest.java:24: error: unexpected end tag: </a>
+EndTagsTest.java:25: error: unexpected end tag: </a>
     /** <p> text </p> </a> */
                       ^
-EndTagsTest.java:27: error: invalid end tag: </img>
+EndTagsTest.java:28: error: invalid end tag: </img>
     /** <img alt="image" src="image.png"> </img> */
                                           ^
-EndTagsTest.java:30: error: unknown tag: invalid
+EndTagsTest.java:31: error: unknown tag: invalid
     /** <invalid> </invalid> */
         ^
-EndTagsTest.java:30: error: unknown tag: invalid
+EndTagsTest.java:31: error: unknown tag: invalid
     /** <invalid> </invalid> */
                   ^
-EndTagsTest.java:33: error: unknown tag: invalid
+EndTagsTest.java:34: error: unknown tag: invalid
     /** <invalid> */
         ^
-EndTagsTest.java:36: error: unknown tag: invalid
+EndTagsTest.java:37: error: unknown tag: invalid
     /** </invalid> */
         ^
 8 errors
--- a/test/tools/doclint/EndWithIdentifierTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EndWithIdentifierTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8007096
  * @summary DocLint parsing problems with some comments
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EndWithIdentifierTest.java
  * @run main DocLintTester -Xmsgs -ref EndWithIdentifierTest.out EndWithIdentifierTest.java
--- a/test/tools/doclint/EndWithIdentifierTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/EndWithIdentifierTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,19 +1,19 @@
-EndWithIdentifierTest.java:14: error: syntax error in reference
+EndWithIdentifierTest.java:15: error: syntax error in reference
     /**{@link*/
        ^
-EndWithIdentifierTest.java:17: error: reference not found
+EndWithIdentifierTest.java:18: error: reference not found
     /**@see List*/
             ^
-EndWithIdentifierTest.java:20: error: semicolon missing
+EndWithIdentifierTest.java:21: error: semicolon missing
     /**&amp*/
        ^
-EndWithIdentifierTest.java:23: error: malformed HTML
+EndWithIdentifierTest.java:24: error: malformed HTML
     /**<a*/
        ^
-EndWithIdentifierTest.java:26: error: malformed HTML
+EndWithIdentifierTest.java:27: error: malformed HTML
     /**</a*/
        ^
-EndWithIdentifierTest.java:29: error: malformed HTML
+EndWithIdentifierTest.java:30: error: malformed HTML
     /**<a name*/
        ^
 6 errors
--- a/test/tools/doclint/HtmlAttrsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/HtmlAttrsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlAttrsTest.java
  * @run main DocLintTester -ref HtmlAttrsTest.out HtmlAttrsTest.java
--- a/test/tools/doclint/HtmlAttrsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/HtmlAttrsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,10 +1,10 @@
-HtmlAttrsTest.java:13: error: unknown attribute: xyz
+HtmlAttrsTest.java:14: error: unknown attribute: xyz
      * <p xyz> text </p>
           ^
-HtmlAttrsTest.java:18: warning: attribute obsolete: name
+HtmlAttrsTest.java:19: warning: attribute obsolete: name
      * <img name="x" alt="alt">
             ^
-HtmlAttrsTest.java:23: warning: attribute obsolete, use CSS instead: size
+HtmlAttrsTest.java:24: warning: attribute obsolete, use CSS instead: size
      * <font size="3"> text </font>
              ^
 1 error
--- a/test/tools/doclint/HtmlTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/HtmlTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlTagsTest.java
  * @run main DocLintTester -ref HtmlTagsTest.out HtmlTagsTest.java
--- a/test/tools/doclint/HtmlTagsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/HtmlTagsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,47 +1,47 @@
-HtmlTagsTest.java:13: error: unknown tag: xyz
+HtmlTagsTest.java:14: error: unknown tag: xyz
      * <xyz> ... </xyz>
        ^
-HtmlTagsTest.java:13: error: unknown tag: xyz
+HtmlTagsTest.java:14: error: unknown tag: xyz
      * <xyz> ... </xyz>
                  ^
-HtmlTagsTest.java:18: error: unknown tag: xyz
+HtmlTagsTest.java:19: error: unknown tag: xyz
      * <div> <xyz> </div>
              ^
-HtmlTagsTest.java:23: error: self-closing element not allowed
+HtmlTagsTest.java:24: error: self-closing element not allowed
      * <br/>
        ^
-HtmlTagsTest.java:28: error: element not allowed in documentation comments: <html>
+HtmlTagsTest.java:29: error: element not allowed in documentation comments: <html>
      * <html>
        ^
-HtmlTagsTest.java:28: error: element not closed: html
+HtmlTagsTest.java:29: error: element not closed: html
      * <html>
        ^
-HtmlTagsTest.java:33: error: block element not allowed within inline element <span>: p
+HtmlTagsTest.java:34: error: block element not allowed within inline element <span>: p
      * <span> <p> </span>
               ^
-HtmlTagsTest.java:38: error: block element not allowed within @link: p
-     * {@link java.lang.String <p> }
-                               ^
 HtmlTagsTest.java:39: error: block element not allowed within @link: p
      * {@link java.lang.String <p> }
                                ^
-HtmlTagsTest.java:44: error: invalid end tag: </img>
+HtmlTagsTest.java:40: error: block element not allowed within @link: p
+     * {@link java.lang.String <p> }
+                               ^
+HtmlTagsTest.java:45: error: invalid end tag: </img>
      * <img src="any.jpg" alt="alt"> </img>
                                      ^
-HtmlTagsTest.java:49: error: end tag missing: </b>
+HtmlTagsTest.java:50: error: end tag missing: </b>
      * <i> <b> </i>
            ^
-HtmlTagsTest.java:54: error: unexpected end tag: </b>
+HtmlTagsTest.java:55: error: unexpected end tag: </b>
      * <i> </b> </i>
            ^
-HtmlTagsTest.java:54: warning: empty <i> tag
+HtmlTagsTest.java:55: warning: empty <i> tag
      * <i> </b> </i>
                 ^
-HtmlTagsTest.java:59: error: text not allowed in <ul> element
+HtmlTagsTest.java:60: error: text not allowed in <ul> element
      * <ul> text <li> ... </li> </ul>
            ^
-HtmlTagsTest.java:64: error: tag not allowed here: <b>
+HtmlTagsTest.java:65: error: tag not allowed here: <b>
      * <ul> <b>text</b> <li> ... </li> </ul>
             ^
 14 errors
-1 warning
\ No newline at end of file
+1 warning
--- a/test/tools/doclint/HtmlVersionTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/HtmlVersionTest.java	Thu May 21 16:19:29 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 8072945
  * @summary test HTML version
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -XhtmlVersion:html5 HtmlVersionTest.java
  * @run main DocLintTester -XhtmlVersion:html4 HtmlVersionTest.java
--- a/test/tools/doclint/LiteralTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/LiteralTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006228
  * @summary Doclint doesn't detect <code> {@code nested inline} </code>
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref LiteralTest.out LiteralTest.java
  */
--- a/test/tools/doclint/LiteralTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/LiteralTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-LiteralTest.java:14: warning: {@code} within <code>
+LiteralTest.java:15: warning: {@code} within <code>
     /** <code> abc {@code < & > } def </code> */
                    ^
 1 warning
--- a/test/tools/doclint/MissingCommentTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingCommentTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,6 @@
 /*
  * @test /nodynamiccopyright/
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingCommentTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingCommentTest.out MissingCommentTest.java
--- a/test/tools/doclint/MissingCommentTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingCommentTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,13 +1,13 @@
-MissingCommentTest.java:8: warning: no comment
+MissingCommentTest.java:9: warning: no comment
 public class MissingCommentTest {
        ^
-MissingCommentTest.java:9: warning: no comment
+MissingCommentTest.java:10: warning: no comment
     MissingCommentTest() { }
     ^
-MissingCommentTest.java:11: warning: no comment
+MissingCommentTest.java:12: warning: no comment
     int missingComment;
         ^
-MissingCommentTest.java:13: warning: no comment
+MissingCommentTest.java:14: warning: no comment
     void missingComment() { }
          ^
 4 warnings
--- a/test/tools/doclint/MissingParamsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingParamsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingParamsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingParamsTest.out MissingParamsTest.java
--- a/test/tools/doclint/MissingParamsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingParamsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,13 +1,13 @@
-MissingParamsTest.java:13: warning: no @param for param
+MissingParamsTest.java:14: warning: no @param for param
     MissingParamsTest(int param) { }
     ^
-MissingParamsTest.java:16: warning: no @param for <T>
+MissingParamsTest.java:17: warning: no @param for <T>
     <T> MissingParamsTest() { }
         ^
-MissingParamsTest.java:19: warning: no @param for param
+MissingParamsTest.java:20: warning: no @param for param
     void missingParam(int param) { }
          ^
-MissingParamsTest.java:22: warning: no @param for <T>
+MissingParamsTest.java:23: warning: no @param for <T>
     <T> void missingTyparam() { }
              ^
 4 warnings
--- a/test/tools/doclint/MissingReturnTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingReturnTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingReturnTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingReturnTest.out MissingReturnTest.java
--- a/test/tools/doclint/MissingReturnTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingReturnTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-MissingReturnTest.java:22: warning: no @return
+MissingReturnTest.java:23: warning: no @return
     int missingReturn() { }
         ^
 1 warning
--- a/test/tools/doclint/MissingThrowsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingThrowsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingThrowsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingThrowsTest.out MissingThrowsTest.java
--- a/test/tools/doclint/MissingThrowsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/MissingThrowsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-MissingThrowsTest.java:13: warning: no @throws for java.lang.Exception
+MissingThrowsTest.java:14: warning: no @throws for java.lang.Exception
     void missingThrows() throws Exception { }
          ^
 1 warning
--- a/test/tools/doclint/OptionTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/OptionTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import com.sun.tools.doclint.DocLint;
--- a/test/tools/doclint/OverridesTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/OverridesTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all OverridesTest.java
  */
--- a/test/tools/doclint/ParaTagTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ParaTagTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8007566
  * @summary DocLint too aggressive with not allowed here: <p>
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs ParaTagTest.java
  */
--- a/test/tools/doclint/ReferenceTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ReferenceTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832 8020556 8002154
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-reference ReferenceTest.java
  * @run main DocLintTester -ref ReferenceTest.out ReferenceTest.java
--- a/test/tools/doclint/ReferenceTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ReferenceTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,40 +1,40 @@
-ReferenceTest.java:13: error: invalid use of @param
+ReferenceTest.java:14: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:18: error: invalid use of @param
+ReferenceTest.java:19: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:23: error: @param name not found
+ReferenceTest.java:24: error: @param name not found
      * @param x description
               ^
-ReferenceTest.java:25: warning: no @param for a
+ReferenceTest.java:26: warning: no @param for a
     public void param_name_not_found(int a) { }
                 ^
-ReferenceTest.java:28: error: @param name not found
+ReferenceTest.java:29: error: @param name not found
      * @param <X> description
                ^
-ReferenceTest.java:33: error: reference not found
+ReferenceTest.java:34: error: reference not found
      * @see Object#tooStrong()
             ^
-ReferenceTest.java:38: error: invalid use of @return
+ReferenceTest.java:39: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:43: error: invalid use of @return
+ReferenceTest.java:44: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:48: error: exception not thrown: java.lang.Exception
+ReferenceTest.java:49: error: exception not thrown: java.lang.Exception
      * @throws Exception description
                ^
-ReferenceTest.java:59: error: type arguments not allowed here
+ReferenceTest.java:60: error: type arguments not allowed here
      * {@link java.util.List<String>}
               ^
-ReferenceTest.java:60: error: type arguments not allowed here
+ReferenceTest.java:61: error: type arguments not allowed here
      * {@link java.util.List<String>#equals}
               ^
-ReferenceTest.java:61: error: type arguments not allowed here
+ReferenceTest.java:62: error: type arguments not allowed here
      * @see java.util.List<String>
             ^
-ReferenceTest.java:62: error: type arguments not allowed here
+ReferenceTest.java:63: error: type arguments not allowed here
      * @see java.util.List<String>#equals
             ^
 12 errors
--- a/test/tools/doclint/ResourceTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ResourceTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006615
  * @summary move remaining messages into resource bundle
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import java.io.IOException;
--- a/test/tools/doclint/RunTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/RunTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @bug 8004832 8000103
  * @summary Add new doclint package
  * @summary Create doclint utility
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import java.io.File;
--- a/test/tools/doclint/SyntaxTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/SyntaxTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax SyntaxTest.java
  * @run main DocLintTester -ref SyntaxTest.out SyntaxTest.java
--- a/test/tools/doclint/SyntaxTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/SyntaxTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-SyntaxTest.java:13: error: malformed HTML
+SyntaxTest.java:14: error: malformed HTML
      * a < b
          ^
 1 error
--- a/test/tools/doclint/SyntheticTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/SyntheticTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all SyntheticTest.java
  */
--- a/test/tools/doclint/UnfinishedInlineTagTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/UnfinishedInlineTagTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8007096
  * @summary DocLint parsing problems with some comments
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html UnfinishedInlineTagTest.java
  * @run main DocLintTester -Xmsgs -ref UnfinishedInlineTagTest.out UnfinishedInlineTagTest.java
--- a/test/tools/doclint/UnfinishedInlineTagTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/UnfinishedInlineTagTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-UnfinishedInlineTagTest.java:14: error: unterminated inline tag
+UnfinishedInlineTagTest.java:15: error: unterminated inline tag
  */
 ^
 1 error
--- a/test/tools/doclint/ValidTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ValidTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832 8048806
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester ValidTest.java
  */
--- a/test/tools/doclint/ValueTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ValueTest.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8025272
  * @summary doclint needs to check for valid usage of at-value tag
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref ValueTest.out ValueTest.java
  */
--- a/test/tools/doclint/ValueTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/ValueTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,22 +1,22 @@
-ValueTest.java:39: error: {@value} not allowed here
+ValueTest.java:40: error: {@value} not allowed here
     /** invalid class C: {@value} */
                          ^
-ValueTest.java:42: error: {@value} not allowed here
+ValueTest.java:43: error: {@value} not allowed here
     /** invalid enum E: {@value} */
                         ^
-ValueTest.java:44: error: {@value} not allowed here
+ValueTest.java:45: error: {@value} not allowed here
         /** invalid enum constant E1: {@value} */
                                       ^
-ValueTest.java:48: error: {@value} not allowed here
+ValueTest.java:49: error: {@value} not allowed here
     /** invalid field 1: {@value} */
                          ^
-ValueTest.java:51: error: {@value} not allowed here
+ValueTest.java:52: error: {@value} not allowed here
     /** invalid field 2: {@value} */
                          ^
-ValueTest.java:62: error: value does not refer to a constant
+ValueTest.java:63: error: value does not refer to a constant
     /** invalid method: {@value Object#toString} */
                         ^
-ValueTest.java:65: error: value does not refer to a constant
+ValueTest.java:66: error: value does not refer to a constant
     /** invalid enum constant: {@value Thread.State#NEW} */
                                ^
 7 errors
--- a/test/tools/doclint/anchorTests/p/Test.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/Test.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @bug 8025246
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref Test.out Test.java
  * @compile/fail/ref=Test.javac.out -XDrawDiagnostics -Werror -Xdoclint:all Test.java
--- a/test/tools/doclint/anchorTests/p/Test.javac.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/Test.javac.out	Thu May 21 16:19:29 2015 -0700
@@ -1,7 +1,7 @@
-Test.java:14:7: compiler.err.proc.messager: anchor already defined: "dupTest"
-Test.java:24:12: compiler.err.proc.messager: anchor already defined: "dupTestField"
-Test.java:27:12: compiler.err.proc.messager: anchor already defined: "dupTestMethod"
-Test.java:32:11: compiler.err.proc.messager: anchor already defined: "dupNested"
-Test.java:40:15: compiler.err.proc.messager: anchor already defined: "dupNestedField"
-Test.java:47:15: compiler.err.proc.messager: anchor already defined: "dupNestedMethod"
+Test.java:15:7: compiler.err.proc.messager: anchor already defined: "dupTest"
+Test.java:25:12: compiler.err.proc.messager: anchor already defined: "dupTestField"
+Test.java:28:12: compiler.err.proc.messager: anchor already defined: "dupTestMethod"
+Test.java:33:11: compiler.err.proc.messager: anchor already defined: "dupNested"
+Test.java:41:15: compiler.err.proc.messager: anchor already defined: "dupNestedField"
+Test.java:48:15: compiler.err.proc.messager: anchor already defined: "dupNestedMethod"
 6 errors
--- a/test/tools/doclint/anchorTests/p/Test.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/Test.out	Thu May 21 16:19:29 2015 -0700
@@ -1,19 +1,19 @@
-Test.java:14: error: anchor already defined: "dupTest"
+Test.java:15: error: anchor already defined: "dupTest"
  * <a name="dupTest">dupTest again</a>
       ^
-Test.java:24: error: anchor already defined: "dupTestField"
+Test.java:25: error: anchor already defined: "dupTestField"
     /** <a name="dupTestField">dupTestField again</a> */
            ^
-Test.java:27: error: anchor already defined: "dupTestMethod"
+Test.java:28: error: anchor already defined: "dupTestMethod"
     /** <a name="dupTestMethod">dupTestMethod again</a> */
            ^
-Test.java:32: error: anchor already defined: "dupNested"
+Test.java:33: error: anchor already defined: "dupNested"
      * <a name="dupNested">dupNested again</a>
           ^
-Test.java:40: error: anchor already defined: "dupNestedField"
+Test.java:41: error: anchor already defined: "dupNestedField"
          * <a name="dupNestedField">dupNestedField</a>
               ^
-Test.java:47: error: anchor already defined: "dupNestedMethod"
+Test.java:48: error: anchor already defined: "dupNestedMethod"
          * <a name="dupNestedMethod">dupNestedMethod</a>
               ^
 6 errors
--- a/test/tools/doclint/anchorTests/p/package-info.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/package-info.java	Thu May 21 16:19:29 2015 -0700
@@ -2,6 +2,7 @@
  * @bug 8025246
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref package-info.out package-info.java
  * @compile/fail/ref=package-info.javac.out -XDrawDiagnostics -Werror -Xdoclint:all package-info.java
--- a/test/tools/doclint/anchorTests/p/package-info.javac.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/package-info.javac.out	Thu May 21 16:19:29 2015 -0700
@@ -1,2 +1,2 @@
-package-info.java:12:7: compiler.err.proc.messager: anchor already defined: "here"
+package-info.java:13:7: compiler.err.proc.messager: anchor already defined: "here"
 1 error
--- a/test/tools/doclint/anchorTests/p/package-info.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/anchorTests/p/package-info.out	Thu May 21 16:19:29 2015 -0700
@@ -1,4 +1,4 @@
-package-info.java:12: error: anchor already defined: "here"
+package-info.java:13: error: anchor already defined: "here"
  * <a name=here>here again</a>
       ^
 1 error
--- a/test/tools/doclint/html/BlockTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/BlockTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251
  * @summary test block tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs BlockTagsTest.java
  */
--- a/test/tools/doclint/html/EntitiesTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/EntitiesTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EntitiesTest.java
  * @run main DocLintTester -Xmsgs:html -ref EntitiesTest.out EntitiesTest.java
--- a/test/tools/doclint/html/EntitiesTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/EntitiesTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,19 +1,19 @@
-EntitiesTest.java:300: error: invalid entity &bad;
+EntitiesTest.java:301: error: invalid entity &bad;
      * &bad;
        ^
-EntitiesTest.java:305: error: invalid entity &#31;
+EntitiesTest.java:306: error: invalid entity &#31;
      * &#31;
        ^
-EntitiesTest.java:306: error: invalid entity &#2127;
+EntitiesTest.java:307: error: invalid entity &#2127;
      * &#2127;
        ^
-EntitiesTest.java:311: error: invalid entity &#8213;
+EntitiesTest.java:312: error: invalid entity &#8213;
      * &#8213;
        ^
-EntitiesTest.java:312: error: invalid entity &#9003;
+EntitiesTest.java:313: error: invalid entity &#9003;
      * &#9003;
        ^
-EntitiesTest.java:313: error: invalid entity &#xffff;
+EntitiesTest.java:314: error: invalid entity &#xffff;
      * &#xffff;
        ^
 6 errors
--- a/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8072945
  * @summary test tags and attributes specific to the output HTML version
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -XhtmlVersion:html5 -ref HtmlVersionTagsAttrsTestHtml5.out HtmlVersionTagsAttrsTest.java
  * @run main DocLintTester -XhtmlVersion:html4 -ref HtmlVersionTagsAttrsTestHtml4.out HtmlVersionTagsAttrsTest.java
--- a/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out	Thu May 21 16:19:29 2015 -0700
@@ -1,211 +1,211 @@
-HtmlVersionTagsAttrsTest.java:21: warning: attribute obsolete: name
+HtmlVersionTagsAttrsTest.java:22: warning: attribute obsolete: name
      * <img name="name_test" alt="alt">
             ^
-HtmlVersionTagsAttrsTest.java:25: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:28: warning: attribute obsolete, use CSS instead: align
+HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: align
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
               ^
-HtmlVersionTagsAttrsTest.java:28: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: bgcolor
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: align
+HtmlVersionTagsAttrsTest.java:30: warning: attribute obsolete, use CSS instead: align
      * <caption align="center">Test table, caption, col, colgroup, tbody,
                 ^
-HtmlVersionTagsAttrsTest.java:36: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: bgcolor
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                              ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: bgcolor
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                              ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: height
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: height
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: width
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: nowrap
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: nowrap
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: bgcolor
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                              ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: height
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: height
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: width
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: nowrap
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: nowrap
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:54: warning: attribute obsolete, use CSS instead: clear
+HtmlVersionTagsAttrsTest.java:55: warning: attribute obsolete, use CSS instead: clear
      * <br clear="left">
            ^
-HtmlVersionTagsAttrsTest.java:55: warning: attribute obsolete, use CSS instead: compact
+HtmlVersionTagsAttrsTest.java:56: warning: attribute obsolete, use CSS instead: compact
      * <ol compact>
            ^
-HtmlVersionTagsAttrsTest.java:60: warning: attribute obsolete, use CSS instead: type
+HtmlVersionTagsAttrsTest.java:61: warning: attribute obsolete, use CSS instead: type
      * <li type="square">Test list</li>
            ^
-HtmlVersionTagsAttrsTest.java:63: warning: attribute obsolete, use CSS instead: compact
+HtmlVersionTagsAttrsTest.java:64: warning: attribute obsolete, use CSS instead: compact
      * <dl compact>
            ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: hspace
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: hspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                             ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: vspace
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: vspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                         ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: border
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: border
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                                     ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: size
+HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: size
      * <hr size="20" noshade>
            ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: noshade
+HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: noshade
      * <hr size="20" noshade>
                      ^
-HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:70: warning: attribute obsolete, use CSS instead: width
      * <pre width="25">Test Pre</pre>
             ^
-HtmlVersionTagsAttrsTest.java:73: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:78: error: attribute not supported in HTML4: reversed
+HtmlVersionTagsAttrsTest.java:79: error: attribute not supported in HTML4: reversed
      * <ol reversed="reversed">
            ^
-HtmlVersionTagsAttrsTest.java:83: error: attribute not supported in HTML4: crossorigin
+HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: crossorigin
      * <img src="testImg.jpg" alt="imgTest" crossorigin="anonymous">
                                             ^
-HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: aria-labelledby
+HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-labelledby
      * <div aria-labelledby="Topics" aria-describedby="t1">
             ^
-HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: aria-describedby
+HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-describedby
      * <div aria-labelledby="Topics" aria-describedby="t1">
                                      ^
-HtmlVersionTagsAttrsTest.java:87: error: attribute not supported in HTML4: aria-label
+HtmlVersionTagsAttrsTest.java:88: error: attribute not supported in HTML4: aria-label
      * <p id="t2" aria-label="Label">Label test</p>
                   ^
-HtmlVersionTagsAttrsTest.java:95: warning: attribute obsolete, use CSS instead: size
+HtmlVersionTagsAttrsTest.java:96: warning: attribute obsolete, use CSS instead: size
      * <font size="3">Font test</font>
              ^
-HtmlVersionTagsAttrsTest.java:98: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:99: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:99: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * <hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:102: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:105: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
      * <details>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
                        ^
-HtmlVersionTagsAttrsTest.java:108: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
      * </details>
        ^
-HtmlVersionTagsAttrsTest.java:113: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:114: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:118: error: tag not supported in the generated HTML version: article
+HtmlVersionTagsAttrsTest.java:119: error: tag not supported in the generated HTML version: article
      * <article>
        ^
-HtmlVersionTagsAttrsTest.java:123: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:124: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:124: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:125: error: tag not supported in the generated HTML version: nav
      * <nav>Navigation</nav>
        ^
-HtmlVersionTagsAttrsTest.java:127: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:128: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:128: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:129: error: tag not supported in the generated HTML version: nav
      * <nav>Navigation</nav>
        ^
-HtmlVersionTagsAttrsTest.java:131: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:132: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:134: error: tag not supported in the generated HTML version: aside
+HtmlVersionTagsAttrsTest.java:135: error: tag not supported in the generated HTML version: aside
      * <aside>
        ^
-HtmlVersionTagsAttrsTest.java:139: error: tag not supported in the generated HTML version: bdi
+HtmlVersionTagsAttrsTest.java:140: error: tag not supported in the generated HTML version: bdi
      * <li>Testing<bdi>BDI</bdi></li>
                   ^
-HtmlVersionTagsAttrsTest.java:141: error: tag not supported in the generated HTML version: figure
+HtmlVersionTagsAttrsTest.java:142: error: tag not supported in the generated HTML version: figure
      * <figure>
        ^
-HtmlVersionTagsAttrsTest.java:143: error: tag not supported in the generated HTML version: figcaption
+HtmlVersionTagsAttrsTest.java:144: error: tag not supported in the generated HTML version: figcaption
      * <figcaption>Fig. 1</figcaption>
        ^
-HtmlVersionTagsAttrsTest.java:145: error: tag not supported in the generated HTML version: mark
+HtmlVersionTagsAttrsTest.java:146: error: tag not supported in the generated HTML version: mark
      * <p><mark>Marked</mark> text test</p>
           ^
-HtmlVersionTagsAttrsTest.java:146: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:147: error: tag not supported in the generated HTML version: nav
      * <nav>
        ^
-HtmlVersionTagsAttrsTest.java:152: error: tag not supported in the generated HTML version: template
+HtmlVersionTagsAttrsTest.java:153: error: tag not supported in the generated HTML version: template
      * <template id="testTemplate">
        ^
-HtmlVersionTagsAttrsTest.java:155: error: tag not supported in the generated HTML version: time
+HtmlVersionTagsAttrsTest.java:156: error: tag not supported in the generated HTML version: time
      * <p>Test current time is <time>10:00</time> at night</p>
                                ^
-HtmlVersionTagsAttrsTest.java:156: error: tag not supported in the generated HTML version: wbr
+HtmlVersionTagsAttrsTest.java:157: error: tag not supported in the generated HTML version: wbr
      * <p>Test <wbr>WBR</wbr> text</p>
                ^
-HtmlVersionTagsAttrsTest.java:161: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:162: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:164: error: tag not supported in the generated HTML version: article
+HtmlVersionTagsAttrsTest.java:165: error: tag not supported in the generated HTML version: article
      * <article>
        ^
-HtmlVersionTagsAttrsTest.java:167: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
 HtmlVersionTagsAttrsTest.java:168: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:171: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:169: error: tag not supported in the generated HTML version: header
+     * <header>
+       ^
+HtmlVersionTagsAttrsTest.java:172: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:174: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:175: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:179: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:180: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:180: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:181: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:183: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:184: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:186: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:187: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:193: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:198: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:199: error: tag not supported in the generated HTML version: header
      * <header role="banner">Main text</header>
        ^
-HtmlVersionTagsAttrsTest.java:198: error: attribute not supported in HTML4: role
+HtmlVersionTagsAttrsTest.java:199: error: attribute not supported in HTML4: role
      * <header role="banner">Main text</header>
                ^
-HtmlVersionTagsAttrsTest.java:199: error: attribute not supported in HTML4: role
+HtmlVersionTagsAttrsTest.java:200: error: attribute not supported in HTML4: role
      * <div role="navigation">
             ^
-HtmlVersionTagsAttrsTest.java:204: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:207: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
      * </table>
        ^
 46 errors
--- a/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out	Thu May 21 16:19:29 2015 -0700
@@ -1,298 +1,298 @@
-HtmlVersionTagsAttrsTest.java:18: error: attribute not supported in HTML5: rev
+HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: rev
      * <a rev="help" href="rev_test.html">Help Page</a>
           ^
-HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: charset
+HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: charset
      * <a charset="UTF-8" href="charset_test.html">Test page</a>
           ^
-HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: shape
+HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: shape
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                  ^
-HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: coords
+HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: coords
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                               ^
-HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: name
      * <img name="name_test" alt="alt">
             ^
-HtmlVersionTagsAttrsTest.java:23: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: axis
      * <tr><th axis="desc">Description</th></tr>
                ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: axis
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: abbr
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: abbr
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                            ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: scope
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: scope
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                                             ^
-HtmlVersionTagsAttrsTest.java:25: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: summary
+HtmlVersionTagsAttrsTest.java:27: error: attribute not supported in HTML5: summary
      * <table summary="summary_test"><tr><td>Test Row</td></tr></table>
               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: bgcolor
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: cellpadding
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellpadding
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                              ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: cellspacing
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellspacing
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: frame
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: frame
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: rules
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: rules
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                           ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: width
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                                        ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: align
      * <caption align="center">Test table, caption, col, colgroup, tbody,
                 ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: align
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                  ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: char
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                               ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: charoff
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                        ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: valign
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                    ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: width
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                                 ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
      * <col align="center" valign="top" width="200">
             ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: valign
      * <col align="center" valign="top" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: width
      * <col align="center" valign="top" width="200">
                                         ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: align
      * <col align="char" char="." charoff="2">
             ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: char
      * <col align="char" char="." charoff="2">
                          ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: charoff
      * <col align="char" char="." charoff="2">
                                   ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: align
      * <thead align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: char
      * <thead align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: charoff
      * <thead align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: align
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
            ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: char
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                         ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: charoff
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                  ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: bgcolor
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                              ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: align
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
            ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: char
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                         ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: charoff
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                  ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: bgcolor
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                              ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: height
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: width
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: nowrap
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: align
      * <tfoot align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: char
      * <tfoot align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: charoff
      * <tfoot align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: align
      * <tbody align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: char
      * <tbody align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: charoff
      * <tbody align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: align
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
            ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: char
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                         ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: charoff
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                  ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: bgcolor
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                              ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: height
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: width
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: nowrap
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:54: error: attribute not supported in HTML5: clear
+HtmlVersionTagsAttrsTest.java:55: error: attribute not supported in HTML5: clear
      * <br clear="left">
            ^
-HtmlVersionTagsAttrsTest.java:55: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:56: error: attribute not supported in HTML5: compact
      * <ol compact>
            ^
-HtmlVersionTagsAttrsTest.java:59: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: type
      * <ul type="circle" compact>
            ^
-HtmlVersionTagsAttrsTest.java:59: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: compact
      * <ul type="circle" compact>
                          ^
-HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:61: error: attribute not supported in HTML5: type
      * <li type="square">Test list</li>
            ^
-HtmlVersionTagsAttrsTest.java:63: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:64: error: attribute not supported in HTML5: compact
      * <dl compact>
            ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: hspace
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: hspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                             ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: vspace
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: vspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                         ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: border
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: border
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                                     ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: size
+HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: size
      * <hr size="20" noshade>
            ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: noshade
+HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: noshade
      * <hr size="20" noshade>
                      ^
-HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:70: error: attribute not supported in HTML5: width
      * <pre width="25">Test Pre</pre>
             ^
-HtmlVersionTagsAttrsTest.java:70: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:71: error: attribute not supported in HTML5: name
      * <a name="AnchorTest">Anchor Test</a>
           ^
-HtmlVersionTagsAttrsTest.java:71: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:72: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
      * <table border="0">
               ^
-HtmlVersionTagsAttrsTest.java:73: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:93: error: tag not supported in the generated HTML version: big
+HtmlVersionTagsAttrsTest.java:94: error: tag not supported in the generated HTML version: big
      * <p><big>Bigger text test</big></p>
           ^
-HtmlVersionTagsAttrsTest.java:93: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:94: warning: empty <p> tag
      * <p><big>Bigger text test</big></p>
                                      ^
-HtmlVersionTagsAttrsTest.java:94: error: tag not supported in the generated HTML version: center
+HtmlVersionTagsAttrsTest.java:95: error: tag not supported in the generated HTML version: center
      * <center>Center text test</center>
        ^
-HtmlVersionTagsAttrsTest.java:95: error: tag not supported in the generated HTML version: font
+HtmlVersionTagsAttrsTest.java:96: error: tag not supported in the generated HTML version: font
      * <font size="3">Font test</font>
        ^
-HtmlVersionTagsAttrsTest.java:95: error: attribute not supported in HTML5: size
+HtmlVersionTagsAttrsTest.java:96: error: attribute not supported in HTML5: size
      * <font size="3">Font test</font>
              ^
-HtmlVersionTagsAttrsTest.java:96: error: tag not supported in the generated HTML version: strike
+HtmlVersionTagsAttrsTest.java:97: error: tag not supported in the generated HTML version: strike
      * <p>Text <strike>strike</strike></p>
                ^
-HtmlVersionTagsAttrsTest.java:97: error: tag not supported in the generated HTML version: tt
+HtmlVersionTagsAttrsTest.java:98: error: tag not supported in the generated HTML version: tt
      * <p><tt>Teletype text</tt></p>
           ^
-HtmlVersionTagsAttrsTest.java:97: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:98: warning: empty <p> tag
      * <p><tt>Teletype text</tt></p>
                                 ^
-HtmlVersionTagsAttrsTest.java:99: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * <hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:102: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:105: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
      * <details>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
                        ^
-HtmlVersionTagsAttrsTest.java:108: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
      * </details>
        ^
-HtmlVersionTagsAttrsTest.java:131: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:132: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:163: error: heading not found for </section>
+HtmlVersionTagsAttrsTest.java:164: error: heading not found for </section>
      * </section>
        ^
-HtmlVersionTagsAttrsTest.java:166: error: heading not found for </article>
+HtmlVersionTagsAttrsTest.java:167: error: heading not found for </article>
      * </article>
        ^
-HtmlVersionTagsAttrsTest.java:168: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:169: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:171: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:172: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:174: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:175: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:180: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:181: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:183: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:184: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:186: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:187: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:191: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:192: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
      * <table border="2">
               ^
-HtmlVersionTagsAttrsTest.java:193: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:204: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:207: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
      * </table>
        ^
 97 errors
--- a/test/tools/doclint/html/InlineTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/InlineTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251
  * @summary test inline tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs InlineTagsTest.java
  */
--- a/test/tools/doclint/html/ListTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/ListTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006251 8013405 8022173
  * @summary test list tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs -ref ListTagsTest.out ListTagsTest.java
  */
--- a/test/tools/doclint/html/ListTagsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/ListTagsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,7 +1,7 @@
-ListTagsTest.java:16: error: attribute lacks value
+ListTagsTest.java:17: error: attribute lacks value
      *  <ol> <li value> bad </ol>
                  ^
-ListTagsTest.java:17: error: attribute value is not a number
+ListTagsTest.java:18: error: attribute value is not a number
      *  <ol> <li value="a"> bad </ol>
                  ^
 2 errors
--- a/test/tools/doclint/html/OtherTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/OtherTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006251 8022173
  * @summary test other tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs -ref OtherTagsTest.out OtherTagsTest.java
  */
--- a/test/tools/doclint/html/OtherTagsTest.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/OtherTagsTest.out	Thu May 21 16:19:29 2015 -0700
@@ -1,28 +1,28 @@
-OtherTagsTest.java:13: error: element not allowed in documentation comments: <body>
+OtherTagsTest.java:14: error: element not allowed in documentation comments: <body>
      *  <body> <p> abc </body>
         ^
-OtherTagsTest.java:14: error: element not allowed in documentation comments: <frame>
+OtherTagsTest.java:15: error: element not allowed in documentation comments: <frame>
      *  <frame>
         ^
-OtherTagsTest.java:15: error: element not allowed in documentation comments: <frameset>
+OtherTagsTest.java:16: error: element not allowed in documentation comments: <frameset>
      *  <frameset> </frameset>
         ^
-OtherTagsTest.java:16: error: element not allowed in documentation comments: <head>
+OtherTagsTest.java:17: error: element not allowed in documentation comments: <head>
      *  <head> </head>
         ^
-OtherTagsTest.java:18: error: element not allowed in documentation comments: <link>
+OtherTagsTest.java:19: error: element not allowed in documentation comments: <link>
      *  <link>
         ^
-OtherTagsTest.java:19: error: element not allowed in documentation comments: <meta>
+OtherTagsTest.java:20: error: element not allowed in documentation comments: <meta>
      *  <meta>
         ^
-OtherTagsTest.java:20: error: element not allowed in documentation comments: <noframes>
+OtherTagsTest.java:21: error: element not allowed in documentation comments: <noframes>
      *  <noframes> </noframes>
         ^
-OtherTagsTest.java:21: error: element not allowed in documentation comments: <script>
+OtherTagsTest.java:22: error: element not allowed in documentation comments: <script>
      *  <script> </script>
         ^
-OtherTagsTest.java:22: error: element not allowed in documentation comments: <title>
+OtherTagsTest.java:23: error: element not allowed in documentation comments: <title>
      *  <title> </title>
         ^
 9 errors
--- a/test/tools/doclint/html/TableTagsTest.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/TableTagsTest.java	Thu May 21 16:19:29 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251 8022173
  * @summary test table tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs TableTagsTest.java
  */
--- a/test/tools/doclint/html/TagNotAllowed.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/TagNotAllowed.java	Thu May 21 16:19:29 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TagNotAllowed.out TagNotAllowed.java
  */
--- a/test/tools/doclint/html/TagNotAllowed.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/TagNotAllowed.out	Thu May 21 16:19:29 2015 -0700
@@ -1,61 +1,61 @@
-TagNotAllowed.java:11: error: tag not allowed here: <b>
+TagNotAllowed.java:12: error: tag not allowed here: <b>
  * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
         ^
-TagNotAllowed.java:11: error: tag not allowed here: <b>
+TagNotAllowed.java:12: error: tag not allowed here: <b>
  * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
                                    ^
-TagNotAllowed.java:11: error: tag not allowed here: <b>
+TagNotAllowed.java:12: error: tag not allowed here: <b>
  * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
                                                                      ^
-TagNotAllowed.java:12: error: tag not allowed here: <b>
+TagNotAllowed.java:13: error: tag not allowed here: <b>
  * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
         ^
-TagNotAllowed.java:12: error: tag not allowed here: <b>
+TagNotAllowed.java:13: error: tag not allowed here: <b>
  * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
                                    ^
-TagNotAllowed.java:12: error: tag not allowed here: <b>
+TagNotAllowed.java:13: error: tag not allowed here: <b>
  * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
                                                               ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
         ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
                                    ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
                                                               ^
-TagNotAllowed.java:15: error: tag not allowed here: <b>
+TagNotAllowed.java:16: error: tag not allowed here: <b>
  * <table summary=description> <b>abc</b> </table>
                                ^
-TagNotAllowed.java:16: error: tag not allowed here: <b>
+TagNotAllowed.java:17: error: tag not allowed here: <b>
  * <table summary=description> <thead> <b>abc</b> </thead> </table>
                                        ^
-TagNotAllowed.java:17: error: tag not allowed here: <b>
+TagNotAllowed.java:18: error: tag not allowed here: <b>
  * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
                                        ^
-TagNotAllowed.java:18: error: tag not allowed here: <b>
+TagNotAllowed.java:19: error: tag not allowed here: <b>
  * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
                                        ^
-TagNotAllowed.java:19: error: tag not allowed here: <b>
+TagNotAllowed.java:20: error: tag not allowed here: <b>
  * <table summary=description> <tr> <b>abc</b> </tr> </table>
                                     ^
-TagNotAllowed.java:22: error: tag not allowed here: <img>
+TagNotAllowed.java:23: error: tag not allowed here: <img>
  *   <img alt="image" src="image.png">
      ^
-TagNotAllowed.java:23: error: tag not allowed here: <p>
+TagNotAllowed.java:24: error: tag not allowed here: <p>
  *   <p> para </p>
      ^
-TagNotAllowed.java:24: error: tag not allowed here: <big>
+TagNotAllowed.java:25: error: tag not allowed here: <big>
  *   <big> text </big>
      ^
-TagNotAllowed.java:25: error: tag not allowed here: <small>
+TagNotAllowed.java:26: error: tag not allowed here: <small>
  *   <small> text </small>
      ^
-TagNotAllowed.java:26: error: tag not allowed here: <sub>
+TagNotAllowed.java:27: error: tag not allowed here: <sub>
  *   <sub> text </sub>
      ^
-TagNotAllowed.java:27: error: tag not allowed here: <sup>
+TagNotAllowed.java:28: error: tag not allowed here: <sup>
  *   <sup> text </sup>
      ^
 20 errors
--- a/test/tools/doclint/html/TextNotAllowed.java	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/TextNotAllowed.java	Thu May 21 16:19:29 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TextNotAllowed.out TextNotAllowed.java
  */
--- a/test/tools/doclint/html/TextNotAllowed.out	Thu May 21 10:07:40 2015 -0700
+++ b/test/tools/doclint/html/TextNotAllowed.out	Thu May 21 16:19:29 2015 -0700
@@ -1,85 +1,85 @@
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
        ^
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
                            ^
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
                                                       ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
        ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
                            ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
                                                ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
        ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
                            ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
                                                ^
-TextNotAllowed.java:15: error: text not allowed in <table> element
+TextNotAllowed.java:16: error: text not allowed in <table> element
  * <table summary=description> abc </table>
                               ^
-TextNotAllowed.java:16: error: text not allowed in <thead> element
+TextNotAllowed.java:17: error: text not allowed in <thead> element
  * <table summary=description> <thead> abc </thead> </table>
                                       ^
-TextNotAllowed.java:17: error: text not allowed in <tbody> element
+TextNotAllowed.java:18: error: text not allowed in <tbody> element
  * <table summary=description> <tbody> abc </tbody> </table>
                                       ^
-TextNotAllowed.java:18: error: text not allowed in <tfoot> element
+TextNotAllowed.java:19: error: text not allowed in <tfoot> element
  * <table summary=description> <tfoot> abc </tfoot> </table>
                                       ^
-TextNotAllowed.java:19: error: text not allowed in <tr> element
+TextNotAllowed.java:20: error: text not allowed in <tr> element
  * <table summary=description> <tr> abc </tr> </table>
                                    ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
         ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
                               ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
                                                           ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
         ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
                               ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
                                                    ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
         ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
                               ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element