8243113: Always identify version of javadoc used to generate docs

Reviewed-by: prappo

Author: jonathan-gibbons

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java

@@ -294,8 +294,9 @@ private Content toContent() {
 
     private Comment getGeneratedBy(boolean timestamp, Date now) {
         String text = "Generated by javadoc"; // marker string, deliberately not localized
+        text += " (" + docletVersion + ")";
         if (timestamp) {
-            text += " ("+ docletVersion + ") on " + now;
+            text += " on " + now;
         }
         return new Comment(text);
     }

test/langtools/jdk/javadoc/doclet/testGeneratedBy/TestGeneratedBy.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8000418 8024288 8196202
+ * @bug 8000418 8024288 8196202 8243113
  * @summary Verify that files use a common Generated By string
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -80,19 +80,17 @@ void checkTimestamps(boolean timestamp) {
 
     void checkTimestamps(boolean timestamp, String... files) {
         String version = System.getProperty("java.version");
-        String genBy = "Generated by javadoc";
-        if (timestamp) genBy += " (" + version + ") on ";
+        String genBy = "Generated by javadoc (" + version + ")";
+        if (timestamp) genBy += " on ";
 
         for (String file: files) {
             // genBy is the current standard "Generated by" text
             checkOutput(file, true, genBy);
 
             // These are older versions of the "Generated by" text
             checkOutput(file, false,
-                (timestamp
-                    ? "Generated by javadoc (version"
-                    : "Generated by javadoc ("),
-                "Generated by javadoc on");
+                    "Generated by javadoc (version",
+                    "Generated by javadoc on");
         }
     }
 }

test/langtools/jdk/javadoc/doclet/testHeadTag/TestHeadTag.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8203792
+ * @bug 8203792 8243113
  * @summary Remove "compatibility" features from Head.java
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -44,6 +44,7 @@
 public class TestHeadTag extends JavadocTester {
 
     final ToolBox tb;
+    final String version = System.getProperty("java.version");
 
     public static void main(String... args) throws Exception {
         TestHeadTag tester = new TestHeadTag();
@@ -67,7 +68,7 @@ public void test(Path base) throws Exception {
         checkExit(Exit.OK);
 
         checkOrder("pkg/A.html",
-                "Generated by javadoc",
+                "Generated by javadoc (" + version + ")",
                 "<meta name=\"dc.created\"");
     }
 
@@ -85,7 +86,7 @@ public void testWithNoTimestamp(Path base) throws Exception {
         checkExit(Exit.OK);
 
         checkOutput("pkg/A.html", true,
-                "<!-- Generated by javadoc -->");
+                "<!-- Generated by javadoc (" + version + ") -->");
         checkOutput("pkg/A.html", false,
                 "<meta name=\"dc.created\"");
     }