From 7d280532f6ea4937b29be0ddaadaf8bce6af2310 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 18 Nov 2024 16:44:47 +1000
Subject: [PATCH 1/6] test javadoc snapshot

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .../jetty/modules/code/examples/pom.xml       |  2 +-
 pom.xml                                       | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/documentation/jetty/modules/code/examples/pom.xml b/documentation/jetty/modules/code/examples/pom.xml
index 417e3e2f9d2d..1897b29beb8f 100644
--- a/documentation/jetty/modules/code/examples/pom.xml
+++ b/documentation/jetty/modules/code/examples/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <jacoco.skip>true</jacoco.skip>
-    <javadoc.skip>true</javadoc.skip>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index d049666088f7..fb6a2921dfe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
     <module>jetty-home</module>
     <module>jetty-integrations</module>
     <module>tests</module>
-    <module>javadoc</module>
+    <!--module>javadoc</module-->
     <module>documentation</module>
     <module>jetty-p2</module>
   </modules>
@@ -360,7 +360,7 @@
     <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
     <maven.invoker.plugin.version>3.8.1</maven.invoker.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
-    <maven.javadoc.plugin.version>3.11.1</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.11.2-SNAPSHOT</maven.javadoc.plugin.version>
     <maven.plugin-tools.version>3.15.1</maven.plugin-tools.version>
     <maven.release.plugin.version>3.1.0</maven.release.plugin.version>
     <maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>
@@ -2827,6 +2827,32 @@
         <spotbugs.skip>true</spotbugs.skip>
       </properties>
     </profile>
+    <profile>
+      <id>javadoc-aggregate</id>
+      <!-- Work in Progress -->
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration>
+                <skippedModules>
+                  org.eclipse.jetty.*.demos:.*,
+                  org.eclipse.jetty.ee11:jetty-ee11-test.*,
+                  org.eclipse.jetty.ee10:jetty-ee10-test.*,
+                  org.eclipse.jetty.ee9:jetty-ee9-test.*,
+                  jetty-.*-runner,
+                  .*:.*maven-plugin,
+                  jetty-test-http2-client-transport-provided-webapp,
+                  .*-osgi-.*
+                </skippedModules>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 
 </project>

From d278a1949a7d99b8f4f476a1482e9559f170f68f Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 19 Nov 2024 16:32:52 +1000
Subject: [PATCH 2/6] WIP aggregated javadoc and some missing module-info.java

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .../jetty/modules/code/examples/pom.xml       |  2 +-
 .../src/main/java/module-info.java            | 22 +++++++++++++++++
 .../src/main/java/module-info.java            | 23 ++++++++++++++++++
 .../jetty-osgi/src/main/java/module-info.java | 24 +++++++++++++++++++
 .../jetty/osgi/JettyServerFactory.java        |  3 +--
 pom.xml                                       | 11 +++++----
 6 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 jetty-core/jetty-http-tools/src/main/java/module-info.java
 create mode 100644 jetty-core/jetty-keystore/src/main/java/module-info.java
 create mode 100644 jetty-core/jetty-osgi/src/main/java/module-info.java

diff --git a/documentation/jetty/modules/code/examples/pom.xml b/documentation/jetty/modules/code/examples/pom.xml
index 1897b29beb8f..426380326c79 100644
--- a/documentation/jetty/modules/code/examples/pom.xml
+++ b/documentation/jetty/modules/code/examples/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <jacoco.skip>true</jacoco.skip>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
 
   <dependencies>
