diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 3549b0814d6..f794eb60294 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -687,6 +687,16 @@
a
Implementation Requirements:
+
+ category
+ a
+ Category:
+
+
+ provisional
+ a
+ Provisional:
+
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
deleted file mode 100644
index 3a35525fe51..00000000000
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${fileList}
${dirList}
-
- org.eclipse.jdt.doc.isv/buildDoc.xml - generateJavadoc:
- Using java home: ${java.home} and javadocExecutable: ${javadocExecutable}
-
-${basedir}/${replaceFile} before _* expansion:
-
-
-
-
-
-
-
-
-
-
-${basedir}/${replaceFile} after _* expansion:
-
-
-
-
- dummyForBug402392=dummyForBug402392
-
-
-
-
-${basedir}/${optionsFile} after _* expansion:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-target/doc.bin.log after javadoc execution
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
index 2958657de2f..3680748a823 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -115,106 +115,159 @@
org.eclipse.update.configurator
0.0.0
+
+ eclipse-plugin
+ org.eclipse.platform.doc.isv
+ 0.0.0
+
- org.eclipse.tycho.extras
- tycho-document-bundle-plugin
-
-
- schema-to-html
- process-resources
-
- schema-to-html
-
-
-
- ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.apt.core/plugin.xml
- ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.core/plugin.xml
- ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/plugin.xml
- ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug/plugin.xml
- ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/plugin.xml
- ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit/plugin.xml
- ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/plugin.xml
- ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.launching/plugin.xml
- ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.ui/plugin.xml
-
- ${basedir}/reference/extension-points
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
+ org.eclipse.tycho.extras
+ tycho-document-bundle-plugin
+
+
+ schema-to-html
+ process-resources
+
+ schema-to-html
+
+
+
+ ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.apt.core/plugin.xml
+ ${basedir}/${eclipse.jdt.core}/org.eclipse.jdt.core/plugin.xml
+ ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/plugin.xml
+ ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug/plugin.xml
+ ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/plugin.xml
+ ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit/plugin.xml
+ ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/plugin.xml
+ ${basedir}/${eclipse.jdt.debug}/org.eclipse.jdt.launching/plugin.xml
+ ${basedir}/${eclipse.jdt.ui}/org.eclipse.jdt.ui/plugin.xml
+
+ ${basedir}/reference/extension-points
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ unpack-platform-doc
+ process-resources
+
+ unpack-dependencies
+
+
+ org.eclipse.platform.doc.isv
+ ${project.build.directory}/unpack/org.eclipse.platform.doc.isv/reference/api
+
+
+
- org.eclipse.tycho.extras
- tycho-eclipserun-plugin
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+ prepare-package
+
+ javadoc
+
+
+ true
+ *.internal.*:*.internal
+ Eclipse JDT API Specification
+ Eclipse JDT API Specification
+ Eclipse JDT
${releaseName} (${releaseNumberSDK})]]>
+ Copyright (c) 2000, 2023 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.]]>
+ ${eclipse.jdt.core}/org.eclipse.jdt.annotation/src
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core.compiler.batch/src
+ ;${eclipse.jdt.core}/org.eclipse.jdt.apt.core/src
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/antadapter
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/codeassist
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/compiler
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/dom
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/eval
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/formatter
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/model
+ ;${eclipse.jdt.core}/org.eclipse.jdt.core/search
+ ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/eval
+ ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/jdi
+ ;${eclipse.jdt.debug}/org.eclipse.jdt.debug/model
+ ;${eclipse.jdt.debug}/org.eclipse.jdt.debug.ui/ui
+ ;${eclipse.jdt.debug}/org.eclipse.jdt.launching/launching
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/common
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.core.manipulation/refactoring
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.junit/src
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.junit.core/src
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.junit.runtime/src
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.junit4.runtime/src
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.junit5.runtime/src
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core extension
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/core refactoring
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/internal compatibility
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui
+ ;${eclipse.jdt.ui}/org.eclipse.jdt.ui/ui refactoring
+ ;${eclipse.platform.ant}/org.eclipse.ant.launching/src
+ ;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Editor
+ ;${eclipse.platform.ant}/org.eclipse.ant.ui/Ant Tools Support
+
+
+
+ Java development tools core packages
+ org.eclipse.jdt.core;org.eclipse.jdt.core.*
+
+
+ Java development tools UI packages
+ org.eclipse.jdt.ui;org.eclipse.jdt.ui.*
+
+
+ Java development tools APT packages
+ org.eclipse.jdt.apt.core;org.eclipse.jdt.apt.core.*;com.sun.mirror.*
+
+
+ Java development tools debug and launching packages
+ org.eclipse.ant.launching;org.eclipse.ant.ui.launching;org.eclipse.jdt.debug.*;org.eclipse.jdt.launching;org.eclipse.jdt.launching.*
+
+
+ Java development tools JUnit packages
+ org.eclipse.jdt.junit;org.eclipse.jdt.junit.*
+
+
+
+
+
+ ./../../../org.eclipse.platform.doc.isv/reference/api
+ ${project.build.directory}/unpack/org.eclipse.platform.doc.isv
+
+
+
+
+
+
+
+ maven-resources-plugin
- dont_skip_me
- compile
-
- false
-
-
- -consolelog
- -debug
- -data
- target/workspace
- -application
- org.eclipse.ant.core.antRunner
- -buildfile
- buildDoc.xml
- -Dbasedir.properties=cbi_basedirs.properties
- -Declipse.javadoc=${eclipse.javadoc}
-
-
-
-
- org.eclipse.osgi.compatibility.state
- eclipse-plugin
-
-
- org.eclipse.ant.core
- eclipse-plugin
-
-
- org.apache.ant
- eclipse-plugin
-
-
- org.eclipse.help.base
- eclipse-plugin
-
-
- org.eclipse.pde.build
- eclipse-plugin
-
-
- org.eclipse.pde.core
- eclipse-plugin
-
-
- jakarta.annotation-api
- eclipse-plugin
-
-
- org.eclipse.update.configurator
- eclipse-plugin
-
-
- eclipse-plugin
- com.ibm.icu
-
-
-
+ copy-resources
+
+ prepare-package
- eclipse-run
+ copy-resources
+
+ ${basedir}/reference/api
+
+
+ ${project.build.directory}/site/apidocs
+
+
+
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 46f8658fdb5..a1c1c38d3fd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -36,7 +36,6 @@
a better way?
-->
../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/doc.bin.log
- ../../eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/target/doc.bin.log
../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/platformconvert.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
index 760c17ac4b6..05c0497d6a9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
@@ -24,11 +24,6 @@
/eclipse-testing
platform.doc.isv.javadoc.txt
-
- ${jdt.doc.isv.javadoc}
- /eclipse-testing
- jdt.doc.isv.javadoc.txt
-
${platform.doc.isv.schema}
/eclipse-testing
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index 08f8c80f8ef..da4aad84417 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -51,11 +51,6 @@
tofile="${buildDirectory}/compilelogs/platform.doc.isv.javadoc.txt"
failonerror="false"
quiet="true" />
-
+ value="-DdownloadHost=${downloadHost} -DbuildId=${buildId} -DRELENGTEST.JAVADOC.URLS=${JAVADOC_OUTPUT_LOCATION}/platform.doc.isv.javadoc.txt,${JAVADOC_OUTPUT_LOCATION}/platform.doc.isv.schema.txt" />