Merge jetty-11.0.x into jetty-12.0.x - July 14 (#10108)

* Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098) + Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project + Updated URLs in poms + Added more URIs to XmlConfiguration + Updated URLs in module files + Updated URLs in documentation + Updated URLs in HTML + Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`) + Updating text in *.mod files + Removing `/current/` from path `/jetty/documentation/current/` + Fixing mailing list URL + Fixing github URL references in jsps --------- Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Jul 15, 2023 · 8e52abe · 8e52abe
1 parent 9a476e2
commit 8e52abe
Show file tree

Hide file tree

Showing 358 changed files with 617 additions and 552 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Jetty Security Reports
-    url: https://www.eclipse.org/jetty/security_reports.php
+    url: https://eclipse.dev/jetty/security_reports.php
     about: Please raise security issues here.
diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -8,14 +8,14 @@ labels: Bug
 ---
 
 **Jetty version(s)**
-_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_
+<!--[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958) -->
 
 **Java version/vendor** `(use: java -version)`
 
 **OS type/version**
 
 **Description**
-_Do not report security issues here! See [Jetty Security Reports](https://www.eclipse.org/jetty/security_reports.php)._
+<!-- Do not report security issues here! See [Jetty Security Reports](https://eclipse.dev/jetty/security_reports.php) -->
 
 **How to reproduce?**
 

diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md
@@ -56,7 +56,7 @@ This release process will produce releases:
 - [ ] Merge release branches back to main branches and delete release branches.
 - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD.
 - [ ] Update Jetty versions on the web sites.
-  + [ ] Update (or check) [Download](https://www.eclipse.org/jetty/download.php) page is updated.
+  + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated.
   + [ ] Update (or check) documentation page(s) are updated.
 - [ ] Publish GitHub Releases in the order of oldest (eg: 9) to newest (eg: 11) (to ensure that "latest" in github is truly the latest)
 - [ ] Prepare release announcement for mailing lists.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ Developer resources
 --------------------
 Information regarding source code management, builds, coding standards, and more.
 
-- [https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html](https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html)
+- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)
 
 The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have
 completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper.

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2,7 +2,7 @@ Notices for Eclipse Jetty
 =========================
 This content is produced and maintained by the Eclipse Jetty project.
 
-Project home: https://www.eclipse.org/jetty/
+Project home: https://eclipse.dev/jetty/
 
 Trademarks
 ----------

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ server.start();
 
 Project documentation is available on the Eclipse Jetty website.
 
-- [https://www.eclipse.org/jetty/documentation](https://www.eclipse.org/jetty/documentation)
+- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/)
 
 # Building
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,15 +2,15 @@
 
 ## Supported Versions
 
-All [stable versions](https://www.eclipse.org/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://www.eclipse.org/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
+All [stable versions](https://eclipse.dev/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://eclipse.dev/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
 
 ## Reporting a Vulnerability
 
 Do not open a public issue to report a security vulnerability.  Please send a message to security@webtide.com and we will create a private issue in which the issue can be triaged and handled.
 
 ## Handling a Vulnerability
 
-The [following checklist](https://www.eclipse.org/jetty/security_processes.php) is used to handle security issues:
+The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues:
 
 - [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership.
 - [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks.

diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml
@@ -83,7 +83,7 @@
             <version>${project.version}</version>
             <prog-guide>../programming-guide/index.html</prog-guide>
             <op-guide>../operations-guide/index.html</op-guide>
-            <javadoc-url>https://www.eclipse.org/jetty/javadoc/jetty-11</javadoc-url>
+            <javadoc-url>https://eclipse.dev/jetty/javadoc/jetty-12</javadoc-url>
           </attributes>
         </configuration>
         <executions>

diff --git a/...entation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc b/...entation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
@@ -26,12 +26,13 @@ The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located a
 .Active Eclipse Jetty Branches
 [cols="4"]
 |===
-| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
+| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development | Servlet 6.0 | Java 17+
+| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
 | https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development (default branch) | Servlet 4.0 | Java 11+
-| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance | Servlet 3.1 | Java 8
-| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance | Servlet 3.0 | Java 8
-| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical | Servlet 2.0 | Java 7
-| https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Mythical | Servlet 1.0 | Java 6
+| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | End of Community Support | Servlet 3.1 | Java 8
+| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | End of Life | Servlet 3.1 | Java 8
+| jetty-8 | Historical | Servlet 3.1 | Java 6
+| jetty-7 | Mythical | Servlet 2.5 | Java 5
 |===
 
 If you are planning on working with a specific issue within Jetty it is important to target the correct branch for a pull request. Pull requests that are targeted at Maintenance Branches are typically merged forward into subsequent branches while historical branches are left alone merge wise.  Depending on the nature of an issue a historical branch may have an issue cherrypicked forward, but maintenance releases are merged wholesale forward as a matter of project policy.
@@ -52,8 +53,6 @@ Administrative pom.xml file::
   https://github.com/eclipse/jetty.parent
 Build related artifacts that release separately, common assembly descriptors, remote resources, etc.::
   https://github.com/eclipse/jetty.toolchain
-Files associated with the development of Jetty -- code styles, formatting, iplogs, etc.::
-  http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git
 
 [[cg-contributing-build]]
 === Maven Build
@@ -88,17 +87,15 @@ ____
 
 Jetty uses number of conventions for its source code. The developers of Jetty use a variety of tooling and editors when developing Jetty so standards and conventions are important!
 
-==== Intelli-J
+==== IntelliJ IDE
 
-The suggested configuration for Intelli-J when working with Jetty is available here: http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/idea-jetty-codestyle-settings.jar[Intelli-J Codestyle]
+The suggested configuration for the IntelliJ IDE when working with Jetty is available in the code tree
+`/build-resources/jetty-codestyle-intellij.xml`
 
-==== Eclipse
+==== Eclipse IDE
 
-The Eclipse format configuration can be found here:
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-java-format.xml[Eclipse Java Formatting]
-
-There are also some templates available for Eclipse here:
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-codetemplates.xml[Eclipse Code Templates]
+The Eclipse IDE format can be found in the code tree
+`/build-resources/jetty-codestyle-eclipse-ide.xml`
 
 ==== Code Conventions
 

diff --git a/...entation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/...entation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc
@@ -17,7 +17,7 @@
 ==== Setting up the Classpath
 
 You will need to place the following Jetty jar files onto the classpath of your application.
-You can obtain them from the https://www.eclipse.org/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]:
+You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]:
 
 ....
 jetty-plus.jar

diff --git a/...jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc b/...jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc
@@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/test</Set>

diff --git a/...etty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/...etty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc
@@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu
 
 ____
 [NOTE]
-There is a separate Jenkins build job that publishes documentation to https://www.eclipse.org/jetty/documentation/current triggered by a push of changed files to the jetty-documentation project.
+There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project.
 If you commit your change to the <version> number from step 2, then these builds will use the same release version number.
 It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number.
 ____
diff --git a/...rc/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc b/...rc/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc
@@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -135,7 +135,7 @@ If the `web.xml` does not include a reference to this data source, an override d
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>

diff --git a/...documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/...documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
@@ -69,7 +69,7 @@ A fifth, non-standard binding, called link:{JDURL}/org/eclipse/jetty/deploy/bind
 
 ===== Using GlobalWebappConfigBinding
 
-In addition to the LifeCycle bindings discussed above, there is also the link:https://www.eclipse.org/jetty/javadoc/current/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.html[`GlobalWebappConfigBinding`] which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys.
+In addition to the LifeCycle bindings discussed above, there is also the `GlobalWebappConfigBinding` which, when added to the `DeploymentManager` will apply an additional configuration XML file to each webapp that it deploys.
 This can useful when setting server or system classes, or when defining link:#override-web-xml[override descriptors.]
 This configuration XML file will be _in addition to_ any context XML file that exists for the webapp; it will be applied _after_ any context XML files but _before_ the webapp is started.
 The format for the  XML file is the same as any context XML file and can be used to same parameters for a webapp.
@@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc
 [source,xml,subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <Call name="addBean">

diff --git a/...ntation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc b/...ntation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc
@@ -130,7 +130,7 @@ Let's see an example of how we would add in the Configurations for both JNDI _an
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
 
@@ -162,7 +162,7 @@ They will then be applied to each `WebAppContext` deployed by the deployer:
 [source,xml,subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
@@ -206,7 +206,7 @@ This example uses an xml file, in fact it is the `$JETTY_HOME/etc/jetty-plus.xml
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
@@ -256,7 +256,7 @@ Here's an example from a context xml file (although as always, you could have ac
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
 