diff --git a/jetty-core/jetty-http-tools/src/main/java/module-info.java b/jetty-core/jetty-http-tools/src/main/java/module-info.java
new file mode 100644
index 000000000000..9052098ca890
--- /dev/null
+++ b/jetty-core/jetty-http-tools/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.http.tools
+{
+    requires org.slf4j;
+
+    requires org.eclipse.jetty.http;
+    requires org.hamcrest;
+
+    exports org.eclipse.jetty.http.tools.matchers;
+}
diff --git a/jetty-core/jetty-keystore/src/main/java/module-info.java b/jetty-core/jetty-keystore/src/main/java/module-info.java
new file mode 100644
index 000000000000..03b8c9954325
--- /dev/null
+++ b/jetty-core/jetty-keystore/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.keystore
+{
+    requires org.slf4j;
+    requires org.bouncycastle.provider;
+    requires org.bouncycastle.pkix;
+    requires org.bouncycastle.util;
+    requires org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.keystore;
+}
diff --git a/jetty-core/jetty-osgi/src/main/java/module-info.java b/jetty-core/jetty-osgi/src/main/java/module-info.java
new file mode 100644
index 000000000000..f994fc1e8660
--- /dev/null
+++ b/jetty-core/jetty-osgi/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.osgi
+{
+
+    requires org.eclipse.jetty.deploy;
+    requires org.eclipse.jetty.xml;
+    requires org.eclipse.osgi;
+    requires org.eclipse.osgi.services;
+    requires org.osgi.service.event;
+
+    exports org.eclipse.jetty.osgi;
+}
diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java
index 6cdc433574f1..59bd97861179 100644
--- a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java
+++ b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.StringTokenizer;
 
 import org.eclipse.jetty.deploy.AppLifeCycle;
