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/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
index 1830828fef78..6b0a29c18e30 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
+++ b/documentation/jetty-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.
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
index c22f0f77da4c..ee19f98c8ad1 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc
@@ -24,7 +24,7 @@ In addition, the infrastructure also supports the OSGi `HttpService` interface.
All of the Jetty jars contain manifest entries appropriate to ensure that they can be deployed into an OSGi container as bundles.
You will need to install some jetty jars into your OSGi container.
-You can always find the Jetty jars either in the Maven Central repository, or you can link:https://www.eclipse.org/jetty/download.html[download] a distribution of Jetty.
+You can always find the Jetty jars either in the Maven Central repository, or you can link:https://eclipse.dev/jetty/download.php[download] a distribution of Jetty.
Here's the absolute minimal set of Jetty jars:
.Minimal Bundles
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc
index d1878f16fc46..3a1ffc34bc46 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-installing.adoc
@@ -19,7 +19,7 @@
The standalone Jetty distribution is available for download from the Eclipse Foundation:
____
*Jetty*
-https://www.eclipse.org/jetty/download.html
+https://eclipse.dev/jetty/download.php
____
It is available in both zip and gzip formats; download the one most appropriate for your system.
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc
index f7cc89df329b..c67eb93d2319 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc
@@ -24,7 +24,7 @@ To start Jetty on the default port of 8080, run the following command:
----
$ java -jar start.jar
2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog
-2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html
+2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/
2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION}
2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1
2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot
index dfa40ef487b3..ba0ed5406094 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot
@@ -1,7 +1,7 @@
/*
* GraphViz Graph of Jetty Modules
*
- * Jetty: https://eclipse.org/jetty/
+ * Jetty: https://eclipse.dev/jetty/
* GraphViz: http://graphviz.org/
*
* To Generate Graph image using graphviz:
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc
index 5c0aae9af27a..68b0a7b9c4fd 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc
@@ -20,7 +20,7 @@ In addition to using Jetty in its distribution form and its multiple embedded fo
Many products and open source projects out there distribute Jetty themselves, in both distribution and embedded forms, not to mention different operating systems bundling Jetty in other installable forms.
If your platform supports Jetty from a distribution or deployment perspective and want to be included on this list just fork the documentation and submit a pull request, or contact us.
-Check out our list of http://www.eclipse.org/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways.
+Check out our list of https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways.
include::jelastic.adoc[]
include::cloudfoundry.adoc[]
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc
index ec5a3a0b7e05..e02f90ef5723 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc
@@ -69,7 +69,7 @@ The default Configuration Classes are:
`org.eclipse.jetty.plus.webapp.PlusConfiguration`
`org.eclipse.jetty.annotations.AnnotationConfiguration`
-You can learn more about implementing specific Configuration Classes link:https://www.eclipse.org/jetty/documentation/current/configuring-webapps.html#webapp-configurations[here.]
+You can learn more about implementing specific Configuration Classes link:https://eclipse.dev/jetty/documentation/[in the Jetty documentation.]
==== Deploying Multiple Contexts
@@ -249,7 +249,7 @@ Here's an example of configuring a single extra classes dir:
____
[NOTE]
When using the `--jar` and/or `--lib` arguments, by default these will *not* be inspected for `META-INF` information such as `META-INF/resources`, `META-INF/web-fragment.xml`, or `META-INF/taglib.tld`.
-If you require these jar files inspected you will need to define the link:https://www.eclipse.org/jetty/documentation/current/configuring-webapps.html#webapp-context-attributes[jar pattern in your context xml file].
+If you require these jar files inspected you will need to define the jar pattern in your context xml file.
Jetty-Runner automatically provides and appends a suitable pattern for jtsl taglibs (this pattern is different than the one in the standard Jetty distribution).
____
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc
index e53648156eba..a50084ccfa62 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc
@@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule
An example webapp using JAAS can be found in the Jetty GitHub repository:
-* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-9.4.x/tests/test-webapps/test-jaas-webapp]
+* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp]
diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc
index cbfa1491cada..f801eec62262 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc
@@ -16,7 +16,7 @@
==== List of Security Reports
-A current list of Jetty security reports can be viewed on the link:https://www.eclipse.org/jetty/security-reports.html[Project Home Page.]
+A current list of Jetty security reports can be viewed on the link:https://eclipse.dev/jetty/security-reports.php[Project Home Page.]
==== Reporting Security Issues
diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc
index 0c4632055e17..2813089b8629 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc
@@ -14,7 +14,7 @@
[[og-begin-download]]
==== Downloading Jetty
-The Eclipse Jetty distribution is available for download from link:https://www.eclipse.org/jetty/download.html[]
+The Eclipse Jetty distribution is available for download from link:https://eclipse.dev/jetty/download.php[]
The Eclipse Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems.
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
index ec6a976386de..6eff9560159f 100644
--- a/jetty-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables Annotation scanning for deployed web applications.
diff --git a/jetty-cdi/src/main/config/modules/cdi-decorate.mod b/jetty-cdi/src/main/config/modules/cdi-decorate.mod
index f222fa0fbaf9..00eb26adcba2 100644
--- a/jetty-cdi/src/main/config/modules/cdi-decorate.mod
+++ b/jetty-cdi/src/main/config/modules/cdi-decorate.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.
diff --git a/jetty-cdi/src/main/config/modules/cdi-spi.mod b/jetty-cdi/src/main/config/modules/cdi-spi.mod
index c608e93e6531..a82b2a98cb37 100644
--- a/jetty-cdi/src/main/config/modules/cdi-spi.mod
+++ b/jetty-cdi/src/main/config/modules/cdi-spi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.
diff --git a/jetty-cdi/src/main/config/modules/cdi.mod b/jetty-cdi/src/main/config/modules/cdi.mod
index be52496c5b60..26fc9dfe23a7 100644
--- a/jetty-cdi/src/main/config/modules/cdi.mod
+++ b/jetty-cdi/src/main/config/modules/cdi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Provides integration of CDI within webapp to Jetty container object lifecycles.
diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod
index 5687ff94fd3f..1287200826d3 100644
--- a/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the Jetty HTTP client to the server classpath.
diff --git a/jetty-deploy/src/main/config/modules/decorate.mod b/jetty-deploy/src/main/config/modules/decorate.mod
index 3315ed0cbd32..942266b56069 100644
--- a/jetty-deploy/src/main/config/modules/decorate.mod
+++ b/jetty-deploy/src/main/config/modules/decorate.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Jetty setup to support Decoration of Listeners, Filters and Servlets within a deployed webapp.
diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.mod b/jetty-deploy/src/main/config/modules/global-webapp-common.mod
index d28cd1194ad4..bd66293a0210 100644
--- a/jetty-deploy/src/main/config/modules/global-webapp-common.mod
+++ b/jetty-deploy/src/main/config/modules/global-webapp-common.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables Deployer to apply common configuration to all webapp deployments.
diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml
index e9a5398ca249..73a091bcc027 100644
--- a/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-deploy/src/test/resources/jetty.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
index dba696e26345..dac869f35919 100644
--- a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
+++ b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the FastCGI implementation to the classpath.
@@ -13,4 +13,4 @@ lib/fcgi/*.jar
[ini-template]
## For configuration of FastCGI contexts, see
-## https://www.eclipse.org/jetty/documentation/current/fastcgi.html
+## https://eclipse.dev/jetty/documentation/
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
index 3106d0700394..e14b772ff0d9 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables GCloud Datastore API and implementation.
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
index ff7e68aee289..2dc51d64d74e 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Controls GCloud API classpath.
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
index 90856809b16f..949f6ba1eb22 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables GCloudDatastore session management.
diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
index 3e65e85df246..ec33e8c390e0 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session data store in an embedded Hazelcast Map.
diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
index 7842d1a1dbb3..6223f6818830 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session data store in a remote Hazelcast Map.
diff --git a/jetty-home/src/main/resources/NOTICE.txt b/jetty-home/src/main/resources/NOTICE.txt
index 361c3a0915be..ee70c29a02f3 100644
--- a/jetty-home/src/main/resources/NOTICE.txt
+++ b/jetty-home/src/main/resources/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/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc
index a2d0bfee48fc..af5739c576da 100644
--- a/jetty-home/src/main/resources/README.adoc
+++ b/jetty-home/src/main/resources/README.adoc
@@ -1,6 +1,6 @@
=== ECLIPSE JETTY
-The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a:
+The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a:
* Java HTTP & WebSocket Server
* Servlet Container
@@ -8,7 +8,7 @@ The link:https://www.eclipse.org/jetty/[Eclipse Jetty] Project provides a:
Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub].
-The Jetty documentation is available at link:https://www.eclipse.org/jetty/documentation[].
+The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[].
// tag::quick[]
==== Quick Setup
@@ -46,7 +46,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications
The Jetty server can be stopped with `ctrl+c` in the terminal window.
// end::quick[]
-For more information about how to start Jetty, run this command (or go to the link:https://www.eclipse.org/jetty/documentation[documentation]):
+For more information about how to start Jetty, run this command (or go to the link:https://eclipse.dev/jetty/documentation/[documentation]):
----
$ java -jar $JETTY_HOME/start.jar --help
diff --git a/jetty-home/src/main/resources/modules/demo-realm.mod b/jetty-home/src/main/resources/modules/demo-realm.mod
index 7751bf5206e0..819238518549 100644
--- a/jetty-home/src/main/resources/modules/demo-realm.mod
+++ b/jetty-home/src/main/resources/modules/demo-realm.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configure a demo authentication realm.
diff --git a/jetty-home/src/main/resources/modules/demo-root.mod b/jetty-home/src/main/resources/modules/demo-root.mod
index c1a10cbede18..1428a88cafd5 100644
--- a/jetty-home/src/main/resources/modules/demo-root.mod
+++ b/jetty-home/src/main/resources/modules/demo-root.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Demo root webapp.
diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html
index 683baf412f8e..28b06d176e8e 100644
--- a/jetty-home/src/main/resources/modules/demo.d/root/index.html
+++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html
@@ -23,7 +23,7 @@ Welcome to Jetty 10
Websocket and HTTP/2 protocols. The
project is 100% Open Source and hosted by the
- Eclipse Foundation at https://www.eclipse.org/jetty/.
+ Eclipse Foundation at https://eclipse.dev/jetty/.
@@ -45,10 +45,10 @@ demos
information
- - Jetty Homepage
- - Jetty Documentation Hub
+ - Jetty Homepage
+ - Jetty Documentation Hub
- Javadoc (via transparent proxy)
- - Jetty Powered
+ - Jetty Powered
- Optional content found only in
jetty-home-<ver>-with-docs.zip
- Jetty Documentation
@@ -60,7 +60,7 @@ information
getting help
- - Mailing lists @ eclipse
+ - Mailing lists @ eclipse
- Source @ github
- Developer Advice
- Custom Development
diff --git a/jetty-home/src/main/resources/modules/demo.mod b/jetty-home/src/main/resources/modules/demo.mod
index 5d422f5438dd..a2a57c37b41d 100644
--- a/jetty-home/src/main/resources/modules/demo.mod
+++ b/jetty-home/src/main/resources/modules/demo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
A meta module to enable all demo modules.
diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod
index b4dd2a8fcd02..f6d44408ea99 100644
--- a/jetty-home/src/main/resources/modules/hawtio.mod
+++ b/jetty-home/src/main/resources/modules/hawtio.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the Hawtio console as a web application.
diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod
index 109410a2e8bd..36c10f1e6814 100644
--- a/jetty-home/src/main/resources/modules/jamon.mod
+++ b/jetty-home/src/main/resources/modules/jamon.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the JAMon web application.
diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod
index fe428211d019..c4220458ff07 100644
--- a/jetty-home/src/main/resources/modules/jolokia.mod
+++ b/jetty-home/src/main/resources/modules/jolokia.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deploys the Jolokia console as a web application.
diff --git a/jetty-home/src/main/resources/modules/jsp.mod b/jetty-home/src/main/resources/modules/jsp.mod
index 938697731d4f..a9cfe3d02eec 100644
--- a/jetty-home/src/main/resources/modules/jsp.mod
+++ b/jetty-home/src/main/resources/modules/jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JSP for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/jstl.mod b/jetty-home/src/main/resources/modules/jstl.mod
index 32ab7cf3275e..bcd802ecbf08 100644
--- a/jetty-home/src/main/resources/modules/jstl.mod
+++ b/jetty-home/src/main/resources/modules/jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JSTL for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
index 9b77b4d5c663..5ef75a8d8569 100644
--- a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures jakarta-commons-logging events and bridges them to SLF4J.
diff --git a/jetty-home/src/main/resources/modules/logging-jetty.mod b/jetty-home/src/main/resources/modules/logging-jetty.mod
index b0a623c4834f..e6aa3e3a631f 100644
--- a/jetty-home/src/main/resources/modules/logging-jetty.mod
+++ b/jetty-home/src/main/resources/modules/logging-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Base configuration for the jetty logging mechanism.
diff --git a/jetty-home/src/main/resources/modules/logging-jul-capture.mod b/jetty-home/src/main/resources/modules/logging-jul-capture.mod
index 3243dc0923b8..efd6103d94f0 100644
--- a/jetty-home/src/main/resources/modules/logging-jul-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-jul-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures java.util.logging events and bridges them to slf4j.
diff --git a/jetty-home/src/main/resources/modules/logging-jul.mod b/jetty-home/src/main/resources/modules/logging-jul.mod
index 2097219c226b..87e950b25ce5 100644
--- a/jetty-home/src/main/resources/modules/logging-jul.mod
+++ b/jetty-home/src/main/resources/modules/logging-jul.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures jetty logging to use Java Util Logging (jul).
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
index 182c365984ca..9e1ca0622488 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Captures Apache log4j events and bridges them to SLF4J.
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod
index 848b66b3fb41..653e33eb93cb 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use Log4j.
diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
index 505095f5a66c..2fed6c18a4d5 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j2.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use log4j version 2.
diff --git a/jetty-home/src/main/resources/modules/logging-logback.mod b/jetty-home/src/main/resources/modules/logging-logback.mod
index ffba31c4c0b2..40538f43ac0a 100644
--- a/jetty-home/src/main/resources/modules/logging-logback.mod
+++ b/jetty-home/src/main/resources/modules/logging-logback.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use Logback Logging.
diff --git a/jetty-home/src/main/resources/modules/logging-noop.mod b/jetty-home/src/main/resources/modules/logging-noop.mod
index 6f146768a943..ef1c7ff6f2c0 100644
--- a/jetty-home/src/main/resources/modules/logging-noop.mod
+++ b/jetty-home/src/main/resources/modules/logging-noop.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures Jetty logging to use SLF4J No-Op Implementation.
diff --git a/jetty-home/src/main/resources/modules/logging/slf4j.mod b/jetty-home/src/main/resources/modules/logging/slf4j.mod
index 861dd9e3b13e..4ebb74a2a872 100644
--- a/jetty-home/src/main/resources/modules/logging/slf4j.mod
+++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures logging to use SLF4J.
diff --git a/jetty-home/src/main/resources/modules/setuid.mod b/jetty-home/src/main/resources/modules/setuid.mod
index 4278f82f4ebc..977cbb818690 100644
--- a/jetty-home/src/main/resources/modules/setuid.mod
+++ b/jetty-home/src/main/resources/modules/setuid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the UNIX setUID configuration.
diff --git a/jetty-home/src/main/resources/modules/stop.mod b/jetty-home/src/main/resources/modules/stop.mod
index b9407b6347c3..6b18509cd182 100644
--- a/jetty-home/src/main/resources/modules/stop.mod
+++ b/jetty-home/src/main/resources/modules/stop.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
This module causes Jetty to stop immediately after starting.
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index 9816e7b487cd..935f7543d162 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JAAS for deployed web applications.
diff --git a/jetty-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod b/jetty-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
index 70913c907bee..1735ccf4125f 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi-default-auth-config-factory.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Provides a DefaultAuthConfigFactory for jaspi
diff --git a/jetty-jaspi/src/main/config/modules/jaspi-demo.mod b/jetty-jaspi/src/main/config/modules/jaspi-demo.mod
index b0e7fd303e43..df8c0c790d77 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi-demo.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi-demo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JASPI basic authentication the /test context path.
diff --git a/jetty-jaspi/src/main/config/modules/jaspi.mod b/jetty-jaspi/src/main/config/modules/jaspi.mod
index 76b2e81406e0..2d98933f4edf 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JASPI authentication for deployed web applications.
diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
index efa8d7ff3189..a01fd6c48b79 100644
--- a/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the Jetty JNDI implementation to the classpath.
diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
index 988109044ed0..4cb95b84dd45 100644
--- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
+++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
@@ -59,9 +59,8 @@
* Note that the same java compiler will be used as for on-the-fly compiled
* jsps, which will be the Eclipse java compiler.
*
- * See Usage
- * Guide for instructions on using this plugin.
+ * See Usage Guide for
+ * instructions on using this plugin.
*
* Runs jspc compiler to produce .java and .class files
*/
diff --git a/jetty-jspc-maven-plugin/src/site/site.xml b/jetty-jspc-maven-plugin/src/site/site.xml
index d37c6e5f9dc7..61830c6eb292 100644
--- a/jetty-jspc-maven-plugin/src/site/site.xml
+++ b/jetty-jspc-maven-plugin/src/site/site.xml
@@ -6,8 +6,8 @@
${project.name}
- https://www.eclipse.org/jetty/images/jetty-logo-80x22.png
- https://eclipse.org/jetty/
+ https://eclipse.dev/jetty/images/jetty-logo-80x22.png
+ https://eclipse.dev/jetty/
https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png
diff --git a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
index 83d7fc98732e..c924c3cf9385 100644
--- a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
+++ b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables test setup
diff --git a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
index f88fe0a7f5d4..4ba3cbda79ee 100644
--- a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
+++ b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables test setup
diff --git a/jetty-maven-plugin/src/main/resources/maven.mod b/jetty-maven-plugin/src/main/resources/maven.mod
index 8cefce820c25..21fd399d164e 100644
--- a/jetty-maven-plugin/src/main/resources/maven.mod
+++ b/jetty-maven-plugin/src/main/resources/maven.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables an un-assembled Maven webapp to run in a Jetty distribution.
diff --git a/jetty-maven-plugin/src/site/site.xml b/jetty-maven-plugin/src/site/site.xml
index d37c6e5f9dc7..61830c6eb292 100644
--- a/jetty-maven-plugin/src/site/site.xml
+++ b/jetty-maven-plugin/src/site/site.xml
@@ -6,8 +6,8 @@
${project.name}
- https://www.eclipse.org/jetty/images/jetty-logo-80x22.png
- https://eclipse.org/jetty/
+ https://eclipse.dev/jetty/images/jetty-logo-80x22.png
+ https://eclipse.dev/jetty/
https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-426x100.png
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
index b55223b4c4d7..8f12f871e2c0 100644
--- a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Memcache cache for SessionData.
diff --git a/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-nosql/src/main/config/modules/session-store-mongo.mod
index 89150dd08b0a..1f74348c7e06 100644
--- a/jetty-nosql/src/main/config/modules/session-store-mongo.mod
+++ b/jetty-nosql/src/main/config/modules/session-store-mongo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables NoSql session management with a MongoDB driver.
diff --git a/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod b/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
index 4ba49715eaf3..3467a0f55cb7 100644
--- a/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
+++ b/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Server/port connections for Mongo session storage.
diff --git a/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod b/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
index 220d33c4a8b5..2e8732c84018 100644
--- a/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
+++ b/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
MongoURI connections for Mongo session storage
diff --git a/jetty-openid/src/main/config/modules/openid.mod b/jetty-openid/src/main/config/modules/openid.mod
index 4c4cbc18c299..8ddc75891e91 100644
--- a/jetty-openid/src/main/config/modules/openid.mod
+++ b/jetty-openid/src/main/config/modules/openid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds OpenId Connect authentication to the server.
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
index 122a49a2a606..eb89fb21f7e1 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
index 1d10384859cc..32eb6404275b 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod
index 0ed819cecc9a..2ec86960023f 100644
--- a/jetty-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the Jetty Proxy service.
diff --git a/jetty-quickstart/src/main/config/modules/quickstart.mod b/jetty-quickstart/src/main/config/modules/quickstart.mod
index 9487d69e3840..744cc12b370a 100644
--- a/jetty-quickstart/src/main/config/modules/quickstart.mod
+++ b/jetty-quickstart/src/main/config/modules/quickstart.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
diff --git a/jetty-rewrite/src/main/config/modules/msie.mod b/jetty-rewrite/src/main/config/modules/msie.mod
index e5944100ff78..22b74f731f4d 100644
--- a/jetty-rewrite/src/main/config/modules/msie.mod
+++ b/jetty-rewrite/src/main/config/modules/msie.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the MSIE rewrite rule for MSIE 5 and 6 known bugs.
diff --git a/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod b/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
index d5423a042bd2..bf189dbd8980 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Add a rule to the rewrite module to compact paths.
diff --git a/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod b/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
index 0c2226b909e3..45afe1c36399 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables a rewrite Rules container as a request customizer.
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
index 47f592ebed55..1b8219d42bab 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the jetty-rewrite handler.
diff --git a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java
index 32f9ebcb2a69..2924ea9c28cf 100644
--- a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java
+++ b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java
@@ -579,7 +579,7 @@ public static void main(String[] args)
{
System.err.println("WARNING: jetty-runner is deprecated.");
System.err.println(" See Jetty Documentation for startup options");
- System.err.println(" https://www.eclipse.org/jetty/documentation/");
+ System.err.println(" https://eclipse.dev/jetty/documentation/");
Runner runner = new Runner();
diff --git a/jetty-security/src/main/config/modules/security.mod b/jetty-security/src/main/config/modules/security.mod
index 4b87e2643e66..c5fec7547747 100644
--- a/jetty-security/src/main/config/modules/security.mod
+++ b/jetty-security/src/main/config/modules/security.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds servlet standard security handling to the classpath.
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 0405da0ab45d..3e4c4a890d4e 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/jetty-server/src/main/config/modules/acceptratelimit.mod b/jetty-server/src/main/config/modules/acceptratelimit.mod
index 45d14fb01716..1e2435f4f9cf 100644
--- a/jetty-server/src/main/config/modules/acceptratelimit.mod
+++ b/jetty-server/src/main/config/modules/acceptratelimit.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables a server-wide accept rate limit.
diff --git a/jetty-server/src/main/config/modules/bytebufferpool-logarithmic.mod b/jetty-server/src/main/config/modules/bytebufferpool-logarithmic.mod
index a54485b06f27..b468f8b6b95f 100644
--- a/jetty-server/src/main/config/modules/bytebufferpool-logarithmic.mod
+++ b/jetty-server/src/main/config/modules/bytebufferpool-logarithmic.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Configures the ByteBufferPool used by ServerConnectors whose bucket sizes increase exponentially instead of linearly.
diff --git a/jetty-server/src/main/config/modules/connectionlimit.mod b/jetty-server/src/main/config/modules/connectionlimit.mod
index 00661868ea5b..3c7b32d2041c 100644
--- a/jetty-server/src/main/config/modules/connectionlimit.mod
+++ b/jetty-server/src/main/config/modules/connectionlimit.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables a server-wide connection limit.
diff --git a/jetty-server/src/main/config/modules/customrequestlog.mod b/jetty-server/src/main/config/modules/customrequestlog.mod
index 7305c6f4e2cd..710343ee54ec 100644
--- a/jetty-server/src/main/config/modules/customrequestlog.mod
+++ b/jetty-server/src/main/config/modules/customrequestlog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deprecated name for requestlog using custom request logger.
diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod
index c92e9fbd42ec..eb2887e3f434 100644
--- a/jetty-server/src/main/config/modules/debug.mod
+++ b/jetty-server/src/main/config/modules/debug.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the DebugListener.
diff --git a/jetty-server/src/main/config/modules/debuglog.mod b/jetty-server/src/main/config/modules/debuglog.mod
index ba71d1027a2f..1a0a3bb36fdd 100644
--- a/jetty-server/src/main/config/modules/debuglog.mod
+++ b/jetty-server/src/main/config/modules/debuglog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Deprecated Debug Log using DebugHandle.
diff --git a/jetty-server/src/main/config/modules/ext.mod b/jetty-server/src/main/config/modules/ext.mod
index 51891a284ba8..6fc42b27cb8d 100644
--- a/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-server/src/main/config/modules/ext.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the jar file from $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the server classpath.
diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod
index 4a4320fba6ee..8764dccfc425 100644
--- a/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-server/src/main/config/modules/gzip.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables GzipHandler for dynamic gzip compression for the entire server.
diff --git a/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-server/src/main/config/modules/home-base-warning.mod
index 0e848406d52a..e4ed15823bb2 100644
--- a/jetty-server/src/main/config/modules/home-base-warning.mod
+++ b/jetty-server/src/main/config/modules/home-base-warning.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Generates a warning that server has been run from $JETTY_HOME rather than from a $JETTY_BASE.
diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod
index 943191df3094..59ae07ca0189 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds HTTPS protocol support to the TLS(SSL) Connector.
diff --git a/jetty-server/src/main/config/modules/inetaccess.mod b/jetty-server/src/main/config/modules/inetaccess.mod
index 70900e4d9a16..8716b1d4e798 100644
--- a/jetty-server/src/main/config/modules/inetaccess.mod
+++ b/jetty-server/src/main/config/modules/inetaccess.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the InetAccessHandler.
diff --git a/jetty-server/src/main/config/modules/jdbc.mod b/jetty-server/src/main/config/modules/jdbc.mod
index 47ee5d24bce5..2177507f3815 100644
--- a/jetty-server/src/main/config/modules/jdbc.mod
+++ b/jetty-server/src/main/config/modules/jdbc.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the java.sql JPMS module.
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
index 066d597c4767..578f163b5786 100644
--- a/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Creates an ini template for setting JVM arguments (eg -Xmx ).
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
index 72e0b6369241..6acebbfdcc5e 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables a low resource monitor on the server.
diff --git a/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
index 1919f83d53a0..8c0611c68c69 100644
--- a/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
+++ b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the Proxy Protocol on the TLS(SSL) Connector.
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 220c0033a570..841f8aa3baae 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Logs requests using CustomRequestLog and AsyncRequestLogWriter.
diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod
index 3760f3c91561..c884d0a9e6fa 100644
--- a/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-server/src/main/config/modules/resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds the $JETTY_BASE/resources directory to the server classpath.
diff --git a/jetty-server/src/main/config/modules/secure-redirect.mod b/jetty-server/src/main/config/modules/secure-redirect.mod
index a0b54bc6e781..80e47924cf3d 100644
--- a/jetty-server/src/main/config/modules/secure-redirect.mod
+++ b/jetty-server/src/main/config/modules/secure-redirect.mod
@@ -1,4 +1,4 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enable SecuredRedirectHandler to redirect all http requests to https on the secure port configured in the server.ini file.
diff --git a/jetty-server/src/main/config/modules/session-cache-hash.mod b/jetty-server/src/main/config/modules/session-cache-hash.mod
index 8a06cfa241d3..cbbedab434b5 100644
--- a/jetty-server/src/main/config/modules/session-cache-hash.mod
+++ b/jetty-server/src/main/config/modules/session-cache-hash.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enable first level session cache.
diff --git a/jetty-server/src/main/config/modules/session-cache-null.mod b/jetty-server/src/main/config/modules/session-cache-null.mod
index a851d17e73b7..4e7af393f3b9 100644
--- a/jetty-server/src/main/config/modules/session-cache-null.mod
+++ b/jetty-server/src/main/config/modules/session-cache-null.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
A SessionCache that does not actually cache sessions.
diff --git a/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-server/src/main/config/modules/session-store-cache.mod
index 8baf6256ddb1..7485b70aa540 100644
--- a/jetty-server/src/main/config/modules/session-store-cache.mod
+++ b/jetty-server/src/main/config/modules/session-store-cache.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables caching of SessionData in front of a SessionDataStore.
diff --git a/jetty-server/src/main/config/modules/session-store-file.mod b/jetty-server/src/main/config/modules/session-store-file.mod
index 7ddb8ade4181..e00163a4883c 100644
--- a/jetty-server/src/main/config/modules/session-store-file.mod
+++ b/jetty-server/src/main/config/modules/session-store-file.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session persistent storage in files.
diff --git a/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-server/src/main/config/modules/session-store-jdbc.mod
index 2982b7afa22a..c60038f0cacb 100644
--- a/jetty-server/src/main/config/modules/session-store-jdbc.mod
+++ b/jetty-server/src/main/config/modules/session-store-jdbc.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables JDBC persistent/distributed session storage.
diff --git a/jetty-server/src/main/config/modules/sessions.mod b/jetty-server/src/main/config/modules/sessions.mod
index 58d13e122d9e..7cff8eeb6759 100644
--- a/jetty-server/src/main/config/modules/sessions.mod
+++ b/jetty-server/src/main/config/modules/sessions.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables session management.
diff --git a/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod b/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
index 0ae4d1e98688..e60eb16c4edc 100644
--- a/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
+++ b/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
JDBC Datasource connections for session storage.
diff --git a/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod b/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
index 89f361c09c57..4d4af55f330d 100644
--- a/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
+++ b/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
JDBC Driver connections for session storage.
diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
index 5caf44fd61d1..58bce4e1365a 100644
--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables detailed statistics collection for the server.
diff --git a/jetty-server/src/main/config/modules/well-known.mod b/jetty-server/src/main/config/modules/well-known.mod
index 4db3029b075c..1c6b07598ea7 100644
--- a/jetty-server/src/main/config/modules/well-known.mod
+++ b/jetty-server/src/main/config/modules/well-known.mod
@@ -1,4 +1,4 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Serve static files from a directory for the "/.well-known" context path.
diff --git a/jetty-server/src/main/config/modules/work.mod b/jetty-server/src/main/config/modules/work.mod
index 2d93c2bbe5ec..0299b7f92f50 100644
--- a/jetty-server/src/main/config/modules/work.mod
+++ b/jetty-server/src/main/config/modules/work.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Creates the $JETTY_BASE/work directory as a persistent temp directory.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java
index 0081b874aa3f..681150359b70 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java
@@ -63,7 +63,7 @@ public HomeBaseWarning()
{
StringBuilder warn = new StringBuilder();
warn.append("This instance of Jetty is not running from a separate {jetty.base} directory");
- warn.append(", this is not recommended. See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html");
+ warn.append(", this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/");
LOG.warn("{}", warn.toString());
}
}
diff --git a/jetty-servlet/src/main/config/modules/servlet.mod b/jetty-servlet/src/main/config/modules/servlet.mod
index 609e27e75110..a29d218ec6b8 100644
--- a/jetty-servlet/src/main/config/modules/servlet.mod
+++ b/jetty-servlet/src/main/config/modules/servlet.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables standard Servlet handling.
diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod
index 0c45ce9cb3f2..dee4a8aa5d24 100644
--- a/jetty-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-servlets/src/main/config/modules/servlets.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds Jetty utility servlets and filters available to a webapp.
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
index cf1c8797381f..d01ad6935c8f 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
@@ -121,7 +121,7 @@ private void writeHeaderMessage(PrintWriter out, Path outputFile)
out.println("/*");
out.println(" * GraphViz Graph of Jetty Modules");
out.println(" * ");
- out.println(" * Jetty: https://eclipse.org/jetty/");
+ out.println(" * Jetty: https://eclipse.dev/jetty/");
out.println(" * GraphViz: http://graphviz.org/");
out.println(" * ");
out.println(" * To Generate Graph image using graphviz:");
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java
index 1ac05337690a..82b30b6fbf76 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java
@@ -66,7 +66,7 @@ public void setupBaseHome() throws IOException
public void testGetCoordinateNotMaven()
{
MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome);
- String ref = "https://www.eclipse.org/jetty/";
+ String ref = "https://eclipse.dev/jetty/";
Coordinates coords = repo.getCoordinates(URI.create(ref));
assertThat("Coords", coords, nullValue());
}
diff --git a/jetty-start/src/test/resources/dist-home/modules/main.mod b/jetty-start/src/test/resources/dist-home/modules/main.mod
index 8fd93990e8a5..8e398221e858 100644
--- a/jetty-start/src/test/resources/dist-home/modules/main.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/main.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Example of a module
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-forwarded.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-forwarded.mod
index 552b5bc16175..70328787facb 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-forwarded.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-forwarded.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds a forwarded request customizer for the Unix Domain Socket connector.
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http.mod
index 224423440249..13f028ba942c 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds an HTTP protocol support to the Unix Domain Socket connector.
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http2c.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http2c.mod
index d1d22aca9b7f..4285da8705ff 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http2c.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-http2c.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds an HTTP2C connetion factory to the Unix Domain Socket Connector.
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-prefix.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-prefix.mod
index 16963be99ea4..d17377f71090 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-prefix.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-prefix.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables a Unix Domain Socket Connector.
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-proxy-protocol.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-proxy-protocol.mod
index 739ed19d7b57..6d831d456050 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-proxy-protocol.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-proxy-protocol.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enables the proxy protocol on the Unix Domain Socket Connector.
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
index 8dfe843774d9..67a52bef1eec 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Enable a secure request customizer on the HTTP Configuration.
diff --git a/jetty-util/src/main/config/modules/console-capture.mod b/jetty-util/src/main/config/modules/console-capture.mod
index 0fa45415ae62..d390a073cf32 100644
--- a/jetty-util/src/main/config/modules/console-capture.mod
+++ b/jetty-util/src/main/config/modules/console-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/
+# DO NOT EDIT - See: https://eclipse.dev/jetty/documentation/
[description]
Redirects the JVM console stderr and stdout to a rolling log file.
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java
index 35ca58094d4f..4b6f6bb0440b 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java
@@ -1496,12 +1496,12 @@ public void testGetGenericListInput()
uris.add(URI.create("http://www.mortbay.org/"));
uris.add(URI.create("http://jetty.codehaus.org/jetty/"));
uris.add(URI.create("http://www.intalio.com/jetty/"));
- uris.add(URI.create("https://www.eclipse.org/jetty/"));
+ uris.add(URI.create("https://eclipse.dev/jetty/"));
// Make sure that Generics pass through the 'get' routine safely.
// We should be able to call this without casting the result to URI
URI eclipseUri = LazyList.get(uris, 3);
- assertEquals("https://www.eclipse.org/jetty/", eclipseUri.toASCIIString());
+ assertEquals("https://eclipse.dev/jetty/", eclipseUri.toASCIIString());
}
/**
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java
index dd9ebc53d49a..95fa0519d992 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java
@@ -82,7 +82,7 @@ public void testHttpLineParse()
public void testWildHttpRequestParse()
{
// Arbitrary Http Response Headers seen in the wild.
- // Request URI -> http://www.eclipse.org/jetty/
+ // Request URI -> https://eclipse.dev/jetty/
List expected = new ArrayList<>();
expected.add("HEAD /jetty/ HTTP/1.0");
expected.add("User-Agent: \"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-feisty)\"");
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
index d93ccec2352a..7e052dc7fe8f 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
@@ -218,7 +218,7 @@ public void testNonAbsoluteURI(Class resourceClass)
public void testNotFileURI(Class resourceClass)
{
assertThrows(IllegalArgumentException.class,
- () -> newResource(resourceClass, new URI("https://www.eclipse.org/jetty/")));
+ () -> newResource(resourceClass, new URI("https://eclipse.dev/jetty/")));
}
@ParameterizedTest
diff --git a/jetty-webapp/src/main/config/etc/webdefault.xml b/jetty-webapp/src/main/config/etc/webdefault.xml
index 4644d2dfaf0d..315358c8f9f8 100644
--- a/jetty-webapp/src/main/config/etc/webdefault.xml
+++ b/jetty-webapp/src/main/config/etc/webdefault.xml
@@ -187,7 +187,7 @@
-
+
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index 4abe3964676d..7e52896183d3 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Adds support for servlet specification web applications to the server classpath.
diff --git a/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod b/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
index 78420f79fb4b..8a25c068e9f2 100644
--- a/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
+++ b/jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
[description]
Expose the Jetty WebSocket Client classes to deployed web applications.
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index 76e143d5a459..92cf1520ff30 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -13,6 +13,7 @@
package org.eclipse.jetty.xml;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
@@ -198,7 +199,7 @@ public static String normalizeURI(String uri)
private final String _dtd;
private ConfigurationProcessor _processor;
- ConfigurationParser getParser()
+ public XmlParser getXmlParser()
{
Pool.Entry entry = __parsers.acquire(ConfigurationParser::new);
if (entry == null)
@@ -215,12 +216,18 @@ ConfigurationParser getParser()
*/
public XmlConfiguration(Resource resource) throws SAXException, IOException
{
- try (ConfigurationParser parser = getParser(); InputStream inputStream = resource.getInputStream())
+ XmlParser parser = getXmlParser();
+ try (InputStream inputStream = resource.getInputStream())
{
_location = resource;
setConfig(parser.parse(inputStream));
_dtd = parser.getDTD();
}
+ finally
+ {
+ if (parser instanceof Closeable)
+ ((Closeable)parser).close();
+ }
}
@Override
@@ -1896,7 +1903,7 @@ else if (arg.toLowerCase(Locale.ENGLISH).endsWith(".properties"))
}
}
- private static class ConfigurationParser extends XmlParser implements AutoCloseable
+ private static class ConfigurationParser extends XmlParser implements Closeable
{
private final Pool.Entry _entry;
@@ -1923,14 +1930,35 @@ private ConfigurationParser(Pool.Entry entry)
redirectEntity("configure_10_0.dtd", config100);
redirectEntity("http://jetty.mortbay.org/configure.dtd", config93);
- redirectEntity("http://jetty.mortbay.org/configure_9_3.dtd", config93);
redirectEntity("http://jetty.eclipse.org/configure.dtd", config93);
redirectEntity("https://jetty.eclipse.org/configure.dtd", config93);
redirectEntity("http://www.eclipse.org/jetty/configure.dtd", config93);
redirectEntity("https://www.eclipse.org/jetty/configure.dtd", config93);
+ redirectEntity("http://eclipse.org/jetty/configure.dtd", config93);
+ redirectEntity("https://eclipse.org/jetty/configure.dtd", config93);
+ redirectEntity("http://www.eclipse.dev/jetty/configure.dtd", config93);
+ redirectEntity("https://www.eclipse.dev/jetty/configure.dtd", config93);
+ redirectEntity("http://eclipse.dev/jetty/configure.dtd", config93);
+ redirectEntity("https://eclipse.dev/jetty/configure.dtd", config93);
+
+ redirectEntity("http://jetty.mortbay.org/configure_9_3.dtd", config93);
redirectEntity("http://www.eclipse.org/jetty/configure_9_3.dtd", config93);
redirectEntity("https://www.eclipse.org/jetty/configure_9_3.dtd", config93);
+ redirectEntity("http://eclipse.org/jetty/configure_9_3.dtd", config93);
+ redirectEntity("https://eclipse.org/jetty/configure_9_3.dtd", config93);
+ redirectEntity("http://www.eclipse.dev/jetty/configure_9_3.dtd", config93);
+ redirectEntity("https://www.eclipse.dev/jetty/configure_9_3.dtd", config93);
+ redirectEntity("http://eclipse.dev/jetty/configure_9_3.dtd", config93);
+ redirectEntity("https://eclipse.dev/jetty/configure_9_3.dtd", config93);
+
+ redirectEntity("http://www.eclipse.org/jetty/configure_10_0.dtd", config100);
redirectEntity("https://www.eclipse.org/jetty/configure_10_0.dtd", config100);
+ redirectEntity("http://eclipse.org/jetty/configure_10_0.dtd", config100);
+ redirectEntity("https://eclipse.org/jetty/configure_10_0.dtd", config100);
+ redirectEntity("http://www.eclipse.dev/jetty/configure_10_0.dtd", config100);
+ redirectEntity("https://www.eclipse.dev/jetty/configure_10_0.dtd", config100);
+ redirectEntity("http://eclipse.dev/jetty/configure_10_0.dtd", config100);
+ redirectEntity("https://eclipse.dev/jetty/configure_10_0.dtd", config100);
redirectEntity("-//Mort Bay Consulting//DTD Configure//EN", config100);
redirectEntity("-//Jetty//Configure//EN", config100);
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java
index ea8a3a4485a3..b4297ae51b76 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java
@@ -274,24 +274,16 @@ protected InputSource resolveEntity(String pid, String sid)
entity = (URL)_redirectMap.get(pid);
if (entity == null)
entity = (URL)_redirectMap.get(sid);
- if (entity == null)
- {
- String dtd = sid;
- if (dtd.lastIndexOf('/') >= 0)
- dtd = dtd.substring(dtd.lastIndexOf('/') + 1);
-
- if (LOG.isDebugEnabled())
- LOG.debug("Can't exact match entity in redirect map, trying {}", dtd);
- entity = (URL)_redirectMap.get(dtd);
- }
+ // Only serve entity if found.
+ // We don't want to serve from unknown hosts or random paths.
if (entity != null)
{
try
{
InputStream in = entity.openStream();
if (LOG.isDebugEnabled())
- LOG.debug("Redirected entity {} --> {}", sid, entity);
+ LOG.debug("Redirected entity {} --> {}", sid, entity);
InputSource is = new InputSource(in);
is.setSystemId(sid);
return is;
@@ -301,6 +293,9 @@ protected InputSource resolveEntity(String pid, String sid)
LOG.trace("IGNORED", e);
}
}
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("Entity not found for PID:{} / SID:{}", pid, sid);
return null;
}
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
index 54bb37cfe440..159350769bf1 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
@@ -55,6 +55,7 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -92,9 +93,12 @@ public void testMortBay() throws Exception
configuration.configure();
}
- public static String[] xmlConfigs()
+ public static Stream xmlConfigs()
{
- return new String[]{"org/eclipse/jetty/xml/configureWithAttr.xml", "org/eclipse/jetty/xml/configureWithElements.xml"};
+ return Stream.of(
+ Arguments.of("org/eclipse/jetty/xml/configureWithAttr.xml"),
+ Arguments.of("org/eclipse/jetty/xml/configureWithElements.xml")
+ );
}
@ParameterizedTest
@@ -1855,6 +1859,43 @@ public void testVirtualCallWithClassAttribute() throws Exception
assertThat(tc.testObject, instanceOf(ScheduledExecutorService.class));
}
+ public static Stream xmlSystemIdSource()
+ {
+ List ids = new ArrayList<>();
+
+ String[] schemes = {"http", "https"};
+ String[] hosts = {"eclipse.org", "www.eclipse.org", "eclipse.dev", "www.eclipse.dev"};
+ String[] paths = {"/jetty/configure.dtd", "/jetty/configure_9_3.dtd", "/jetty/configure_10_0.dtd"};
+
+ for (String scheme: schemes)
+ {
+ for (String host: hosts)
+ {
+ for (String path: paths)
+ {
+ ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path)));
+ }
+ }
+ }
+
+ return ids.stream();
+ }
+
+ /**
+ * Test to ensure that all the XML System ID variants are covered in the
+ * {@link XmlConfiguration} internals.
+ */
+ @ParameterizedTest
+ @MethodSource("xmlSystemIdSource")
+ public void testSystemIdVariants(String xmlSystemId) throws IOException, SAXException
+ {
+ // empty raw xml, just to instantiate XmlConfiguration, so we can access the XmlParser / ConfigurationParser.
+ XmlConfiguration xmlConfiguration = asXmlConfiguration("");
+ XmlParser configurationProcessor = xmlConfiguration.getXmlParser();
+ InputSource inputSource = configurationProcessor.resolveEntity(null, xmlSystemId);
+ assertNotNull(inputSource, "SystemID: " + xmlSystemId + " does not exist");
+ }
+
private ByteArrayOutputStream captureLoggingBytes(ThrowableAction action) throws Exception
{
Logger slf4jLogger = LoggerFactory.getLogger(XmlConfiguration.class);
diff --git a/pom.xml b/pom.xml
index 61a641db24c5..a08fc5e587d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
Jetty :: Project
The Eclipse Jetty Project
pom
- https://eclipse.org/jetty
+ https://eclipse.dev/jetty
1995
@@ -17,7 +17,7 @@
11
11
false
- https://www.eclipse.org/jetty/
+ https://eclipse.dev/jetty/
benchmarks
org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"
UTF-8
@@ -180,7 +180,7 @@
Eclipse Public License - Version 2.0
- https://www.eclipse.org/legal/epl-2.0
+ https://www.eclipse.org/legal/epl-2.0/
Apache Software License - Version 2.0
@@ -839,10 +839,10 @@
asciidoctor-diagram
- https://www.eclipse.org/jetty/javadoc/jetty-10
+ https://eclipse.dev/jetty/javadoc/jetty-10
${basedir}/..
- https://github.com/eclipse/jetty.project/tree/jetty-9.4.x
- https://github.com/eclipse/jetty.project/tree/jetty-10.0.x-doc-refactor/jetty-documentation/src/main/asciidoc
+ https://github.com/eclipse/jetty.project/tree/jetty-10.0.x
+ https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc
http://central.maven.org/maven2
${project.version}
${maven.build.timestamp}
@@ -2456,27 +2456,18 @@
Jetty Developer Mailing List
- https://dev.eclipse.org/mhonarc/lists/jetty-dev/maillist.html
- https://dev.eclipse.org/mailman/listinfo/jetty-dev
- https://dev.eclipse.org/mailman/listinfo/jetty-dev
-
-
- Jetty Commit Mailing List
- https://dev.eclipse.org/mhonarc/lists/jetty-commit/maillist.html
- https://dev.eclipse.org/mailman/listinfo/jetty-commit
- https://dev.eclipse.org/mailman/listinfo/jetty-commit
+ https://www.eclipse.org/lists/jetty-dev/
+ https://accounts.eclipse.org/mailing-list/jetty-dev
Jetty Users Mailing List
- https://dev.eclipse.org/mhonarc/lists/jetty-users/maillist.html
- https://dev.eclipse.org/mailman/listinfo/jetty-users
- https://dev.eclipse.org/mailman/listinfo/jetty-users
+ https://www.eclipse.org/lists/jetty-users/
+ https://accounts.eclipse.org/mailing-list/jetty-users
Jetty Announce Mailing List
- https://dev.eclipse.org/mhonarc/lists/jetty-announce/maillist.html
- https://dev.eclipse.org/mailman/listinfo/jetty-announce
- https://dev.eclipse.org/mailman/listinfo/jetty-announce
+ https://www.eclipse.org/lists/jetty-announce/
+ https://accounts.eclipse.org/mailing-list/jetty-announce
@@ -2562,9 +2553,5 @@
Jetty Snapshot Repository
https://oss.sonatype.org/content/repositories/jetty-snapshots/
-
- jetty.eclipse.website
- scp://build.eclipse.org:/home/data/httpd/download.eclipse.org/jetty/${project.version}/
-
| |