@@ -282,7 +282,7 @@ Here's an example in a xml file of a pattern that matches any jar that starts wi
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
 

diff --git a/...jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc b/...jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc
@@ -100,7 +100,7 @@ Otherwise, create a context xml file with the following information (in addition
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 <Configure class="org.eclipse.jetty.quickstart.QuickStartWebApp">
   <Set name="autoPreconfigure">true</Set>
 </Configure>

diff --git a/...cumentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc b/...cumentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc
@@ -20,7 +20,7 @@ Create a file called `scratch.xml` in the `${jetty.base}/webapps` directory and
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
   <Set name="contextPath">/scratch</Set>
   <Set name="handler">

diff --git a/...etty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc b/...etty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc
@@ -43,7 +43,7 @@ This is a permanent redirection, which also preserves `pathinfo` and query strin
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
   <Set name="contextPath">/foo</Set>

diff --git a/...jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc b/...jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc
@@ -44,7 +44,7 @@ Copy and paste the following content as `$JETTY_BASE/webapps/jetty-wordpress.xml
 [source,xml,subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
 <Configure class="org.eclipse.jetty.ee9.servlet.ServletContextHandler">
 
     <New id="root" class="java.lang.String">

diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc
@@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit
 [source.XML, xml]
 -------------------------------------------------------------
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://eclipse.dev/jetty/configure.dtd">
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
    <Call name="prependServerClass">
       <Arg>-org.eclipse.jetty.util.Decorator</Arg>