@@ -73,7 +72,7 @@ public static Server createServer(String name, Dictionary<String, Object> props,
             ClassLoader libExtClassLoader = LibExtClassLoaderHelper.createLibExtClassLoader(null, sharedURLs, contextCl/*JettyServerFactory.class.getClassLoader()*/);
 
             ClassLoader serverClassLoader = libExtClassLoader;
-            
+
             if (LOG.isDebugEnabled())
                 LOG.debug("LibExtClassLoader = {}", libExtClassLoader);
 
diff --git a/pom.xml b/pom.xml
index fb6a2921dfe4..e2a2e9ff0d07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2837,16 +2837,17 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
               <configuration>
-                <skippedModules>
-                  org.eclipse.jetty.*.demos:.*,
+                <skippedModules>org.eclipse.jetty.*.demos:.*,
                   org.eclipse.jetty.ee11:jetty-ee11-test.*,
                   org.eclipse.jetty.ee10:jetty-ee10-test.*,
                   org.eclipse.jetty.ee9:jetty-ee9-test.*,
                   jetty-.*-runner,
-                  .*:.*maven-plugin,
+                  .*:.*maven.*,
                   jetty-test-http2-client-transport-provided-webapp,
-                  .*-osgi-.*
-                </skippedModules>
+                  .*-osgi-.*,
+                  jetty-infinispan.*,
+                  jetty-start,
+                  jetty-gcloud-session-manager</skippedModules>
               </configuration>
             </plugin>
           </plugins>

From f2d8762f37224d320aea1d73dec1f1460d743aea Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 20 Nov 2024 09:10:24 +1000
Subject: [PATCH 3/6] try some excludes

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e2a2e9ff0d07..21ffa3ec7447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2847,7 +2847,14 @@
                   .*-osgi-.*,
                   jetty-infinispan.*,
                   jetty-start,
-                  jetty-gcloud-session-manager</skippedModules>
+                  jetty-gcloud-session-manager,
+                  jetty-e8.*</skippedModules>
+                <sourceFileExcludes>
+                  <sourceFileExclude>**/module-info.java</sourceFileExclude>
+                </sourceFileExcludes>
+                <sourceFileIncludes>
+                  <sourceFileInclude>org/eclipse/jetty/**/*.java</sourceFileInclude>
+                </sourceFileIncludes>
               </configuration>
             </plugin>
           </plugins>

From a707baea88c3272a8aebaf0b92cf7ce92793c56c Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 23 Nov 2024 19:22:36 +1000
Subject: [PATCH 4/6] ensure we have artifacts for EE8 for javadoc

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pom.xml b/pom.xml
index 21ffa3ec7447..bcf9c81a16e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2837,6 +2837,20 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
               <configuration>
+                <additionalDependencies>
+                  <additionalDependency>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>1.3.3</version>
+                  </additionalDependency>
+                  <additionalDependency>
+                    <groupId>jakarta.annotation</groupId>
+                    <artifactId>jakarta.annotation-api</artifactId>
+                    <version>1.3.5</version>
+                  </additionalDependency>
+                </additionalDependencies>
+                <disableSourcepathUsage>true</disableSourcepathUsage>
+                <legacyMode>true</legacyMode>
                 <skippedModules>org.eclipse.jetty.*.demos:.*,
                   org.eclipse.jetty.ee11:jetty-ee11-test.*,
                   org.eclipse.jetty.ee10:jetty-ee10-test.*,
@@ -2855,6 +2869,8 @@
                 <sourceFileIncludes>
                   <sourceFileInclude>org/eclipse/jetty/**/*.java</sourceFileInclude>
                 </sourceFileIncludes>
+                <!--                <sourcepath>src/main/foo</sourcepath>-->
+                <!--                <subpackages>src/main/foo</subpackages>-->
               </configuration>
             </plugin>
           </plugins>

From 69812ac150a513421b13d69751a9b634f891c106 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 23 Nov 2024 19:23:27 +1000
Subject: [PATCH 5/6] cleanup

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 javadoc/pom.xml | 485 ------------------------------------------------
 pom.xml         |   3 -
 2 files changed, 488 deletions(-)
 delete mode 100644 javadoc/pom.xml

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
deleted file mode 100644
index 0a58683a3110..000000000000
--- a/javadoc/pom.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-project</artifactId>
-    <version>12.1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>javadoc</artifactId>
-  <packaging>jar</packaging>
-  <name>Javadocs</name>
-
-  <properties>
-    <checkstyle.skip>true</checkstyle.skip>
-    <duplicate-finder.skip>true</duplicate-finder.skip>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <pmd.skip>true</pmd.skip>
-    <sonar.skip>true</sonar.skip>
-    <sources-directory>${project.build.directory}/jetty-sources</sources-directory>
-    <spotbugs.skip>true</spotbugs.skip>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.eclipse.jetty.ee11</groupId>
-        <artifactId>jetty-ee11-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <!-- Necessary dependencies -->
-    <dependency>
-      <groupId>jakarta.mail</groupId>
-      <artifactId>jakarta.mail-api</artifactId>
-      <version>2.1.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Jetty Core Dependencies -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-conscrypt-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-conscrypt-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-java-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-java-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-deploy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http-spi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jndi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-openid</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-osgi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-proxy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-rewrite</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-session</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-start</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-unixdomain-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-xml</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Jetty EE 11 Dependencies -->
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-apache-jsp</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-cdi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-fcgi-proxy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-glassfish-jstl</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-jaspi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-jndi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-plus</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-proxy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-quickstart</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-runner</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-servlet</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-servlets</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11</groupId>
-      <artifactId>jetty-ee11-webapp</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.osgi</groupId>
-      <artifactId>jetty-ee11-osgi-alpn</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.osgi</groupId>
-      <artifactId>jetty-ee11-osgi-boot</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.osgi</groupId>
-      <artifactId>jetty-ee11-osgi-boot-jsp</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.websocket</groupId>
-      <artifactId>jetty-ee11-websocket-jakarta-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.websocket</groupId>
-      <artifactId>jetty-ee11-websocket-jakarta-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.websocket</groupId>
-      <artifactId>jetty-ee11-websocket-jetty-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee11.websocket</groupId>
-      <artifactId>jetty-ee11-websocket-servlet</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.fcgi</groupId>
-      <artifactId>jetty-fcgi-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.fcgi</groupId>
-      <artifactId>jetty-fcgi-proxy</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.fcgi</groupId>
-      <artifactId>jetty-fcgi-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http2</groupId>
-      <artifactId>jetty-http2-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http2</groupId>
-      <artifactId>jetty-http2-client-transport</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http2</groupId>
-      <artifactId>jetty-http2-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http3</groupId>
-      <artifactId>jetty-http3-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http3</groupId>
-      <artifactId>jetty-http3-client-transport</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.http3</groupId>
-      <artifactId>jetty-http3-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.quic</groupId>
-      <artifactId>jetty-quic-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.quic</groupId>
-      <artifactId>jetty-quic-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-core-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-core-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-jetty-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-jetty-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-jetty-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-sources-dir</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <mkdir dir="${sources-directory}"></mkdir>
-              </target>
-            </configuration>
-          </execution>
-          <execution>
-            <id>delete-sources-dir</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>verify</phase>
-            <configuration>
-              <target>
-                <delete dir="${sources-directory}" failonerror="false"></delete>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-sources</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <includeGroupIds>org.eclipse.jetty,
-                org.eclipse.jetty.fcgi,
-                org.eclipse.jetty.gcloud,
-                org.eclipse.jetty.http2,
-                org.eclipse.jetty.http3,
-                org.eclipse.jetty.memcached,
-                org.eclipse.jetty.osgi,
-                org.eclipse.jetty.quic,
-                org.eclipse.jetty.websocket</includeGroupIds>
-              <excludeGroupIds>org.eclipse.jetty.toolchain,
-                org.eclipse.jetty.orbit</excludeGroupIds>
-              <excludeArtifactIds>infinispan-embedded,
-                infinispan-remote,
-                jetty-test-helper,
-                jetty-maven-plugin,
-                jetty-jspc-maven-plugin,
-                jetty-quic-quiche-foreign,
-                jetty-quic-quiche-jna,
-                alpn-api,
-                javax.servlet,
-                javax.websocket,
-                jakarta.servlet,
-                jakarta.websocket,
-                jetty-servlet-api,
-                jetty-javax-websocket-api,
-                jetty-jakarta-servlet-api,
-                jetty-jakarta-websocket-api,
-                javax.mail,
-                jakarta.mail-api,
-                mailapi,
-                javax.security.auth.message,
-                plexus-utils,
-                plexus-interpolation</excludeArtifactIds>
-              <classifier>sources</classifier>
-              <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
-              <excludes>META-INF/**,module-info.java</excludes>
-              <outputDirectory>${sources-directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-java</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireUpperBoundDeps>
-                  <excludes>
-                    <exclude>com.google.code.findbugs:jsr305</exclude>
-                    <exclude>com.google.code.gson:gson</exclude>
-                    <exclude>com.google.guava:guava</exclude>
-                    <exclude>com.google.protobuf:protobuf-java</exclude>
-                    <exclude>org.codehaus.plexus:plexus-interpolation</exclude>
-                    <exclude>org.codehaus.plexus:plexus-utils</exclude>
-                  </excludes>
-                </requireUpperBoundDeps>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>javadoc-build</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <doctitle>Eclipse Jetty API Doc - v${project.version}</doctitle>
-              <windowtitle>Eclipse Jetty API Doc - v${project.version}</windowtitle>
-              <excludePackageNames>org.eclipse.jetty.http3.client.transport.internal; org.eclipse.jetty.http3.client.internal; org.eclipse.jetty.http3.internal; org.eclipse.jetty.http3.internal.*; org.eclipse.jetty.http3.qpack.internal; org.eclipse.jetty.http3.qpack.internal.*; org.eclipse.jetty.http3.server.internal; org.eclipse.jetty.quic.common.internal; org.eclipse.jetty.quic.quiche; org.eclipse.jetty.quic.quiche.foreign.*; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal;</excludePackageNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <sourceDirectory>${sources-directory}</sourceDirectory>
-  </build>
-</project>
diff --git a/pom.xml b/pom.xml
index bcf9c81a16e2..744934b66287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,6 @@
     <module>jetty-home</module>
     <module>jetty-integrations</module>
     <module>tests</module>
-    <!--module>javadoc</module-->
     <module>documentation</module>
     <module>jetty-p2</module>
   </modules>
@@ -2869,8 +2868,6 @@
                 <sourceFileIncludes>
                   <sourceFileInclude>org/eclipse/jetty/**/*.java</sourceFileInclude>
                 </sourceFileIncludes>
-                <!--                <sourcepath>src/main/foo</sourcepath>-->
-                <!--                <subpackages>src/main/foo</subpackages>-->
               </configuration>
             </plugin>
           </plugins>

From edc44214a4658076a1528b7471b6672349b7e741 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 5 Dec 2024 10:23:53 +1000
Subject: [PATCH 6/6] release javadoc version

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 744934b66287..b91d8e7881e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,7 +359,7 @@
     <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
     <maven.invoker.plugin.version>3.8.1</maven.invoker.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
-    <maven.javadoc.plugin.version>3.11.2-SNAPSHOT</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.11.2</maven.javadoc.plugin.version>
     <maven.plugin-tools.version>3.15.1</maven.plugin-tools.version>
     <maven.release.plugin.version>3.1.0</maven.release.plugin.version>
     <maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>