From 2aed84f8cd7bd1aed7c63f61d74ea170f9585a75 Mon Sep 17 00:00:00 2001 From: Hannes Wallnoefer Date: Mon, 14 Sep 2020 17:06:35 +0200 Subject: [PATCH 1/5] 8216497: javadoc should auto-link to platform classes --- make/CompileInterimLangtools.gmk | 2 +- make/CompileJavaModules.gmk | 2 +- .../html/resources/standard.properties | 9 + .../doclets/toolkit/BaseConfiguration.java | 3 + .../internal/doclets/toolkit/BaseOptions.java | 45 +++ .../toolkit/resources/doclets.properties | 4 + .../resources/releases/element-list-10.txt | 314 +++++++++++++++++ .../resources/releases/element-list-11.txt | 282 ++++++++++++++++ .../resources/releases/element-list-12.txt | 284 ++++++++++++++++ .../resources/releases/element-list-13.txt | 282 ++++++++++++++++ .../resources/releases/element-list-14.txt | 286 ++++++++++++++++ .../resources/releases/element-list-15.txt | 282 ++++++++++++++++ .../resources/releases/element-list-16.txt | 282 ++++++++++++++++ .../resources/releases/package-list-7.txt | 209 ++++++++++++ .../resources/releases/package-list-8.txt | 217 ++++++++++++ .../resources/releases/package-list-9.txt | 315 ++++++++++++++++++ .../internal/doclets/toolkit/util/Extern.java | 155 ++++++++- .../TestAnnotationTypes.java | 2 + .../TestClassCrossReferences.java | 2 + .../doclet/testClassLinks/TestClassLinks.java | 1 + .../doclet/testClassTree/TestClassTree.java | 1 + .../TestDeprecatedDocs.java | 1 + .../TestGrandParentTypes.java | 1 + .../doclet/testHeadings/TestHeadings.java | 1 + .../TestHtmlDefinitionListTag.java | 4 + .../doclet/testHtmlTag/TestHtmlTag.java | 1 + .../testIndentation/TestIndentation.java | 1 + .../doclet/testInterface/TestInterface.java | 1 + .../javadoc/doclet/testJavaFX/TestJavaFX.java | 2 + .../doclet/testLinkOption/TestLinkOption.java | 3 + .../testLinkPlatform/TestLinkPlatform.java | 195 +++++++++++ .../testLinkPlatform/linkplatform.properties | 10 + .../TestMemberInheritance.java | 2 + .../TestMethodSignature.java | 1 + .../doclet/testModules/TestModules.java | 4 + .../TestNewLanguageFeatures.java | 1 + .../doclet/testOptions/TestOptions.java | 1 + .../doclet/testOrdering/TestOrdering.java | 1 + .../TestOverriddenDeprecatedMethods.java | 1 + .../TestOverrideMethods.java | 1 + .../TestPackageAnnotation.java | 2 + .../TestPrivateClasses.java | 2 + .../doclet/testProperty/TestProperty.java | 1 + .../testRecordTypes/TestRecordTypes.java | 2 + .../testSealedTypes/TestSealedTypes.java | 6 + .../javadoc/doclet/testSeeTag/TestSeeTag.java | 1 + .../TestSerializedForm.java | 2 + .../TestSerializedFormDeprecationInfo.java | 2 + .../TestSerializedFormWithClassFile.java | 1 + .../TestTypeAnnotations.java | 1 + .../testTypeParams/TestTypeParameters.java | 2 + .../TestTypeVariableLinks.java | 1 + .../TestVisibleMembers.java | 2 + 53 files changed, 3226 insertions(+), 10 deletions(-) create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt create mode 100644 test/langtools/jdk/javadoc/doclet/testLinkPlatform/TestLinkPlatform.java create mode 100644 test/langtools/jdk/javadoc/doclet/testLinkPlatform/linkplatform.properties diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk index 88578e3e060c0..7c67a5a6d0958 100644 --- a/make/CompileInterimLangtools.gmk +++ b/make/CompileInterimLangtools.gmk @@ -74,7 +74,7 @@ define SetupInterimModule EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \ Standard.java, \ EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \ - COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \ + COPY := .gif .png .xml .css .js .txt javax.tools.JavaCompilerTool, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \ DISABLED_WARNINGS := module options, \ JAVAC_FLAGS := \ diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index cebbf1e31feee..c4d25c901220c 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -348,7 +348,7 @@ jdk.dynalink_CLEAN += .properties ################################################################################ -jdk.javadoc_COPY += .xml .css .js .png +jdk.javadoc_COPY += .xml .css .js .png .txt ################################################################################ diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties index a3356bdb1fa15..1a1dd626c6c75 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties @@ -85,6 +85,7 @@ doclet.package=package doclet.MalformedURL=Malformed URL: {0} doclet.File_error=Error reading file: {0} doclet.URL_error=Error fetching URL: {0} +doclet.Resource_error=Error reading resource: {0} doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1} doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1} doclet.tag.invalid_usage=invalid usage of tag {0} @@ -340,6 +341,11 @@ doclet.usage.linkoffline.parameters=\ doclet.usage.linkoffline.description=\ Link to docs at using package list at +doclet.usage.link-platform-properties.parameters=\ + +doclet.usage.link-platform-properties.description=\ + Link to platform documentation URLs declared in properties file at + doclet.usage.excludedocfilessubdir.parameters=\ :.. doclet.usage.excludedocfilessubdir.description=\ @@ -374,6 +380,9 @@ doclet.usage.no-module-directories.description=\ Do not group files for module documentation into \n\ module-specific directories +doclet.usage.no-platform-link.description=\ + Do not generate links to platform documentation + doclet.usage.notree.description=\ Do not generate class hierarchy diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java index f11a03ae8719d..d2795bd6f5ad8 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java @@ -358,6 +358,9 @@ protected boolean finishOptionSettings0() throws DocletException { for (Pair linkOfflinePair : options.linkOfflineList()) { extern.link(linkOfflinePair.first, linkOfflinePair.second, reporter); } + if (!options.noPlatformLink()) { + extern.checkPlatformLinks(options.linkPlatformProperties(), reporter); + } typeElementCatalog = new TypeElementCatalog(includedTypeElements, this); initTagletManager(options.customTagStrs()); options.groupPairs().forEach(grp -> { diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java index 087398ed91865..d6f0e2e9a134e 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java @@ -164,6 +164,11 @@ public abstract class BaseOptions { // A list of pairs containing urls and package list private final List> linkOfflineList = new ArrayList<>(); + /** + * Location of alternative platform link properties file. + */ + private String linkPlatformProperties; + /** * Argument for command-line option {@code -linksource}. * True if we should generate browsable sources. @@ -185,6 +190,13 @@ public abstract class BaseOptions { */ private boolean noDeprecated = false; + /** + * Argument for command-line option {@code --no-platform-link}. + * True if command-line option "--no-platform-link" is used. Default value is + * false. + */ + private boolean noPlatformLink = false; + /** * Argument for command-line option {@code -nosince}. * True if command-line option "-nosince" is used. Default value is @@ -371,6 +383,15 @@ public boolean process(String opt, List args) { return true; } }, + + new Option(resources, "--link-platform-properties", 1) { + @Override + public boolean process(String opt, List args) { + linkPlatformProperties = args.get(0); + return true; + } + }, + new Option(resources, "-nocomment") { @Override public boolean process(String opt, List args) { @@ -411,6 +432,14 @@ public boolean process(String opt, List args) { } }, + new Option(resources, "--no-platform-link") { + @Override + public boolean process(String opt, List args) { + noPlatformLink = true; + return true; + } + }, + new Option(resources, "--override-methods", 1) { @Override public boolean process(String opt, List args) { @@ -755,6 +784,13 @@ List> linkOfflineList() { return linkOfflineList; } + /** + * Argument for command-line option {@ --link-platform-properties}. + */ + String linkPlatformProperties() { + return linkPlatformProperties; + } + /** * Argument for command-line option {@code -linksource}. * True if we should generate browsable sources. @@ -782,6 +818,15 @@ public boolean noDeprecated() { return noDeprecated; } + /** + * Argument for command-line option {@code --no-platform-link}. + * True if command-line option {@code --no-platform-link"} is used. + * Default value is false. + */ + public boolean noPlatformLink() { + return noPlatformLink; + } + /** * Argument for command-line option {@code -nosince}. * True if command-line option {@code -nosince"} is used. diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties index 62246eba3edc6..589ee9b575608 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties @@ -326,3 +326,7 @@ doclet.record_accessor_doc.return=\ doclet.record_field_doc.fullbody=\ The field for the {0} record component. + +doclet.platform.docs.old=https://docs.oracle.com/javase/{0}/docs/api/ +doclet.platform.docs.new=https://docs.oracle.com/en/java/javase/{0}/docs/api/ +doclet.platform.docs.ea=https://download.java.net/java/early_access/jdk{0}/docs/api/ diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt new file mode 100644 index 0000000000000..16518f6620ea2 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt @@ -0,0 +1,314 @@ +javax.activation +java.io +java.lang +java.lang.annotation +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +javax.activity +javax.rmi +javax.rmi.CORBA +org.omg.CORBA +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.portable +org.omg.CORBA.TypeCodePackage +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.portable +org.omg.PortableServer.ServantLocatorPackage +org.omg.SendingContext +org.omg.stub.java.rmi +java.awt.datatransfer +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +java.lang.instrument +javax.jnlp +java.util.logging +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +javax.management.remote.rmi +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +java.util.prefs +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +javax.script +javax.security.auth.kerberos +org.ietf.jgss +javax.security.sasl +javax.smartcardio +java.sql +javax.sql +javax.transaction.xa +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.transaction +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.jws +javax.jws.soap +javax.xml.soap +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.annotation +javafx.beans +javafx.beans.binding +javafx.beans.property +javafx.beans.property.adapter +javafx.beans.value +javafx.collections +javafx.collections.transformation +javafx.event +javafx.util +javafx.util.converter +javafx.scene.chart +javafx.scene.control +javafx.scene.control.cell +javafx.scene.control.skin +javafx.fxml +javafx.animation +javafx.application +javafx.concurrent +javafx.css +javafx.css.converter +javafx.geometry +javafx.print +javafx.scene +javafx.scene.canvas +javafx.scene.effect +javafx.scene.image +javafx.scene.input +javafx.scene.layout +javafx.scene.paint +javafx.scene.shape +javafx.scene.text +javafx.scene.transform +javafx.stage +javafx.scene.media +javafx.embed.swing +javafx.scene.web +com.sun.java.accessibility.util +com.sun.tools.attach +com.sun.tools.attach.spi +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +com.sun.net.httpserver +com.sun.net.httpserver.spi +jdk.incubator.http +com.sun.jarsigner +jdk.security.jarsigner +com.sun.javadoc +com.sun.tools.javadoc +jdk.javadoc.doclet +com.sun.tools.jconsole +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +jdk.jfr +jdk.jfr.consumer +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +netscape.javascript +com.sun.management +jdk.management.cmm +jdk.management.jfr +jdk.management.resource +jdk.net +jdk.packager.services +jdk.packager.services.singleton +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +com.sun.nio.sctp +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +com.sun.security.jgss +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt new file mode 100644 index 0000000000000..4cfabf8fdf8f9 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt @@ -0,0 +1,282 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +com.sun.javadoc +com.sun.tools.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.pack +module:jdk.rmic +module:jdk.scripting.nashorn +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt new file mode 100644 index 0000000000000..fd6a8dd1dd55e --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt @@ -0,0 +1,284 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.constant +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.ldap.spi +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +com.sun.javadoc +com.sun.tools.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.pack +module:jdk.rmic +module:jdk.scripting.nashorn +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt new file mode 100644 index 0000000000000..d9abca54ea604 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt @@ -0,0 +1,282 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.constant +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.ldap.spi +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.pack +module:jdk.rmic +module:jdk.scripting.nashorn +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt new file mode 100644 index 0000000000000..76b9d24c5d002 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt @@ -0,0 +1,286 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.constant +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.lang.runtime +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.ldap.spi +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.incubator.foreign +jdk.incubator.foreign +module:jdk.incubator.jpackage +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.nio.mapmode +jdk.nio.mapmode +module:jdk.rmic +module:jdk.scripting.nashorn +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt new file mode 100644 index 0000000000000..870e4a44f728f --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt @@ -0,0 +1,282 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.constant +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.lang.runtime +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.ldap.spi +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.incubator.foreign +jdk.incubator.foreign +module:jdk.incubator.jpackage +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.nio.mapmode +jdk.nio.mapmode +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt new file mode 100644 index 0000000000000..870e4a44f728f --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt @@ -0,0 +1,282 @@ +module:java.base +java.io +java.lang +java.lang.annotation +java.lang.constant +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.lang.runtime +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +module:java.compiler +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +module:java.datatransfer +java.awt.datatransfer +module:java.desktop +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +module:java.instrument +java.lang.instrument +module:java.logging +java.util.logging +module:java.management +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +module:java.management.rmi +javax.management.remote.rmi +module:java.naming +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.ldap.spi +javax.naming.spi +module:java.net.http +java.net.http +module:java.prefs +java.util.prefs +module:java.rmi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +module:java.scripting +javax.script +module:java.se +module:java.security.jgss +javax.security.auth.kerberos +org.ietf.jgss +module:java.security.sasl +javax.security.sasl +module:java.smartcardio +javax.smartcardio +module:java.sql +java.sql +javax.sql +module:java.sql.rowset +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +module:java.transaction.xa +javax.transaction.xa +module:java.xml +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +module:java.xml.crypto +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +module:jdk.accessibility +com.sun.java.accessibility.util +module:jdk.attach +com.sun.tools.attach +com.sun.tools.attach.spi +module:jdk.charsets +module:jdk.compiler +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +module:jdk.crypto.cryptoki +module:jdk.crypto.ec +module:jdk.dynalink +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +module:jdk.editpad +module:jdk.hotspot.agent +module:jdk.httpserver +com.sun.net.httpserver +com.sun.net.httpserver.spi +module:jdk.incubator.foreign +jdk.incubator.foreign +module:jdk.incubator.jpackage +module:jdk.jartool +com.sun.jarsigner +jdk.security.jarsigner +module:jdk.javadoc +jdk.javadoc.doclet +module:jdk.jcmd +module:jdk.jconsole +com.sun.tools.jconsole +module:jdk.jdeps +module:jdk.jdi +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +module:jdk.jdwp.agent +module:jdk.jfr +jdk.jfr +jdk.jfr.consumer +module:jdk.jlink +module:jdk.jshell +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +module:jdk.jsobject +netscape.javascript +module:jdk.jstatd +module:jdk.localedata +module:jdk.management +com.sun.management +module:jdk.management.agent +module:jdk.management.jfr +jdk.management.jfr +module:jdk.naming.dns +module:jdk.naming.rmi +module:jdk.net +jdk.net +jdk.nio +module:jdk.nio.mapmode +jdk.nio.mapmode +module:jdk.sctp +com.sun.nio.sctp +module:jdk.security.auth +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +module:jdk.security.jgss +com.sun.security.jgss +module:jdk.xml.dom +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath +module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt new file mode 100644 index 0000000000000..b52fe94b6a106 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt @@ -0,0 +1,209 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt new file mode 100644 index 0000000000000..351c186855942 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt @@ -0,0 +1,217 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt new file mode 100644 index 0000000000000..24c17a899bb91 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt @@ -0,0 +1,315 @@ +com.sun.jarsigner +com.sun.java.accessibility.util +com.sun.javadoc +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +com.sun.management +com.sun.net.httpserver +com.sun.net.httpserver.spi +com.sun.nio.sctp +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +com.sun.security.jgss +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.attach +com.sun.tools.attach.spi +com.sun.tools.doclets +com.sun.tools.doclets.standard +com.sun.tools.javac +com.sun.tools.javadoc +com.sun.tools.jconsole +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javafx.animation +javafx.application +javafx.beans +javafx.beans.binding +javafx.beans.property +javafx.beans.property.adapter +javafx.beans.value +javafx.collections +javafx.collections.transformation +javafx.concurrent +javafx.css +javafx.css.converter +javafx.embed.swing +javafx.event +javafx.fxml +javafx.geometry +javafx.print +javafx.scene +javafx.scene.canvas +javafx.scene.chart +javafx.scene.control +javafx.scene.control.cell +javafx.scene.control.skin +javafx.scene.effect +javafx.scene.image +javafx.scene.input +javafx.scene.layout +javafx.scene.media +javafx.scene.paint +javafx.scene.shape +javafx.scene.text +javafx.scene.transform +javafx.scene.web +javafx.stage +javafx.util +javafx.util.converter +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.jnlp +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.smartcardio +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.catalog +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +jdk.incubator.http +jdk.javadoc.doclet +jdk.jfr +jdk.jfr.consumer +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +jdk.management.cmm +jdk.management.jfr +jdk.management.resource +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +jdk.net +jdk.packager.services +jdk.security.jarsigner +netscape.javascript +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.portable +org.omg.CORBA.TypeCodePackage +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.portable +org.omg.PortableServer.ServantLocatorPackage +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.css +org.w3c.dom.events +org.w3c.dom.html +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.stylesheets +org.w3c.dom.traversal +org.w3c.dom.views +org.w3c.dom.xpath +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java index 645a09e042daa..a24b96727db46 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java @@ -36,8 +36,10 @@ import java.net.URLConnection; import java.util.HashMap; import java.util.Map; +import java.util.Properties; import java.util.TreeMap; +import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ModuleElement; import javax.lang.model.element.PackageElement; @@ -48,6 +50,7 @@ import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.code.Symbol.ModuleSymbol; import jdk.javadoc.doclet.Reporter; +import jdk.javadoc.internal.doclets.toolkit.AbstractDoclet; import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration; import jdk.javadoc.internal.doclets.toolkit.Resources; @@ -223,6 +226,134 @@ public boolean link(String url, String elemlisturl, Reporter reporter) throws Do return link(url, elemlisturl, reporter, true); } + /** + * Check whether links to platform documentation are configured. If not then configure + * links using the the documentation URL defined in {@code linkPlatformProperties} or the + * default documentation URL if that parameter is {@code null}. + * + * @param linkPlatformProperties path or URL to properties file containing + * platform documentation URLs, or null + * @param reporter The {@code DocErrorReporter} used to report errors. + */ + public void checkPlatformLinks(String linkPlatformProperties, Reporter reporter) { + PackageElement javaLang = utils.elementUtils.getPackageElement("java.lang"); + if (utils.isIncluded(javaLang)) { + return; + } + DocLink link = getExternalLink(javaLang, DocPath.empty, DocPaths.PACKAGE_SUMMARY.getPath()); + if (link != null) { + // Links to platform docs are already configure, nothing to do here. + return; + } + try { + int versionNumber = getSourceVersionNumber(); + String docUrl; + + if (linkPlatformProperties != null) { + docUrl = getCustomPlatformDocs(versionNumber, linkPlatformProperties); + } else { + docUrl = getDefaultPlatformDocs(versionNumber); + } + if (docUrl == null) { + return; + } + DocPath elementListPath = getPlatformElementList(versionNumber); + URL elementListUrl = AbstractDoclet.class.getResource(elementListPath.getPath()); + if (elementListUrl == null) { + reporter.print(Kind.WARNING, resources.getText("doclet.Resource_error", elementListPath.getPath())); + } else { + try { + readListFromURL(docUrl, elementListUrl); + } catch (IOException exc) { + throw new Fault(resources.getText( + "doclet.Resource_error", elementListPath.getPath()), exc); + } + } + } catch (Fault f) { + reporter.print(Kind.ERROR, f.getMessage()); + } + } + + /** + * Return the resource path for the package or element list for the given {@code version}. + * @param version the platform version number + * @return the resource path + */ + private DocPath getPlatformElementList(int version) { + String filename = version <= 9 + ? "package-list-" + version + ".txt" + : "element-list-" + version + ".txt"; + return DocPaths.RESOURCES.resolve("releases").resolve(filename); + } + + /** + * Return the default URL for the platform API documentation for the given {@code version}. + * @param version the platform version number + * @return the URL as String + */ + private String getDefaultPlatformDocs(int version) { + Resources resources = configuration.getDocResources(); + return version <= 10 + ? resources.getText("doclet.platform.docs.old", version) + : isPrerelease(version) + ? resources.getText("doclet.platform.docs.ea", version) + : resources.getText("doclet.platform.docs.new", version); + } + + /** + * Retrieve and return the custom URL for the platform API documentation for the given + * {@code version} from the properties file at {@code linkPlatformProperties}. + * @param version the platform version number + * @param linkPlatformProperties path pointing to a properties file + * @return the custom URL as String + */ + private String getCustomPlatformDocs(int version, String linkPlatformProperties) throws Fault { + String url; + try { + Properties props = new Properties(); + InputStream inputStream; + if (isUrl(linkPlatformProperties)) { + inputStream = toURL(linkPlatformProperties).openStream(); + } else { + inputStream = DocFile.createFileForInput(configuration, linkPlatformProperties).openInputStream(); + } + try (inputStream) { + props.load(inputStream); + } + url = props.getProperty("doclet.platform.docs." + version); + } catch (MalformedURLException exc) { + throw new Fault(resources.getText("doclet.MalformedURL", linkPlatformProperties), exc); + } catch (IOException exc) { + throw new Fault(resources.getText("doclet.URL_error", linkPlatformProperties), exc); + } catch (DocFileIOException exc) { + throw new Fault(resources.getText("doclet.File_error", linkPlatformProperties), exc); + } + return url; + } + + /** + * Return the source version number used in the current execution of javadoc. + * @return the source version number + */ + private int getSourceVersionNumber() { + SourceVersion sourceVersion = configuration.docEnv.getSourceVersion(); + // TODO it would be nice if this was provided by SourceVersion + String versionNumber = sourceVersion.name().substring(8); + assert SourceVersion.valueOf("RELEASE_" + versionNumber) == sourceVersion; + return Integer.parseInt(versionNumber); + } + + /** + * Return true if the given {@code sourceVersion} is the same as the current doclet version + * and is a pre-release version. + * @param sourceVersion the source version number + * @return true if it is a pre-release version + */ + private boolean isPrerelease(int sourceVersion) { + Runtime.Version docletVersion = configuration.getDocletVersion(); + return docletVersion.feature() == sourceVersion && docletVersion.pre().isPresent(); + } + /* * Build the extern element list from given URL or the directory path. * Flag error if the "-link" or "-linkoffline" option is already used. @@ -295,13 +426,11 @@ private String adjustEndFileSeparator(String url) { private void readElementListFromURL(String urlpath, URL elemlisturlpath) throws Fault { try { URL link = elemlisturlpath.toURI().resolve(DocPaths.ELEMENT_LIST.getPath()).toURL(); - try (InputStream in = open(link)) { - readElementList(in, urlpath, false); - } + readListFromURL(urlpath, link); } catch (URISyntaxException | MalformedURLException exc) { throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc); } catch (IOException exc) { - readAlternateURL(urlpath, elemlisturlpath); + readPackageListFromURL(urlpath, elemlisturlpath); } } @@ -311,12 +440,10 @@ private void readElementListFromURL(String urlpath, URL elemlisturlpath) throws * @param urlpath Path to the packages. * @param elemlisturlpath URL or the path to the "package-list" file. */ - private void readAlternateURL(String urlpath, URL elemlisturlpath) throws Fault { + private void readPackageListFromURL(String urlpath, URL elemlisturlpath) throws Fault { try { URL link = elemlisturlpath.toURI().resolve(DocPaths.PACKAGE_LIST.getPath()).toURL(); - try (InputStream in = open(link)) { - readElementList(in, urlpath, false); - } + readListFromURL(urlpath, link); } catch (URISyntaxException | MalformedURLException exc) { throw new Fault(resources.getText("doclet.MalformedURL", elemlisturlpath.toString()), exc); } catch (IOException exc) { @@ -324,6 +451,18 @@ private void readAlternateURL(String urlpath, URL elemlisturlpath) throws Fault } } + /** + * Read an element or package list from file. + * + * @param urlpath URL or path to the packages + * @param elementlistpath URL to read "element-list" file from + */ + private void readListFromURL(String urlpath, URL elementlistpath) throws IOException { + try (InputStream in = open(elementlistpath)) { + readElementList(in, urlpath, false); + } + } + /** * Read the "element-list" file which is available locally. * diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java index d0b3535c911ae..ce8d995a307d4 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java @@ -46,6 +46,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out-1", "-sourcepath", testSrc, + "--no-platform-link", "pkg"); checkExit(Exit.OK); @@ -108,6 +109,7 @@ public void test() { public void testLinkSource() { javadoc("-d", "out-2", "-linksource", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java index 65c240effac7d..63282cd961f22 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java +++ b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java @@ -50,6 +50,7 @@ public void test() { "-Xdoclint:none", "-sourcepath", testSrc, "-linkoffline", uri, testSrc, + "--no-platform-link", testSrc("C.java")); checkExit(Exit.OK); @@ -82,6 +83,7 @@ public void test_warning() { "-Xdoclint:none", "-sourcepath", testSrc, "-linkoffline", uri, testSrc, + "--no-platform-link", testSrc("C.java")); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java index 6ef3f1e9cfcaa..e0ec523292512 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java @@ -46,6 +46,7 @@ public void test() { javadoc("-d", "out", "-Xdoclint:none", + "--no-platform-link", "-sourcepath", testSrc, "-package", "p"); diff --git a/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java index bf40c0d994d97..0300710e4d601 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java +++ b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java @@ -46,6 +46,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index 81732538029d1..fde4f0cf35ad3 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java b/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java index ab74d24b1a86d..5c14f909c88cc 100644 --- a/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test1() { javadoc("-d", "out-1", + "--no-platform-link", "-package", "-sourcepath", testSrc, "pkg1"); diff --git a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java index 7832a2981e0e8..1da919cb9bb48 100644 --- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java +++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java @@ -45,6 +45,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out", "-sourcepath", testSrc, + "--no-platform-link", "-use", "-header", "Test Files", "pkg1", "pkg2"); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java index f73bec498fa11..64d57cce0fa3f 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java @@ -49,6 +49,7 @@ public static void main(String... args) throws Exception { public void test_Comment_Deprecated() { javadoc("-Xdoclint:none", "-d", "out-1", + "--no-platform-link", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -61,6 +62,7 @@ public void test_NoComment_Deprecated() { javadoc("-Xdoclint:none", "-d", "out-2", "-nocomment", + "--no-platform-link", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -73,6 +75,7 @@ public void test_Comment_NoDeprecated() { javadoc("-Xdoclint:none", "-d", "out-3", "-nodeprecated", + "--no-platform-link", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -87,6 +90,7 @@ public void testNoCommentNoDeprecated() { "-d", "out-4", "-nocomment", "-nodeprecated", + "--no-platform-link", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java index 66783d129955b..b92b7d71dda8d 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java @@ -101,6 +101,7 @@ public void test_en_US() { @Test public void test_other() { javadoc("-locale", "en_US", + "--no-platform-link", "-d", "out-other", "-sourcepath", testSrc, "pkg3"); diff --git a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java index fa019056bf902..4447e483437f6 100644 --- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java +++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java @@ -43,6 +43,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "p"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java index 88b42ef07ea7c..8c768716e3223 100644 --- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java +++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java @@ -61,6 +61,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java index ffa4896846cf9..a956559f6c124 100644 --- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java @@ -234,6 +234,7 @@ public void test2() { "-sourcepath", testSrc, "-javafx", "--disable-javafx-strict-checks", + "--no-platform-link", "-package", "pkg2"); checkExit(Exit.OK); @@ -297,6 +298,7 @@ public void test2() { public void test3() { javadoc("-d", "out2b", "-sourcepath", testSrc, + "--no-platform-link", "-package", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java index d64dbc7f4f516..1b5be0927b69c 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java @@ -24,6 +24,7 @@ /* * @test * @bug 4720957 5020118 8026567 8038976 8184969 8164407 8182765 8205593 + * 8216497 * @summary Test to make sure that -link and -linkoffline link to * right files, and URLs with and without trailing slash are accepted. * @library ../../lib @@ -149,6 +150,7 @@ Resource Identifiers (URI): Generic Syntax,
,
new Object[]{Paths.get(m.getName())}); + } + + final ToolBox tb; + private final Path packageSrc; + + TestLinkPlatform() throws Exception { + tb = new ToolBox(); + packageSrc = Paths.get("src", "packages"); + initCode(); + } + + @Test + public void testPlatformLinkWithReleaseOption(Path base) throws Exception { + testPlatformLinkWithSupportedVersions(base, "--release"); + } + + @Test + public void testPlatformLinkWithSourceOption(Path base) throws Exception { + testPlatformLinkWithSupportedVersions(base, "--source"); + } + + private void testPlatformLinkWithSupportedVersions(Path base, String versionOption) throws Exception { + for (int version = EARLIEST_VERSION; version <= LATEST_VERSION; version++) { + Path out = base.resolve("out_" + version); + + javadoc("-d", out.toString(), + "-sourcepath", packageSrc.toString(), + versionOption, Integer.toString(version), + "p.q"); + + checkExit(Exit.OK); + // Make sure there is no message about missing element-list resource + checkOutput(Output.OUT, false, "element-list"); + String url = getPlatformUrlString(version); + checkOutput("p/q/A.html", true, + "", + "", + ""); + } + } + + @Test + public void testPlatformLinkWithCustomPropertyURL(Path base) throws Exception { + for (int version = EARLIEST_VERSION; version <= LATEST_VERSION; version++) { + Path out = base.resolve("out_" + version); + + javadoc("-d", out.toString(), + "-sourcepath", packageSrc.toString(), + "--release", Integer.toString(version), + "--link-platform-properties", "file:" + testSrc("linkplatform.properties"), + "p.q"); + + checkExit(Exit.OK); + String url = getCustomPlatformUrlString(version); + checkOutput("p/q/A.html", true, + "", + "", + ""); + } + } + + @Test + public void testPlatformLinkWithCustomPropertyFile(Path base) throws Exception { + for (int version = EARLIEST_VERSION; version <= LATEST_VERSION; version++) { + Path out = base.resolve("out_" + version); + + javadoc("-d", out.toString(), + "-sourcepath", packageSrc.toString(), + "--release", Integer.toString(version), + "--link-platform-properties", testSrc("linkplatform.properties"), + "p.q"); + + checkExit(Exit.OK); + String url = getCustomPlatformUrlString(version); + checkOutput("p/q/A.html", true, + "", + "", + ""); + } + } + + @Test + public void testPlatformLinkWithInvalidPropertyFile(Path base) throws Exception { + for (int version = EARLIEST_VERSION; version <= LATEST_VERSION; version++) { + Path out = base.resolve("out_" + version); + + javadoc("-d", out.toString(), + "-sourcepath", packageSrc.toString(), + "--release", Integer.toString(version), + "--link-platform-properties", testSrc("invalid-properties-file"), + "p.q"); + + checkExit(Exit.ERROR); + checkOutput(Output.OUT, true, "Error reading file"); + checkOutput("p/q/A.html", false); + } + } + + void initCode() throws Exception { + new ClassBuilder(tb, "p.q.A") + .setModifiers("public","class") + .write(packageSrc); + } + + String getPlatformUrlString(int version) { + String urlString; + Runtime.Version runtimeVersion = Runtime.version(); + if (version == runtimeVersion.feature() && runtimeVersion.pre().isPresent()) { + urlString = PRE_PLATFORM_URL; + } else { + urlString = version <= 10 ? OLD_PLATFORM_URL : NEW_PLATFORM_URL; + } + return urlString.formatted(version); + } + + String getCustomPlatformUrlString(int version) { + return version <= 10 + ? NON_MODULAR_CUSTOM_PLATFORM_URL.formatted(version) + : MODULAR_CUSTOM_PLATFORM_URL.formatted(version); + } +} diff --git a/test/langtools/jdk/javadoc/doclet/testLinkPlatform/linkplatform.properties b/test/langtools/jdk/javadoc/doclet/testLinkPlatform/linkplatform.properties new file mode 100644 index 0000000000000..e77d2ffb11bff --- /dev/null +++ b/test/langtools/jdk/javadoc/doclet/testLinkPlatform/linkplatform.properties @@ -0,0 +1,10 @@ +doclet.platform.docs.7= https://some.domain/docs/7/api/ +doclet.platform.docs.8= https://some.domain/docs/8/api/ +doclet.platform.docs.9= https://some.domain/docs/9/api/ +doclet.platform.docs.10=https://some.domain/docs/10/api/ +doclet.platform.docs.11=https://some.domain/docs/11/api/ +doclet.platform.docs.12=https://some.domain/docs/12/api/ +doclet.platform.docs.13=https://some.domain/docs/13/api/ +doclet.platform.docs.14=https://some.domain/docs/14/api/ +doclet.platform.docs.15=https://some.domain/docs/15/api/ +doclet.platform.docs.16=https://some.domain/docs/16/api/ diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java index 374f30db30b5c..9e24e2353b6ca 100644 --- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java +++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java @@ -46,6 +46,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out", "-sourcepath", testSrc, + "--no-platform-link", "pkg", "diamond", "inheritDist", "pkg1", "pkg2", "pkg3"); checkExit(Exit.OK); @@ -218,6 +219,7 @@ public void testSplitIndex() { javadoc("-d", "out-split", "-splitindex", "-sourcepath", testSrc, + "--no-platform-link", "pkg", "diamond", "inheritDist", "pkg1", "pkg2", "pkg3"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java index e1f00c31f8e2f..84ae4474e0dfc 100644 --- a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java +++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out", "-sourcepath", testSrc, + "--no-platform-link", "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java index 20badb0af07f7..93bdc3aa96ae3 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java +++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java @@ -74,6 +74,7 @@ public void testHtml5NoComment() { "-nocomment", "-use", "-Xdoclint:none", + "--no-platform-link", "-overview", testSrc("overview.html"), "--module-source-path", testSrc, "--module", "moduleA,moduleB", @@ -170,6 +171,7 @@ public void testModuleFilesAndLinks() { public void testModuleDeprecation() { javadoc("-d", "out-moduledepr", "-Xdoclint:none", + "--no-platform-link", "-tag", "regular:a:Regular Tag:", "-tag", "moduletag:s:Module Tag:", "--module-source-path", testSrc, @@ -430,6 +432,7 @@ public void testLinkSource() { javadoc("-d", "out-linksource", "-use", "-linksource", + "--no-platform-link", "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB"); @@ -447,6 +450,7 @@ public void testLinkSourcePrivate() { "-use", "-private", "-linksource", + "--no-platform-link", "-Xdoclint:none", "--module-source-path", testSrc, "--module", "moduleA,moduleB"); diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java index 990609d0eb0bf..b23c877a79f3e 100644 --- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java +++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java @@ -48,6 +48,7 @@ public void test() { javadoc("-Xdoclint:none", "-d", "out", "-use", + "--no-platform-link", "-sourcepath", testSrc, "pkg", "pkg1", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java b/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java index ef9c25198486a..b798498143903 100644 --- a/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java +++ b/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java @@ -185,6 +185,7 @@ public void testInvalidAdditionalStylesheetFiles() { public void testLinkSource() { javadoc("-d", "out-9", "-linksource", + "--no-platform-link", "-javafx", "--disable-javafx-strict-checks", "-sourcepath", testSrc, diff --git a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java index 0c208ef4b415b..7f2800e08ba98 100644 --- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java +++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java @@ -120,6 +120,7 @@ class NamedPackagesForClassUseTest { public void run() { javadoc("-d", "out-1", "-sourcepath", testSrc, + "--no-platform-link", "-use", "pkg1"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java index 15d8cf0e6ffb6..597ba9a82f002 100644 --- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java +++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java @@ -44,6 +44,7 @@ public static void main(String args[]) throws Exception { public void test() { javadoc("-d", "out-deprecated", "-sourcepath", testSrc, + "--no-platform-link", "--override-methods","summary", "pkg1"); diff --git a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java index e05421d2d4c99..33e84f91278df 100644 --- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java +++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java @@ -69,6 +69,7 @@ public void testDetail() { public void testSummary() { javadoc("-d", "out-summary", "-sourcepath", testSrc, + "--no-platform-link", "-javafx", "--disable-javafx-strict-checks", "--override-methods=summary", diff --git a/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java index 8f7eed2d5d8b1..18c46d0d7c999 100644 --- a/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java +++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { public void testPackageInfoAnnotationNoComment() { javadoc("-d", "out-annotation", "-sourcepath", testSrc, + "--no-platform-link", "-use", "pkg1"); checkExit(Exit.OK); @@ -78,6 +79,7 @@ public void testPackageHtmlTag() { public void testPackageInfoAndHtml() { javadoc("-d", "out-annotation-3", "-sourcepath", testSrc, + "--no-platform-link", "-use", "pkg3"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java index 246dac4259a0d..a64225e658cda 100644 --- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java +++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java @@ -54,6 +54,7 @@ public static void main(String... args) throws Exception { public void testDefault() { javadoc("-d", "out-default", "-sourcepath", testSrc, + "--no-platform-link", "pkg", "pkg2"); checkExit(Exit.OK); @@ -149,6 +150,7 @@ public void testDefault() { public void testPrivate() { javadoc("-d", "out-private", "-sourcepath", testSrc, + "--no-platform-link", "-private", "pkg", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java index 65c8014185003..66b79928e92de 100644 --- a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java +++ b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java @@ -43,6 +43,7 @@ public static void main(String... args) throws Exception { @Test public void testArrays() { javadoc("-d", "out", + "--no-platform-link", "-javafx", "--disable-javafx-strict-checks", "-sourcepath", testSrc, diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java index 9fe92eb43823b..e03ac4b1cde70 100644 --- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java @@ -347,6 +347,7 @@ public record R(""" + comps + ") { }"); javadoc("-d", base.resolve("out").toString(), "-quiet", "-noindex", + "--no-platform-link", "-sourcepath", src.toString(), "--enable-preview", "--source", thisRelease, "p"); @@ -464,6 +465,7 @@ void testAnnotations(Path base, Set types) throws IOException { javadoc("-d", dir.resolve("out").toString(), "-quiet", "-noindex", + "--no-platform-link", "-sourcepath", src.toString(), "-private", "--enable-preview", "--source", thisRelease, diff --git a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java index aa6d8c9629d13..155d47ac8ae95 100644 --- a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java @@ -167,6 +167,7 @@ public void testSinglePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -188,6 +189,7 @@ public void testMultiplePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -211,6 +213,7 @@ public void testPartialMultiplePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -260,6 +263,7 @@ public void testPartialMultiplePermitsWithSubtypes2(Path base) throws IOExceptio javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -283,6 +287,7 @@ public void testImplicitPermitsAuxiliary(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "-package", "--enable-preview", "--source", thisRelease, "p"); @@ -308,6 +313,7 @@ public void testImplicitPermitsNested(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), + "--no-platform-link", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java index f75ae30f88257..527cc535fb1e2 100644 --- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java +++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java @@ -72,6 +72,7 @@ public void test() { public void testBadReference() { javadoc("-d", "out-badref", "-sourcepath", testSrc, + "--no-platform-link", "badref"); checkExit(Exit.ERROR); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java index c0ab27705ca13..06abf5ae65a8f 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java @@ -115,6 +115,7 @@ public void testPrivate() { javadoc("-private", "-d", "out-private", "-sourcepath", testSrc, + "--no-platform-link", testSrc("SerializedForm.java"), testSrc("ExternalizedForm.java"), "pkg1"); checkExit(Exit.OK); @@ -166,6 +167,7 @@ public void test2() { javadoc("-private", "-d", "out-2", "-sourcepath", testSrc, + "--no-platform-link", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java index a76ce19086e90..ae423d404267d 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { public void testDefault() { javadoc("-d", "out-default", "-sourcepath", testSrc, + "--no-platform-link", "pkg1"); checkExit(Exit.OK); @@ -68,6 +69,7 @@ public void testNoDeprecated() { javadoc("-d", "out-nodepr", "-nodeprecated", "-sourcepath", testSrc, + "--no-platform-link", "pkg1"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java index 552e5a6051ae0..44fe7a02e23e7 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java @@ -66,6 +66,7 @@ public void test(Path base) throws Exception { Path outDir = base.resolve("out"); javadoc("-d", outDir.toString(), "-linksource", + "--no-platform-link", "-classpath", base.resolve("classes").toString(), "-sourcepath", "", srcDir.resolve("B.java").toString()); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java index bab91c4252ddd..2cef5e5328c1c 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java @@ -44,6 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "-private", "typeannos"); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java index 8d4f51720a75d..cf757298a2a9c 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java @@ -48,6 +48,7 @@ public static void main(String... args) throws Exception { public void test1() { javadoc("-d", "out-1", "-use", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); @@ -80,6 +81,7 @@ public void test1() { public void test2() { javadoc("-d", "out-2", "-linksource", + "--no-platform-link", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java index 43af1221aa1cb..47e787d2b8ae8 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java @@ -43,6 +43,7 @@ public static void main(String... args) throws Exception { @Test public void test1() { javadoc("-d", "out", + "--no-platform-link", "-sourcepath", testSrc, "-package", "pkg1"); diff --git a/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java b/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java index 0b569ee881a4b..d87b6649fa9aa 100644 --- a/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java +++ b/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java @@ -266,6 +266,7 @@ public void testStreamsMissingLinksDetail(Path base) throws Exception { javadoc("-d", outDir.toString(), "-html5", "--override-methods=detail", + "--no-platform-link", "-sourcepath", srcDir.toString(), "p"); checkExit(Exit.OK); @@ -301,6 +302,7 @@ public void testStreamsMissingLinksSummary(Path base) throws Exception { javadoc("-d", outDir.toString(), "-html5", "--override-methods=summary", + "--no-platform-link", "-sourcepath", srcDir.toString(), "p"); checkExit(Exit.OK); From 36c1510587a4b050b148eda87ae7a7a89aff9690 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Tue, 15 Sep 2020 12:59:56 +0200 Subject: [PATCH 2/5] Attempting to (mostly) generate the javadoc release manifests from ct.sym historical data. --- .../tools/symbolgenerator/CreateSymbols.java | 79 ++++- make/modules/jdk.javadoc/Gendata.gmk | 91 +++++ .../resources/releases/element-list-10.txt | 314 ----------------- .../resources/releases/element-list-11.txt | 282 ---------------- .../resources/releases/element-list-12.txt | 284 ---------------- .../resources/releases/element-list-13.txt | 282 ---------------- .../resources/releases/element-list-14.txt | 286 ---------------- .../resources/releases/element-list-15.txt | 282 ---------------- .../resources/releases/element-list-16.txt | 282 ---------------- .../resources/releases/package-list-7.txt | 209 ------------ .../resources/releases/package-list-8.txt | 217 ------------ .../resources/releases/package-list-9.txt | 315 ------------------ 12 files changed, 169 insertions(+), 2754 deletions(-) create mode 100644 make/modules/jdk.javadoc/Gendata.gmk delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java index 2ac123d87c8f0..219b3129b914e 100644 --- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java +++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java @@ -143,6 +143,7 @@ import com.sun.tools.javac.util.Assert; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Pair; +import java.util.Optional; /** * A tool for processing the .sym.txt files. @@ -3820,6 +3821,58 @@ private static AnnotationDescription parseAnnotation(String value, int[] valuePo } // + /**Create sig files for ct.sym reading the classes description from the directory that contains + * {@code ctDescriptionFile}, using the file as a recipe to create the sigfiles. + */ + @SuppressWarnings("unchecked") + public void createJavadocData(String ctDescriptionFileExtra, String ctDescriptionFile, String targetDir) throws IOException { + LoadDescriptions data = load(ctDescriptionFileExtra != null ? Paths.get(ctDescriptionFileExtra) + : null, + Paths.get(ctDescriptionFile)); + + Path target = Paths.get(targetDir); + + for (PlatformInput version : data.versions) { + int versionNumber = Integer.parseInt(version.version, Character.MAX_RADIX); + if (versionNumber <= 8) { + Path outputFile = target.resolve("package-list-" + versionNumber + ".txt"); + Files.createDirectories(outputFile.getParent()); + try (Writer w = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) { + Set packages = data.classes.classes.stream().filter(cd -> cd.header.stream().anyMatch(h -> h.versions.contains(version.version))).map(cd -> { + int lastSlash = cd.name.lastIndexOf("/"); + return cd.name.substring(0, lastSlash).replace('/', '.'); + }).collect(Collectors.toCollection(() -> new TreeSet<>())); + for (String pack : packages) { + w.write(pack); + w.write("\n"); + } + } + } else { + Path outputFile = target.resolve("element-list-" + versionNumber + ".txt"); + Files.createDirectories(outputFile.getParent()); + try (Writer w = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) { + Set modules = new TreeSet<>((m1, m2) -> m1.name.compareTo(m2.name)); + modules.addAll(data.modules.values()); + for (ModuleDescription module : modules) { + if ("jdk.unsupported".equals(module.name)) { + continue; + } + Optional header = module.header.stream().filter(h -> h.versions.contains(version.version)).findAny(); + if (header.isEmpty()) { + continue; + } + w.write("module:" + module.name); + w.write("\n"); + for (String pack : header.get().exports) { + w.write(pack.replace('/', '.')); + w.write("\n"); + } + } + } + } + } + } + private static void help() { System.err.println("Help..."); } @@ -3900,7 +3953,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce new CreateSymbols().createIncrementalBaseLine(args[1], args[2], args); break; } - case "build-ctsym": + case "build-ctsym": { String ctDescriptionFileExtra; String ctDescriptionFile; String ctSymLocation; @@ -3939,6 +3992,30 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce currentVersion, systemModules); break; + } + case "build-javadoc-data": { + String ctDescriptionFileExtra; + String ctDescriptionFile; + String targetDir; + + if (args.length == 3) { + ctDescriptionFileExtra = null; + ctDescriptionFile = args[1]; + targetDir = args[2]; + } else if (args.length == 4) { + ctDescriptionFileExtra = args[1]; + ctDescriptionFile = args[2]; + targetDir = args[3]; + } else { + help(); + return ; + } + + new CreateSymbols().createJavadocData(ctDescriptionFileExtra, + ctDescriptionFile, + targetDir); + break; + } } } diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk new file mode 100644 index 0000000000000..81f8642315df8 --- /dev/null +++ b/make/modules/jdk.javadoc/Gendata.gmk @@ -0,0 +1,91 @@ +# +# Copyright (c) 2015, 2020, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include JarArchive.gmk +include JavaCompilation.gmk +include Modules.gmk + +################################################################################ + +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, modules/jdk.javadoc/Gendata.gmk)) + +# This is needed to properly setup DOCS_MODULES. +$(eval $(call ReadImportMetaData)) + +# Modules that should be visible for 9 - the documented modules: +CT_MODULES := $(DOCS_MODULES) + +# Get the complete module source path: +CT_MODULESOURCEPATH := $(call GetModuleSrcPath) + +CT_DATA_DESCRIPTION += $(TOPDIR)/make/data/symbols/symbols + +COMPILECREATESYMBOLS_ADD_EXPORTS := \ + --add-exports java.base/jdk.internal=java.compiler.interim,jdk.compiler.interim \ + --add-exports jdk.compiler.interim/com.sun.tools.javac.api=ALL-UNNAMED \ + --add-exports jdk.compiler.interim/com.sun.tools.javac.code=ALL-UNNAMED \ + --add-exports jdk.compiler.interim/com.sun.tools.javac.util=ALL-UNNAMED \ + --add-exports jdk.compiler.interim/com.sun.tools.javac.jvm=ALL-UNNAMED \ + # + +$(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \ + TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \ + SRC := $(TOPDIR)/make/langtools/src/classes \ + $(TOPDIR)/src/jdk.jdeps/share/classes, \ + INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \ + BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \ + DISABLED_WARNINGS := options, \ + JAVAC_FLAGS := \ + $(INTERIM_LANGTOOLS_ARGS) \ + --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \ + $(COMPILECREATESYMBOLS_ADD_EXPORTS), \ +)) + +$(SUPPORT_OUTPUTDIR)/javadoc-symbols/symbols: \ + $(COMPILE_CREATE_SYMBOLS) \ + $(wildcard $(TOPDIR)/make/data/symbols/*) \ + $(MODULE_INFOS) + $(RM) -r $(@D) + $(MKDIR) -p $(@D) + $(ECHO) Creating javadoc element list + $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \ + $(COMPILECREATESYMBOLS_ADD_EXPORTS) \ + -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ + build.tools.symbolgenerator.CreateSymbols \ + build-javadoc-data \ + $(CT_DATA_DESCRIPTION) \ + $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases + $(TOUCH) $@ + +# Copy ct.sym to the modules libs dir +$(eval $(call SetupCopyFiles, COPY_TO_LIBS, \ + FILES := $(SUPPORT_OUTPUTDIR)/javadoc-symbols/*.txt, \ + DEST := $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases, \ +)) + +TARGETS += $(SUPPORT_OUTPUTDIR)/javadoc-symbols/symbols + +################################################################################ diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt deleted file mode 100644 index 16518f6620ea2..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt +++ /dev/null @@ -1,314 +0,0 @@ -javax.activation -java.io -java.lang -java.lang.annotation -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -javax.activity -javax.rmi -javax.rmi.CORBA -org.omg.CORBA -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.portable -org.omg.CORBA.TypeCodePackage -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.portable -org.omg.PortableServer.ServantLocatorPackage -org.omg.SendingContext -org.omg.stub.java.rmi -java.awt.datatransfer -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -java.lang.instrument -javax.jnlp -java.util.logging -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -javax.management.remote.rmi -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -java.util.prefs -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -javax.script -javax.security.auth.kerberos -org.ietf.jgss -javax.security.sasl -javax.smartcardio -java.sql -javax.sql -javax.transaction.xa -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.transaction -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.jws -javax.jws.soap -javax.xml.soap -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.spi.http -javax.xml.ws.wsaddressing -javax.annotation -javafx.beans -javafx.beans.binding -javafx.beans.property -javafx.beans.property.adapter -javafx.beans.value -javafx.collections -javafx.collections.transformation -javafx.event -javafx.util -javafx.util.converter -javafx.scene.chart -javafx.scene.control -javafx.scene.control.cell -javafx.scene.control.skin -javafx.fxml -javafx.animation -javafx.application -javafx.concurrent -javafx.css -javafx.css.converter -javafx.geometry -javafx.print -javafx.scene -javafx.scene.canvas -javafx.scene.effect -javafx.scene.image -javafx.scene.input -javafx.scene.layout -javafx.scene.paint -javafx.scene.shape -javafx.scene.text -javafx.scene.transform -javafx.stage -javafx.scene.media -javafx.embed.swing -javafx.scene.web -com.sun.java.accessibility.util -com.sun.tools.attach -com.sun.tools.attach.spi -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -com.sun.net.httpserver -com.sun.net.httpserver.spi -jdk.incubator.http -com.sun.jarsigner -jdk.security.jarsigner -com.sun.javadoc -com.sun.tools.javadoc -jdk.javadoc.doclet -com.sun.tools.jconsole -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -jdk.jfr -jdk.jfr.consumer -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -netscape.javascript -com.sun.management -jdk.management.cmm -jdk.management.jfr -jdk.management.resource -jdk.net -jdk.packager.services -jdk.packager.services.singleton -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -com.sun.nio.sctp -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -com.sun.security.jgss -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt deleted file mode 100644 index 4cfabf8fdf8f9..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-11.txt +++ /dev/null @@ -1,282 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -com.sun.javadoc -com.sun.tools.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.pack -module:jdk.rmic -module:jdk.scripting.nashorn -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt deleted file mode 100644 index fd6a8dd1dd55e..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-12.txt +++ /dev/null @@ -1,284 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.constant -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.ldap.spi -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -com.sun.javadoc -com.sun.tools.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.pack -module:jdk.rmic -module:jdk.scripting.nashorn -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt deleted file mode 100644 index d9abca54ea604..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-13.txt +++ /dev/null @@ -1,282 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.constant -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.ldap.spi -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.pack -module:jdk.rmic -module:jdk.scripting.nashorn -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt deleted file mode 100644 index 76b9d24c5d002..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-14.txt +++ /dev/null @@ -1,286 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.constant -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.lang.runtime -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.ldap.spi -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.incubator.foreign -jdk.incubator.foreign -module:jdk.incubator.jpackage -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.nio.mapmode -jdk.nio.mapmode -module:jdk.rmic -module:jdk.scripting.nashorn -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt deleted file mode 100644 index 870e4a44f728f..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-15.txt +++ /dev/null @@ -1,282 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.constant -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.lang.runtime -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.ldap.spi -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.incubator.foreign -jdk.incubator.foreign -module:jdk.incubator.jpackage -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.nio.mapmode -jdk.nio.mapmode -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt deleted file mode 100644 index 870e4a44f728f..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-16.txt +++ /dev/null @@ -1,282 +0,0 @@ -module:java.base -java.io -java.lang -java.lang.annotation -java.lang.constant -java.lang.invoke -java.lang.module -java.lang.ref -java.lang.reflect -java.lang.runtime -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.security -java.security.cert -java.security.interfaces -java.security.spec -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.net -javax.net.ssl -javax.security.auth -javax.security.auth.callback -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -module:java.compiler -javax.annotation.processing -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.tools -module:java.datatransfer -java.awt.datatransfer -module:java.desktop -java.applet -java.awt -java.awt.color -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -javax.accessibility -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -module:java.instrument -java.lang.instrument -module:java.logging -java.util.logging -module:java.management -java.lang.management -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.timer -module:java.management.rmi -javax.management.remote.rmi -module:java.naming -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.ldap.spi -javax.naming.spi -module:java.net.http -java.net.http -module:java.prefs -java.util.prefs -module:java.rmi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -javax.rmi.ssl -module:java.scripting -javax.script -module:java.se -module:java.security.jgss -javax.security.auth.kerberos -org.ietf.jgss -module:java.security.sasl -javax.security.sasl -module:java.smartcardio -javax.smartcardio -module:java.sql -java.sql -javax.sql -module:java.sql.rowset -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -module:java.transaction.xa -javax.transaction.xa -module:java.xml -javax.xml -javax.xml.catalog -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.xpath -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.traversal -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers -module:java.xml.crypto -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -module:jdk.accessibility -com.sun.java.accessibility.util -module:jdk.attach -com.sun.tools.attach -com.sun.tools.attach.spi -module:jdk.charsets -module:jdk.compiler -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.javac -module:jdk.crypto.cryptoki -module:jdk.crypto.ec -module:jdk.dynalink -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -module:jdk.editpad -module:jdk.hotspot.agent -module:jdk.httpserver -com.sun.net.httpserver -com.sun.net.httpserver.spi -module:jdk.incubator.foreign -jdk.incubator.foreign -module:jdk.incubator.jpackage -module:jdk.jartool -com.sun.jarsigner -jdk.security.jarsigner -module:jdk.javadoc -jdk.javadoc.doclet -module:jdk.jcmd -module:jdk.jconsole -com.sun.tools.jconsole -module:jdk.jdeps -module:jdk.jdi -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -module:jdk.jdwp.agent -module:jdk.jfr -jdk.jfr -jdk.jfr.consumer -module:jdk.jlink -module:jdk.jshell -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -module:jdk.jsobject -netscape.javascript -module:jdk.jstatd -module:jdk.localedata -module:jdk.management -com.sun.management -module:jdk.management.agent -module:jdk.management.jfr -jdk.management.jfr -module:jdk.naming.dns -module:jdk.naming.rmi -module:jdk.net -jdk.net -jdk.nio -module:jdk.nio.mapmode -jdk.nio.mapmode -module:jdk.sctp -com.sun.nio.sctp -module:jdk.security.auth -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -module:jdk.security.jgss -com.sun.security.jgss -module:jdk.xml.dom -org.w3c.dom.css -org.w3c.dom.html -org.w3c.dom.stylesheets -org.w3c.dom.xpath -module:jdk.zipfs diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt deleted file mode 100644 index b52fe94b6a106..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt +++ /dev/null @@ -1,209 +0,0 @@ -java.applet -java.awt -java.awt.color -java.awt.datatransfer -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -java.io -java.lang -java.lang.annotation -java.lang.instrument -java.lang.invoke -java.lang.management -java.lang.ref -java.lang.reflect -java.math -java.net -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.sql -java.text -java.text.spi -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.jar -java.util.logging -java.util.prefs -java.util.regex -java.util.spi -java.util.zip -javax.accessibility -javax.activation -javax.activity -javax.annotation -javax.annotation.processing -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.spi -javax.imageio.stream -javax.jws -javax.jws.soap -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.remote.rmi -javax.management.timer -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -javax.net -javax.net.ssl -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.rmi -javax.rmi.CORBA -javax.rmi.ssl -javax.script -javax.security.auth -javax.security.auth.callback -javax.security.auth.kerberos -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.security.sasl -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.sql -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -javax.tools -javax.transaction -javax.transaction.xa -javax.xml -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.soap -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.spi.http -javax.xml.ws.wsaddressing -javax.xml.xpath -org.ietf.jgss -org.omg.CORBA -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.TypeCodePackage -org.omg.CORBA.portable -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.ServantLocatorPackage -org.omg.PortableServer.portable -org.omg.SendingContext -org.omg.stub.java.rmi -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt deleted file mode 100644 index 351c186855942..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt +++ /dev/null @@ -1,217 +0,0 @@ -java.applet -java.awt -java.awt.color -java.awt.datatransfer -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -java.io -java.lang -java.lang.annotation -java.lang.instrument -java.lang.invoke -java.lang.management -java.lang.ref -java.lang.reflect -java.math -java.net -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.sql -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.logging -java.util.prefs -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javax.accessibility -javax.activation -javax.activity -javax.annotation -javax.annotation.processing -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.spi -javax.imageio.stream -javax.jws -javax.jws.soap -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.remote.rmi -javax.management.timer -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -javax.net -javax.net.ssl -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.rmi -javax.rmi.CORBA -javax.rmi.ssl -javax.script -javax.security.auth -javax.security.auth.callback -javax.security.auth.kerberos -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.security.sasl -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.sql -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -javax.tools -javax.transaction -javax.transaction.xa -javax.xml -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.soap -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.spi.http -javax.xml.ws.wsaddressing -javax.xml.xpath -org.ietf.jgss -org.omg.CORBA -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.TypeCodePackage -org.omg.CORBA.portable -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.ServantLocatorPackage -org.omg.PortableServer.portable -org.omg.SendingContext -org.omg.stub.java.rmi -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.w3c.dom.views -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt deleted file mode 100644 index 24c17a899bb91..0000000000000 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt +++ /dev/null @@ -1,315 +0,0 @@ -com.sun.jarsigner -com.sun.java.accessibility.util -com.sun.javadoc -com.sun.jdi -com.sun.jdi.connect -com.sun.jdi.connect.spi -com.sun.jdi.event -com.sun.jdi.request -com.sun.management -com.sun.net.httpserver -com.sun.net.httpserver.spi -com.sun.nio.sctp -com.sun.security.auth -com.sun.security.auth.callback -com.sun.security.auth.login -com.sun.security.auth.module -com.sun.security.jgss -com.sun.source.doctree -com.sun.source.tree -com.sun.source.util -com.sun.tools.attach -com.sun.tools.attach.spi -com.sun.tools.doclets -com.sun.tools.doclets.standard -com.sun.tools.javac -com.sun.tools.javadoc -com.sun.tools.jconsole -java.applet -java.awt -java.awt.color -java.awt.datatransfer -java.awt.desktop -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -java.io -java.lang -java.lang.annotation -java.lang.instrument -java.lang.invoke -java.lang.management -java.lang.module -java.lang.ref -java.lang.reflect -java.math -java.net -java.net.spi -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.nio.file -java.nio.file.attribute -java.nio.file.spi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.sql -java.text -java.text.spi -java.time -java.time.chrono -java.time.format -java.time.temporal -java.time.zone -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.function -java.util.jar -java.util.logging -java.util.prefs -java.util.regex -java.util.spi -java.util.stream -java.util.zip -javafx.animation -javafx.application -javafx.beans -javafx.beans.binding -javafx.beans.property -javafx.beans.property.adapter -javafx.beans.value -javafx.collections -javafx.collections.transformation -javafx.concurrent -javafx.css -javafx.css.converter -javafx.embed.swing -javafx.event -javafx.fxml -javafx.geometry -javafx.print -javafx.scene -javafx.scene.canvas -javafx.scene.chart -javafx.scene.control -javafx.scene.control.cell -javafx.scene.control.skin -javafx.scene.effect -javafx.scene.image -javafx.scene.input -javafx.scene.layout -javafx.scene.media -javafx.scene.paint -javafx.scene.shape -javafx.scene.text -javafx.scene.transform -javafx.scene.web -javafx.stage -javafx.util -javafx.util.converter -javax.accessibility -javax.activation -javax.activity -javax.annotation -javax.annotation.processing -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.plugins.tiff -javax.imageio.spi -javax.imageio.stream -javax.jnlp -javax.jws -javax.jws.soap -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.remote.rmi -javax.management.timer -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -javax.net -javax.net.ssl -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.rmi -javax.rmi.CORBA -javax.rmi.ssl -javax.script -javax.security.auth -javax.security.auth.callback -javax.security.auth.kerberos -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.security.sasl -javax.smartcardio -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.sql -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.nimbus -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -javax.tools -javax.transaction -javax.transaction.xa -javax.xml -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.catalog -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.soap -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.spi.http -javax.xml.ws.wsaddressing -javax.xml.xpath -jdk.dynalink -jdk.dynalink.beans -jdk.dynalink.linker -jdk.dynalink.linker.support -jdk.dynalink.support -jdk.incubator.http -jdk.javadoc.doclet -jdk.jfr -jdk.jfr.consumer -jdk.jshell -jdk.jshell.execution -jdk.jshell.spi -jdk.jshell.tool -jdk.management.cmm -jdk.management.jfr -jdk.management.resource -jdk.nashorn.api.scripting -jdk.nashorn.api.tree -jdk.net -jdk.packager.services -jdk.security.jarsigner -netscape.javascript -org.ietf.jgss -org.omg.CORBA -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.portable -org.omg.CORBA.TypeCodePackage -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.portable -org.omg.PortableServer.ServantLocatorPackage -org.omg.SendingContext -org.omg.stub.java.rmi -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.css -org.w3c.dom.events -org.w3c.dom.html -org.w3c.dom.ls -org.w3c.dom.ranges -org.w3c.dom.stylesheets -org.w3c.dom.traversal -org.w3c.dom.views -org.w3c.dom.xpath -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers From 5be834ba330d4e34bd69e539f8547edbf755dae2 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Thu, 17 Sep 2020 14:11:45 +0200 Subject: [PATCH 3/5] Generating current release list for javadoc; using hardcoded lists for versions < 11 --- .../tools/symbolgenerator/CreateSymbols.java | 68 ++-- .../symbolgenerator/JavadocElementList.java | 136 ++++++++ make/modules/jdk.javadoc/Gendata.gmk | 16 +- .../resources/releases/element-list-10.txt | 314 +++++++++++++++++ .../resources/releases/package-list-7.txt | 209 ++++++++++++ .../resources/releases/package-list-8.txt | 217 ++++++++++++ .../resources/releases/package-list-9.txt | 315 ++++++++++++++++++ 7 files changed, 1235 insertions(+), 40 deletions(-) create mode 100644 make/langtools/src/classes/build/tools/symbolgenerator/JavadocElementList.java create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java index 219b3129b914e..42cad61852d4f 100644 --- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java +++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java @@ -3825,7 +3825,8 @@ private static AnnotationDescription parseAnnotation(String value, int[] valuePo * {@code ctDescriptionFile}, using the file as a recipe to create the sigfiles. */ @SuppressWarnings("unchecked") - public void createJavadocData(String ctDescriptionFileExtra, String ctDescriptionFile, String targetDir) throws IOException { + public void createJavadocData(String ctDescriptionFileExtra, String ctDescriptionFile, + String targetDir, int startVersion) throws IOException { LoadDescriptions data = load(ctDescriptionFileExtra != null ? Paths.get(ctDescriptionFileExtra) : null, Paths.get(ctDescriptionFile)); @@ -3834,39 +3835,27 @@ public void createJavadocData(String ctDescriptionFileExtra, String ctDescriptio for (PlatformInput version : data.versions) { int versionNumber = Integer.parseInt(version.version, Character.MAX_RADIX); - if (versionNumber <= 8) { - Path outputFile = target.resolve("package-list-" + versionNumber + ".txt"); - Files.createDirectories(outputFile.getParent()); - try (Writer w = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) { - Set packages = data.classes.classes.stream().filter(cd -> cd.header.stream().anyMatch(h -> h.versions.contains(version.version))).map(cd -> { - int lastSlash = cd.name.lastIndexOf("/"); - return cd.name.substring(0, lastSlash).replace('/', '.'); - }).collect(Collectors.toCollection(() -> new TreeSet<>())); - for (String pack : packages) { - w.write(pack); - w.write("\n"); + if (versionNumber < startVersion) { + continue; + } + Path outputFile = target.resolve("element-list-" + versionNumber + ".txt"); + Files.createDirectories(outputFile.getParent()); + try (Writer w = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) { + Set modules = new TreeSet<>((m1, m2) -> m1.name.compareTo(m2.name)); + modules.addAll(data.modules.values()); + for (ModuleDescription module : modules) { + if ("jdk.unsupported".equals(module.name)) { + continue; } - } - } else { - Path outputFile = target.resolve("element-list-" + versionNumber + ".txt"); - Files.createDirectories(outputFile.getParent()); - try (Writer w = Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8)) { - Set modules = new TreeSet<>((m1, m2) -> m1.name.compareTo(m2.name)); - modules.addAll(data.modules.values()); - for (ModuleDescription module : modules) { - if ("jdk.unsupported".equals(module.name)) { - continue; - } - Optional header = module.header.stream().filter(h -> h.versions.contains(version.version)).findAny(); - if (header.isEmpty()) { - continue; - } - w.write("module:" + module.name); + Optional header = module.header.stream().filter(h -> h.versions.contains(version.version)).findAny(); + if (header.isEmpty()) { + continue; + } + w.write("module:" + module.name); + w.write("\n"); + for (String pack : header.get().exports) { + w.write(pack.replace('/', '.')); w.write("\n"); - for (String pack : header.get().exports) { - w.write(pack.replace('/', '.')); - w.write("\n"); - } } } } @@ -3997,23 +3986,32 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce String ctDescriptionFileExtra; String ctDescriptionFile; String targetDir; + int startVersion; - if (args.length == 3) { + if (args.length == 4) { ctDescriptionFileExtra = null; ctDescriptionFile = args[1]; targetDir = args[2]; - } else if (args.length == 4) { + startVersion = Integer.parseInt(args[3]); + } else if (args.length == 5) { ctDescriptionFileExtra = args[1]; ctDescriptionFile = args[2]; targetDir = args[3]; + startVersion = Integer.parseInt(args[4]); } else { help(); return ; } + if (startVersion < 9) { + System.err.println("The start version must be at least 9!"); + return ; + } + new CreateSymbols().createJavadocData(ctDescriptionFileExtra, ctDescriptionFile, - targetDir); + targetDir, + startVersion); break; } } diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/JavadocElementList.java b/make/langtools/src/classes/build/tools/symbolgenerator/JavadocElementList.java new file mode 100644 index 0000000000000..dd2e20b6df20b --- /dev/null +++ b/make/langtools/src/classes/build/tools/symbolgenerator/JavadocElementList.java @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2017, 2018, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.symbolgenerator; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayDeque; +import java.util.Arrays; +import java.util.Deque; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.lang.model.element.ModuleElement.ExportsDirective; +import javax.lang.model.util.Elements; +import javax.tools.JavaCompiler; + +import com.sun.tools.javac.api.JavacTaskImpl; +import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.code.Source; +import com.sun.tools.javac.code.Symbol.ModuleSymbol; +import com.sun.tools.javac.jvm.Target; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.TreeSet; +import javax.lang.model.element.ModuleElement; + +/** + * Generate list of modules and packages in the current release. + * Used by the javadoc tool. + */ +public class JavadocElementList { + + private static void help() { + System.err.println("java JavadocElementList "); + } + + public static void main(String... args) throws IOException { + if (args.length < 2) { + help(); + return ; + } + + JavaCompiler compiler = JavacTool.create(); + List options = List.of("-source", Source.DEFAULT.name, + "-target", Target.DEFAULT.name, + "-proc:only", + "--system", "none", + "--module-source-path", args[1], + "--add-modules", Arrays.stream(args) + .skip(2) + .collect(Collectors.joining(","))); + List jlObjectList = List.of("java.lang.Object"); + JavacTaskImpl task = (JavacTaskImpl) compiler.getTask(null, null, null, options, jlObjectList, null); + task.enter(); + Elements elements = task.getElements(); + Deque todo = new ArrayDeque<>(); + Arrays.stream(args).skip(2).forEach(todo::add); + + todo.add("java.base"); + + Map> modulesAndExports = new TreeMap<>(); + + while (!todo.isEmpty()) { + String current = todo.removeFirst(); + + if (modulesAndExports.containsKey(current)) + continue; + + ModuleSymbol mod = (ModuleSymbol) elements.getModuleElement(current); + + if (mod == null) { + throw new IllegalStateException("Missing: " + current); + } + + //use the internal structure to avoid unnecesarily completing the symbol using the UsesProvidesVisitor: + modulesAndExports.put(mod.getQualifiedName().toString(), + mod.exports + .stream() + .filter((ExportsDirective ed) -> ed.getTargetModules() == null) + .map((ExportsDirective ed) -> ed.getPackage().getQualifiedName().toString()) + .collect(Collectors.toCollection(() -> new TreeSet<>())) + ); + for (ModuleElement.RequiresDirective rd : mod.requires) { + if (rd.isTransitive()) { + todo.offerLast(rd.getDependency().getQualifiedName().toString()); + } + } + } + + Path targetFile = Paths.get(args[0]); + + Files.createDirectories(targetFile.getParent()); + + try (Writer w = Files.newBufferedWriter(targetFile); + PrintWriter out = new PrintWriter(w)) { + for (Entry> moduleAndExports : modulesAndExports.entrySet()) { + out.write("module:" + moduleAndExports.getKey()); + out.write("\n"); + for (String pack : moduleAndExports.getValue()) { + out.write(pack); + out.write("\n"); + } + } + } + } + +} diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk index 81f8642315df8..5b4485808c7ca 100644 --- a/make/modules/jdk.javadoc/Gendata.gmk +++ b/make/modules/jdk.javadoc/Gendata.gmk @@ -23,7 +23,6 @@ # questions. # -include JarArchive.gmk include JavaCompilation.gmk include Modules.gmk @@ -35,11 +34,10 @@ $(eval $(call IncludeCustomExtension, modules/jdk.javadoc/Gendata.gmk)) # This is needed to properly setup DOCS_MODULES. $(eval $(call ReadImportMetaData)) -# Modules that should be visible for 9 - the documented modules: -CT_MODULES := $(DOCS_MODULES) +JAVADOC_MODULES := $(DOCS_MODULES) # Get the complete module source path: -CT_MODULESOURCEPATH := $(call GetModuleSrcPath) +JAVADOC_MODULESOURCEPATH := $(call GetModuleSrcPath) CT_DATA_DESCRIPTION += $(TOPDIR)/make/data/symbols/symbols @@ -77,7 +75,15 @@ $(SUPPORT_OUTPUTDIR)/javadoc-symbols/symbols: \ build.tools.symbolgenerator.CreateSymbols \ build-javadoc-data \ $(CT_DATA_DESCRIPTION) \ - $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases + $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases \ + 11 + $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \ + $(COMPILECREATESYMBOLS_ADD_EXPORTS) \ + -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \ + build.tools.symbolgenerator.JavadocElementList \ + $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-$(JDK_SOURCE_TARGET_VERSION).txt \ + $(JAVADOC_MODULESOURCEPATH) \ + $(JAVADOC_MODULES) $(TOUCH) $@ # Copy ct.sym to the modules libs dir diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt new file mode 100644 index 0000000000000..16518f6620ea2 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-10.txt @@ -0,0 +1,314 @@ +javax.activation +java.io +java.lang +java.lang.annotation +java.lang.invoke +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.net +javax.net.ssl +javax.security.auth +javax.security.auth.callback +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.annotation.processing +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.tools +javax.activity +javax.rmi +javax.rmi.CORBA +org.omg.CORBA +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.portable +org.omg.CORBA.TypeCodePackage +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.portable +org.omg.PortableServer.ServantLocatorPackage +org.omg.SendingContext +org.omg.stub.java.rmi +java.awt.datatransfer +java.applet +java.awt +java.awt.color +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +javax.accessibility +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +java.lang.instrument +javax.jnlp +java.util.logging +java.lang.management +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.timer +javax.management.remote.rmi +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +java.util.prefs +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +javax.rmi.ssl +javax.script +javax.security.auth.kerberos +org.ietf.jgss +javax.security.sasl +javax.smartcardio +java.sql +javax.sql +javax.transaction.xa +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.transaction +javax.xml +javax.xml.catalog +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.xpath +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.traversal +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.jws +javax.jws.soap +javax.xml.soap +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.annotation +javafx.beans +javafx.beans.binding +javafx.beans.property +javafx.beans.property.adapter +javafx.beans.value +javafx.collections +javafx.collections.transformation +javafx.event +javafx.util +javafx.util.converter +javafx.scene.chart +javafx.scene.control +javafx.scene.control.cell +javafx.scene.control.skin +javafx.fxml +javafx.animation +javafx.application +javafx.concurrent +javafx.css +javafx.css.converter +javafx.geometry +javafx.print +javafx.scene +javafx.scene.canvas +javafx.scene.effect +javafx.scene.image +javafx.scene.input +javafx.scene.layout +javafx.scene.paint +javafx.scene.shape +javafx.scene.text +javafx.scene.transform +javafx.stage +javafx.scene.media +javafx.embed.swing +javafx.scene.web +com.sun.java.accessibility.util +com.sun.tools.attach +com.sun.tools.attach.spi +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.javac +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +com.sun.net.httpserver +com.sun.net.httpserver.spi +jdk.incubator.http +com.sun.jarsigner +jdk.security.jarsigner +com.sun.javadoc +com.sun.tools.javadoc +jdk.javadoc.doclet +com.sun.tools.jconsole +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +jdk.jfr +jdk.jfr.consumer +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +netscape.javascript +com.sun.management +jdk.management.cmm +jdk.management.jfr +jdk.management.resource +jdk.net +jdk.packager.services +jdk.packager.services.singleton +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +com.sun.nio.sctp +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +com.sun.security.jgss +org.w3c.dom.css +org.w3c.dom.html +org.w3c.dom.stylesheets +org.w3c.dom.xpath diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt new file mode 100644 index 0000000000000..b52fe94b6a106 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-7.txt @@ -0,0 +1,209 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt new file mode 100644 index 0000000000000..351c186855942 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-8.txt @@ -0,0 +1,217 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.w3c.dom.views +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt new file mode 100644 index 0000000000000..24c17a899bb91 --- /dev/null +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/releases/package-list-9.txt @@ -0,0 +1,315 @@ +com.sun.jarsigner +com.sun.java.accessibility.util +com.sun.javadoc +com.sun.jdi +com.sun.jdi.connect +com.sun.jdi.connect.spi +com.sun.jdi.event +com.sun.jdi.request +com.sun.management +com.sun.net.httpserver +com.sun.net.httpserver.spi +com.sun.nio.sctp +com.sun.security.auth +com.sun.security.auth.callback +com.sun.security.auth.login +com.sun.security.auth.module +com.sun.security.jgss +com.sun.source.doctree +com.sun.source.tree +com.sun.source.util +com.sun.tools.attach +com.sun.tools.attach.spi +com.sun.tools.doclets +com.sun.tools.doclets.standard +com.sun.tools.javac +com.sun.tools.javadoc +com.sun.tools.jconsole +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.desktop +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.module +java.lang.ref +java.lang.reflect +java.math +java.net +java.net.spi +java.nio +java.nio.channels +java.nio.channels.spi +java.nio.charset +java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi +java.rmi +java.rmi.activation +java.rmi.dgc +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.time +java.time.chrono +java.time.format +java.time.temporal +java.time.zone +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.function +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.stream +java.util.zip +javafx.animation +javafx.application +javafx.beans +javafx.beans.binding +javafx.beans.property +javafx.beans.property.adapter +javafx.beans.value +javafx.collections +javafx.collections.transformation +javafx.concurrent +javafx.css +javafx.css.converter +javafx.embed.swing +javafx.event +javafx.fxml +javafx.geometry +javafx.print +javafx.scene +javafx.scene.canvas +javafx.scene.chart +javafx.scene.control +javafx.scene.control.cell +javafx.scene.control.skin +javafx.scene.effect +javafx.scene.image +javafx.scene.input +javafx.scene.layout +javafx.scene.media +javafx.scene.paint +javafx.scene.shape +javafx.scene.text +javafx.scene.transform +javafx.scene.web +javafx.stage +javafx.util +javafx.util.converter +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.plugins.tiff +javax.imageio.spi +javax.imageio.stream +javax.jnlp +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.smartcardio +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +javax.swing.plaf +javax.swing.plaf.basic +javax.swing.plaf.metal +javax.swing.plaf.multi +javax.swing.plaf.nimbus +javax.swing.plaf.synth +javax.swing.table +javax.swing.text +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.catalog +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +javax.xml.ws.handler.soap +javax.xml.ws.http +javax.xml.ws.soap +javax.xml.ws.spi +javax.xml.ws.spi.http +javax.xml.ws.wsaddressing +javax.xml.xpath +jdk.dynalink +jdk.dynalink.beans +jdk.dynalink.linker +jdk.dynalink.linker.support +jdk.dynalink.support +jdk.incubator.http +jdk.javadoc.doclet +jdk.jfr +jdk.jfr.consumer +jdk.jshell +jdk.jshell.execution +jdk.jshell.spi +jdk.jshell.tool +jdk.management.cmm +jdk.management.jfr +jdk.management.resource +jdk.nashorn.api.scripting +jdk.nashorn.api.tree +jdk.net +jdk.packager.services +jdk.security.jarsigner +netscape.javascript +org.ietf.jgss +org.omg.CORBA +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.portable +org.omg.CORBA.TypeCodePackage +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.portable +org.omg.PortableServer.ServantLocatorPackage +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.css +org.w3c.dom.events +org.w3c.dom.html +org.w3c.dom.ls +org.w3c.dom.ranges +org.w3c.dom.stylesheets +org.w3c.dom.traversal +org.w3c.dom.views +org.w3c.dom.xpath +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers From 6009dd7077d25bbae2bf89ba3e892dede63b780c Mon Sep 17 00:00:00 2001 From: Hannes Wallnoefer Date: Wed, 23 Sep 2020 12:30:58 +0200 Subject: [PATCH 4/5] Rename --no-platform-link option plus minor cleanup --- .../html/resources/standard.properties | 8 ++++---- .../doclets/toolkit/BaseConfiguration.java | 2 +- .../internal/doclets/toolkit/BaseOptions.java | 20 +++++++++---------- .../internal/doclets/toolkit/util/Extern.java | 2 +- .../TestAnnotationTypes.java | 4 ++-- .../TestClassCrossReferences.java | 4 ++-- .../doclet/testClassLinks/TestClassLinks.java | 2 +- .../doclet/testClassTree/TestClassTree.java | 2 +- .../TestDeprecatedDocs.java | 2 +- .../TestGrandParentTypes.java | 2 +- .../doclet/testHeadings/TestHeadings.java | 2 +- .../TestHtmlDefinitionListTag.java | 8 ++++---- .../doclet/testHtmlTag/TestHtmlTag.java | 2 +- .../testIndentation/TestIndentation.java | 2 +- .../doclet/testInterface/TestInterface.java | 2 +- .../javadoc/doclet/testJavaFX/TestJavaFX.java | 4 ++-- .../doclet/testLinkOption/TestLinkOption.java | 4 ++-- .../TestMemberInheritance.java | 4 ++-- .../TestMethodSignature.java | 2 +- .../doclet/testModules/TestModules.java | 8 ++++---- .../TestNewLanguageFeatures.java | 2 +- .../doclet/testOptions/TestOptions.java | 2 +- .../doclet/testOrdering/TestOrdering.java | 2 +- .../TestOverriddenDeprecatedMethods.java | 2 +- .../TestOverrideMethods.java | 2 +- .../TestPackageAnnotation.java | 4 ++-- .../TestPrivateClasses.java | 4 ++-- .../doclet/testProperty/TestProperty.java | 2 +- .../testRecordTypes/TestRecordTypes.java | 4 ++-- .../testSealedTypes/TestSealedTypes.java | 12 +++++------ .../javadoc/doclet/testSeeTag/TestSeeTag.java | 2 +- .../TestSerializedForm.java | 4 ++-- .../TestSerializedFormDeprecationInfo.java | 4 ++-- .../TestSerializedFormWithClassFile.java | 2 +- .../TestTypeAnnotations.java | 2 +- .../testTypeParams/TestTypeParameters.java | 4 ++-- .../TestTypeVariableLinks.java | 2 +- .../TestVisibleMembers.java | 4 ++-- 38 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties index 1a1dd626c6c75..dd54a68b1de70 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties @@ -347,7 +347,7 @@ doclet.usage.link-platform-properties.description=\ Link to platform documentation URLs declared in properties file at doclet.usage.excludedocfilessubdir.parameters=\ - :.. + :... doclet.usage.excludedocfilessubdir.description=\ Exclude any doc-files subdirectories with given name @@ -363,7 +363,7 @@ doclet.usage.nodeprecated.description=\ Do not include @deprecated information doclet.usage.noqualifier.parameters=\ - ::.. + ::... doclet.usage.noqualifier.description=\ Exclude the list of qualifiers from the output @@ -380,8 +380,8 @@ doclet.usage.no-module-directories.description=\ Do not group files for module documentation into \n\ module-specific directories -doclet.usage.no-platform-link.description=\ - Do not generate links to platform documentation +doclet.usage.no-platform-links.description=\ + Do not generate links to the platform documentation doclet.usage.notree.description=\ Do not generate class hierarchy diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java index d2795bd6f5ad8..433fad84e397b 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java @@ -358,7 +358,7 @@ protected boolean finishOptionSettings0() throws DocletException { for (Pair linkOfflinePair : options.linkOfflineList()) { extern.link(linkOfflinePair.first, linkOfflinePair.second, reporter); } - if (!options.noPlatformLink()) { + if (!options.noPlatformLinks()) { extern.checkPlatformLinks(options.linkPlatformProperties(), reporter); } typeElementCatalog = new TypeElementCatalog(includedTypeElements, this); diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java index d6f0e2e9a134e..cf62bf1756518 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java @@ -191,11 +191,11 @@ public abstract class BaseOptions { private boolean noDeprecated = false; /** - * Argument for command-line option {@code --no-platform-link}. - * True if command-line option "--no-platform-link" is used. Default value is + * Argument for command-line option {@code --no-platform-links}. + * True if command-line option "--no-platform-links" is used. Default value is * false. */ - private boolean noPlatformLink = false; + private boolean noPlatformLinks = false; /** * Argument for command-line option {@code -nosince}. @@ -432,10 +432,10 @@ public boolean process(String opt, List args) { } }, - new Option(resources, "--no-platform-link") { + new Option(resources, "--no-platform-links") { @Override public boolean process(String opt, List args) { - noPlatformLink = true; + noPlatformLinks = true; return true; } }, @@ -785,7 +785,7 @@ List> linkOfflineList() { } /** - * Argument for command-line option {@ --link-platform-properties}. + * Argument for command-line option {@code --link-platform-properties}. */ String linkPlatformProperties() { return linkPlatformProperties; @@ -819,12 +819,12 @@ public boolean noDeprecated() { } /** - * Argument for command-line option {@code --no-platform-link}. - * True if command-line option {@code --no-platform-link"} is used. + * Argument for command-line option {@code --no-platform-links}. + * True if command-line option {@code --no-platform-links"} is used. * Default value is false. */ - public boolean noPlatformLink() { - return noPlatformLink; + public boolean noPlatformLinks() { + return noPlatformLinks; } /** diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java index a24b96727db46..19b1e8483d831 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java @@ -233,7 +233,7 @@ public boolean link(String url, String elemlisturl, Reporter reporter) throws Do * * @param linkPlatformProperties path or URL to properties file containing * platform documentation URLs, or null - * @param reporter The {@code DocErrorReporter} used to report errors. + * @param reporter the {@code DocErrorReporter} used to report errors */ public void checkPlatformLinks(String linkPlatformProperties, Reporter reporter) { PackageElement javaLang = utils.elementUtils.getPackageElement("java.lang"); diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java index ce8d995a307d4..b75b174af1227 100644 --- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java @@ -46,7 +46,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out-1", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "pkg"); checkExit(Exit.OK); @@ -109,7 +109,7 @@ public void test() { public void testLinkSource() { javadoc("-d", "out-2", "-linksource", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java index 63282cd961f22..c5145c148d7a8 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java +++ b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java @@ -50,7 +50,7 @@ public void test() { "-Xdoclint:none", "-sourcepath", testSrc, "-linkoffline", uri, testSrc, - "--no-platform-link", + "--no-platform-links", testSrc("C.java")); checkExit(Exit.OK); @@ -83,7 +83,7 @@ public void test_warning() { "-Xdoclint:none", "-sourcepath", testSrc, "-linkoffline", uri, testSrc, - "--no-platform-link", + "--no-platform-links", testSrc("C.java")); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java index e0ec523292512..a18cf46229271 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java @@ -46,7 +46,7 @@ public void test() { javadoc("-d", "out", "-Xdoclint:none", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "-package", "p"); diff --git a/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java index 0300710e4d601..e9264b3888811 100644 --- a/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java +++ b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java @@ -46,7 +46,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java index fde4f0cf35ad3..87279039754fa 100644 --- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java +++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java @@ -44,7 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java b/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java index 5c14f909c88cc..3d20cf8a95bce 100644 --- a/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testGrandParentTypes/TestGrandParentTypes.java @@ -44,7 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test1() { javadoc("-d", "out-1", - "--no-platform-link", + "--no-platform-links", "-package", "-sourcepath", testSrc, "pkg1"); diff --git a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java index 1da919cb9bb48..3ab17f9e12a1e 100644 --- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java +++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java @@ -45,7 +45,7 @@ public static void main(String... args) throws Exception { public void test() { javadoc("-d", "out", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "-use", "-header", "Test Files", "pkg1", "pkg2"); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java index 64d57cce0fa3f..4b884752d914b 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java @@ -49,7 +49,7 @@ public static void main(String... args) throws Exception { public void test_Comment_Deprecated() { javadoc("-Xdoclint:none", "-d", "out-1", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -62,7 +62,7 @@ public void test_NoComment_Deprecated() { javadoc("-Xdoclint:none", "-d", "out-2", "-nocomment", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -75,7 +75,7 @@ public void test_Comment_NoDeprecated() { javadoc("-Xdoclint:none", "-d", "out-3", "-nodeprecated", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); @@ -90,7 +90,7 @@ public void testNoCommentNoDeprecated() { "-d", "out-4", "-nocomment", "-nodeprecated", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg1"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java index b92b7d71dda8d..ac9452962ffc6 100644 --- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java +++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java @@ -101,7 +101,7 @@ public void test_en_US() { @Test public void test_other() { javadoc("-locale", "en_US", - "--no-platform-link", + "--no-platform-links", "-d", "out-other", "-sourcepath", testSrc, "pkg3"); diff --git a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java index 4447e483437f6..a2eb692678258 100644 --- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java +++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java @@ -43,7 +43,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "p"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java index 8c768716e3223..833d737e9758b 100644 --- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java +++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java @@ -61,7 +61,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java index a956559f6c124..fa37b9996d563 100644 --- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java +++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java @@ -234,7 +234,7 @@ public void test2() { "-sourcepath", testSrc, "-javafx", "--disable-javafx-strict-checks", - "--no-platform-link", + "--no-platform-links", "-package", "pkg2"); checkExit(Exit.OK); @@ -298,7 +298,7 @@ public void test2() { public void test3() { javadoc("-d", "out2b", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "-package", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java index 1b5be0927b69c..0487373cd9aad 100644 --- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java +++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java @@ -150,7 +150,7 @@ Resource Identifiers (URI): Generic Syntax,
,
types) throws IOException { javadoc("-d", dir.resolve("out").toString(), "-quiet", "-noindex", - "--no-platform-link", + "--no-platform-links", "-sourcepath", src.toString(), "-private", "--enable-preview", "--source", thisRelease, diff --git a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java index 155d47ac8ae95..5e0b5c4e1145e 100644 --- a/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java +++ b/test/langtools/jdk/javadoc/doclet/testSealedTypes/TestSealedTypes.java @@ -167,7 +167,7 @@ public void testSinglePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -189,7 +189,7 @@ public void testMultiplePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -213,7 +213,7 @@ public void testPartialMultiplePermits(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -263,7 +263,7 @@ public void testPartialMultiplePermitsWithSubtypes2(Path base) throws IOExceptio javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); @@ -287,7 +287,7 @@ public void testImplicitPermitsAuxiliary(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "-package", "--enable-preview", "--source", thisRelease, "p"); @@ -313,7 +313,7 @@ public void testImplicitPermitsNested(Path base) throws IOException { javadoc("-d", base.resolve("out").toString(), "--source-path", src.toString(), - "--no-platform-link", + "--no-platform-links", "--enable-preview", "--source", thisRelease, "p"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java index 527cc535fb1e2..ae46e7939c1be 100644 --- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java +++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java @@ -72,7 +72,7 @@ public void test() { public void testBadReference() { javadoc("-d", "out-badref", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "badref"); checkExit(Exit.ERROR); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java index 06abf5ae65a8f..6d195fe595f86 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java @@ -115,7 +115,7 @@ public void testPrivate() { javadoc("-private", "-d", "out-private", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", testSrc("SerializedForm.java"), testSrc("ExternalizedForm.java"), "pkg1"); checkExit(Exit.OK); @@ -167,7 +167,7 @@ public void test2() { javadoc("-private", "-d", "out-2", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "pkg2"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java index ae423d404267d..90994592ae4e1 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java @@ -44,7 +44,7 @@ public static void main(String... args) throws Exception { public void testDefault() { javadoc("-d", "out-default", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "pkg1"); checkExit(Exit.OK); @@ -69,7 +69,7 @@ public void testNoDeprecated() { javadoc("-d", "out-nodepr", "-nodeprecated", "-sourcepath", testSrc, - "--no-platform-link", + "--no-platform-links", "pkg1"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java index 44fe7a02e23e7..14cc5c251dd3d 100644 --- a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java +++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java @@ -66,7 +66,7 @@ public void test(Path base) throws Exception { Path outDir = base.resolve("out"); javadoc("-d", outDir.toString(), "-linksource", - "--no-platform-link", + "--no-platform-links", "-classpath", base.resolve("classes").toString(), "-sourcepath", "", srcDir.resolve("B.java").toString()); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java index 2cef5e5328c1c..2990e2aa1a702 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java @@ -44,7 +44,7 @@ public static void main(String... args) throws Exception { @Test public void test() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "-private", "typeannos"); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java index cf757298a2a9c..b28bdf241c48f 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java @@ -48,7 +48,7 @@ public static void main(String... args) throws Exception { public void test1() { javadoc("-d", "out-1", "-use", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); @@ -81,7 +81,7 @@ public void test1() { public void test2() { javadoc("-d", "out-2", "-linksource", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "pkg"); checkExit(Exit.OK); diff --git a/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java index 47e787d2b8ae8..913f2d3ae9861 100644 --- a/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java +++ b/test/langtools/jdk/javadoc/doclet/testTypeVariableLinks/TestTypeVariableLinks.java @@ -43,7 +43,7 @@ public static void main(String... args) throws Exception { @Test public void test1() { javadoc("-d", "out", - "--no-platform-link", + "--no-platform-links", "-sourcepath", testSrc, "-package", "pkg1"); diff --git a/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java b/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java index d87b6649fa9aa..1280388146947 100644 --- a/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java +++ b/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java @@ -266,7 +266,7 @@ public void testStreamsMissingLinksDetail(Path base) throws Exception { javadoc("-d", outDir.toString(), "-html5", "--override-methods=detail", - "--no-platform-link", + "--no-platform-links", "-sourcepath", srcDir.toString(), "p"); checkExit(Exit.OK); @@ -302,7 +302,7 @@ public void testStreamsMissingLinksSummary(Path base) throws Exception { javadoc("-d", outDir.toString(), "-html5", "--override-methods=summary", - "--no-platform-link", + "--no-platform-links", "-sourcepath", srcDir.toString(), "p"); checkExit(Exit.OK); From 991daef5e9529eb993da98c9fbf3f6b236d5178f Mon Sep 17 00:00:00 2001 From: Hannes Wallnoefer Date: Wed, 7 Oct 2020 14:30:02 +0200 Subject: [PATCH 5/5] Fix test failure --- test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java b/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java index 8cc50456b8cf2..4f116ab7ce914 100644 --- a/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java +++ b/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java @@ -68,6 +68,7 @@ public interface C { """); javadoc("-d", base.resolve("out").toString(), + "--no-platform-links", src.resolve("C.java").toString()); checkExit(Exit.OK);