diff --git a/.github/ISSUE_TEMPLATE/enhancement-template.md b/.github/ISSUE_TEMPLATE/enhancement-template.md index 87f5652cac6..f8232ee6327 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-template.md +++ b/.github/ISSUE_TEMPLATE/enhancement-template.md @@ -8,7 +8,7 @@ labels: Enhancement --- **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/jetty/jetty.project/issues/7958)_ **Enhancement Description** diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md index 98e009121fc..bded56c3883 100644 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ b/.github/ISSUE_TEMPLATE/issue-template.md @@ -8,7 +8,7 @@ labels: Bug --- **Jetty version(s)** - + **Jetty Environment** diff --git a/NOTICE.txt b/NOTICE.txt index afb099daecf..2dcdea51d20 100644 --- 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://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/SECURITY.md b/SECURITY.md index b94bf5f07ce..d3ce495a4ef 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -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. +All [stable versions](https://jetty.org/download.html) of jetty are actively supported for security issues. [Deprecated versions](https://jetty.org/download.html) may be supported for serious security issues or on a commercial support basis. ## Reporting a Vulnerability @@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me ## Handling a Vulnerability -The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues: +The following checklist 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/VERSION.txt b/VERSION.txt index 0c63546b804..259865a698a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -414,6 +414,8 @@ jetty-10.0.18 - 26 October 2023 + 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux + 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty 12.0.2 + + 10669 Provide ability to defer initial deployment of webapps until after + Server has started + 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has a non-null `SSLContext` makes the server fail to start with an unclear error message diff --git a/documentation/jetty-documentation/src/main/asciidoc/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/index.adoc index 7f8e049f6de..82fdd11c0fa 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/index.adoc @@ -23,7 +23,7 @@ The Eclipse Jetty Operations Guide targets sysops, devops, and developers who wa The Eclipse Jetty Programming Guide targets developers who want to use the Eclipse Jetty libraries in their applications, and advanced sysops/devops that want to customize the deployment of web applications. -== https://eclipse.dev/jetty/documentation/contribution-guide/index.html[Jetty Contribution Guide] +== https://jetty.org/docs/contribution-guide/index.html[Jetty Contribution Guide] The Eclipse Jetty Programming Guide targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc index 2369b33fc83..b0b69cf3788 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc +++ b/documentation/jetty-documentation/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://eclipse.dev/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://jetty.org/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: .... jetty-plus.jar diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc index 50edbfe9ba5..0328bde4437 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc @@ -17,5 +17,5 @@ As with any constantly evolving software project, there will be issues, features, and bugs. We want to know whats bugging you! -File bugs as Issues in our Github repository http://github.com/eclipse/jetty.project[Issues at Github] +File bugs as Issues in our Github repository http://github.com/jetty/jetty.project[Issues at Github] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc index f2523ab5460..d27142bbe65 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc @@ -49,7 +49,7 @@ Clone the repository: [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git .... You will now have a local directory with all of jetty, including the jetty-documentation. @@ -109,7 +109,7 @@ Obviously we can not allow anyone immediate access to this repository so you mus In English that means that you would go to the url of the documentation in github: .... -https://github.com/eclipse/jetty.project +https://github.com/jetty/jetty.project .... When you are on this page you will see a little button called 'Fork' which you can click and you will be taken back to your main page on github where you have a new repository. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index 8509ef4588f..378b8f1ee4f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -230,7 +230,7 @@ There are two git repositories you need to be aware of for releasing jetty-docum jetty-documentation:: https://github.com/jetty-project/jetty-documentation jetty-website:: -http://git.eclipse.org/c/www.eclipse.org/jetty.git +http://github.com/jetty/jetty.website Do the following steps to publish documentation for the release: @@ -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://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project. +There is a separate Jenkins build job that publishes documentation to https://jetty.org/docs/ triggered by a push of changed files to the jetty-documentation project. If you commit your change to the 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/contributing/source-build.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc index 96c6a246d73..cfaa3fcf830 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc @@ -28,7 +28,7 @@ These are the URLs to the GIT repositories for the Jetty code. They are for people who are working on the Jetty project, as well as for people who are interested in examining or modifying the Jetty code for their own projects. Jetty Project Repository:: - https://github.com/eclipse/jetty.project + https://github.com/jetty/jetty.project ===== Build and Project Infrastructure SCM URLs @@ -53,7 +53,7 @@ Building Jetty should simply be a matter of changing into the relevant directory [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git $ cd jetty.project $ mvn install 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 3a1ffc34bc4..dafffe55eec 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://eclipse.dev/jetty/download.php +https://jetty.org/download.html ____ 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 3fa2730be16..3e477b594f1 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://eclipse.dev/jetty/documentation/ +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://jetty.org/docs/ 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 ba0ed540609..b78647f1739 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.dev/jetty/ + * Jetty: https://jetty.org/ * 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 68b0a7b9c4f..7b0042eb038 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 https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. +Check out our list of https://jetty.org/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 bd79af3eb11..51b08cc0b5b 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://eclipse.dev/jetty/documentation/[in the Jetty documentation.] +You can learn more about implementing specific Configuration Classes link:https://jetty.org/docs/[in the Jetty documentation.] ==== Deploying Multiple Contexts 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 f801eec6226..10add18b096 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://eclipse.dev/jetty/security-reports.php[Project Home Page.] +A current list of Jetty security reports can be viewed on the link:https://jetty.org/security-reports.php[Project Home Page.] ==== Reporting Security Issues diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc index bbf30163167..1553de23578 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc @@ -126,7 +126,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue link:https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue link:https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. diff --git a/documentation/jetty/modules/operations-guide/pages/session/index.adoc b/documentation/jetty/modules/operations-guide/pages/session/index.adoc index 7596c1dcf5c..a953f18ceb2 100644 --- a/documentation/jetty/modules/operations-guide/pages/session/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/session/index.adoc @@ -604,7 +604,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. diff --git a/jetty-core/jetty-ee/src/main/config/etc/jetty-ee-webapp.xml b/jetty-core/jetty-ee/src/main/config/etc/jetty-ee-webapp.xml index 0ba8f34ec72..5c666bb5743 100644 --- a/jetty-core/jetty-ee/src/main/config/etc/jetty-ee-webapp.xml +++ b/jetty-core/jetty-ee/src/main/config/etc/jetty-ee-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml b/jetty-core/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml index e7c39859657..5d3c485db97 100644 --- a/jetty-core/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml +++ b/jetty-core/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-openid/src/main/config/etc/jetty-openid.xml b/jetty-core/jetty-openid/src/main/config/etc/jetty-openid.xml index c681bf26e1c..7e6760891dc 100644 --- a/jetty-core/jetty-openid/src/main/config/etc/jetty-openid.xml +++ b/jetty-core/jetty-openid/src/main/config/etc/jetty-openid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-openid/src/main/config/modules/openid/jetty-openid-baseloginservice.xml b/jetty-core/jetty-openid/src/main/config/modules/openid/jetty-openid-baseloginservice.xml index ab7be92e0ca..7320d3004cc 100644 --- a/jetty-core/jetty-openid/src/main/config/modules/openid/jetty-openid-baseloginservice.xml +++ b/jetty-core/jetty-openid/src/main/config/modules/openid/jetty-openid-baseloginservice.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-core/jetty-server/src/main/config/etc/home-base-warning.xml index 5b0f42bcb52..8d7e3633c55 100644 --- a/jetty-core/jetty-server/src/main/config/etc/home-base-warning.xml +++ b/jetty-core/jetty-server/src/main/config/etc/home-base-warning.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml index 0ae2b002521..faaf45b864f 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool-quadratic.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool-quadratic.xml index 441202aa352..64afae6fabf 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool-quadratic.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool-quadratic.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml index fae80ed9a71..3d2820830d9 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-connectionlimit.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-connectionlimit.xml index fd15acb9ff2..f777c87c24f 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-connectionlimit.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-connectionlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-debug.xml index bd436d322c8..0e091f017e4 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-debug.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-debug.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-debuglog.xml index 067192e7114..31500c94753 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-debuglog.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-debuglog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-graceful.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-graceful.xml index aa54167c7cf..54c0f7babb8 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-graceful.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-graceful.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-gzip.xml index 5e7ae01965c..5385f382d71 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-gzip.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-gzip.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-http-forwarded.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-http-forwarded.xml index ffe0a2cae03..0a839c0648a 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-http-forwarded.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-http-forwarded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-http.xml index 9fa1e6a7bfa..2c99e7d2575 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-https.xml index a71de579531..5e5df4ddaa7 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-https.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-jaas.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-jaas.xml index 881b23292a0..3fc4994f9b4 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-jaas.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-lowresources.xml index 66e1da74aad..5e2d4650200 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-lowresources.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-lowresources.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml index 246321829c5..fd61006e376 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml index 49d427e5195..0124d3b59ab 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-requestlog.xml index 1b3a7a07011..0e55b4d17d5 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-requestlog.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-requestlog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-secure-redirect.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-secure-redirect.xml index b834c2f0c85..a3c68444b60 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-secure-redirect.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-secure-redirect.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml index 46346359ed7..d301e5ecb54 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context.xml index 84dc9a80836..241322ae6a4 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl-context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl.xml index c83840f7754..aee17b9d5f3 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-state.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-state.xml index f2ab5c98f80..e80cf6c72ba 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-state.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-state.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-statistics.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-statistics.xml index d5e113eb69e..2603b811ab6 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-statistics.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-statistics.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadlimit.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadlimit.xml index 3d0c7e5626d..fc3249f8f77 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadlimit.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml index e5c454fb5de..da285e4bb43 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml index 77109d6f83b..2995dfa0084 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool.xml index 2ef169a6c67..ae55f65a217 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty.xml b/jetty-core/jetty-server/src/main/config/etc/jetty.xml index a13125c1f39..c752c19055c 100644 --- a/jetty-core/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-core/jetty-server/src/main/config/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/file/session-store.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/file/session-store.xml index 2b2a2f3c39c..a705195c809 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/file/session-store.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/file/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml index 5616ea44fe1..9def805271d 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml index 0ed5143629a..5a55758b08d 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml index 8e2d8267467..058f2bb93ae 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml index 79d01104db9..5608e56e90c 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-null.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-null.xml index 01e8ab1eb1e..721eb48ba20 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-null.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/session-cache-null.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-core/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml index f22e5b61578..acea4e2d8e2 100644 --- a/jetty-core/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml +++ b/jetty-core/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml b/jetty-core/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml index f30fe062f66..74ee355f285 100644 --- a/jetty-core/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml +++ b/jetty-core/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 681150359b7..14a8d3d6594 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -63,7 +63,7 @@ public class 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://eclipse.dev/jetty/documentation/"); + warn.append(", this is not recommended. See documentation at https://jetty.org/docs/"); LOG.warn("{}", warn.toString()); } } diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java index e375f16e1a6..1ea406f30ee 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java @@ -215,8 +215,8 @@ public class DefaultHandler extends Handler.Abstract } writer.append("
\n"); - writer.append("\"icon\" "); - writer.append("Powered by Eclipse Jetty:// Server
\n"); + writer.append("\"icon\" "); + writer.append("Powered by Eclipse Jetty:// Server
\n"); writer.append("\n\n"); writer.flush(); ByteBuffer content = BufferUtil.toBuffer(outputStream.toByteArray()); diff --git a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index d01ad6935c8..e04c4dc007e 100644 --- a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -121,7 +121,7 @@ public class ModuleGraphWriter out.println("/*"); out.println(" * GraphViz Graph of Jetty Modules"); out.println(" * "); - out.println(" * Jetty: https://eclipse.dev/jetty/"); + out.println(" * Jetty: https://jetty.org/"); out.println(" * GraphViz: http://graphviz.org/"); out.println(" * "); out.println(" * To Generate Graph image using graphviz:"); diff --git a/jetty-core/jetty-start/src/test/resources/bogus.xml b/jetty-core/jetty-start/src/test/resources/bogus.xml index c1d3126ab22..3dac2d69175 100644 --- a/jetty-core/jetty-start/src/test/resources/bogus.xml +++ b/jetty-core/jetty-start/src/test/resources/bogus.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/jetty-core/jetty-util/src/main/config/etc/console-capture.xml b/jetty-core/jetty-util/src/main/config/etc/console-capture.xml index 439b0375241..fb5f4f76211 100644 --- a/jetty-core/jetty-util/src/main/config/etc/console-capture.xml +++ b/jetty-core/jetty-util/src/main/config/etc/console-capture.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-util/src/main/config/etc/jetty-pid.xml b/jetty-core/jetty-util/src/main/config/etc/jetty-pid.xml index 7ca3084a28c..543d4725194 100644 --- a/jetty-core/jetty-util/src/main/config/etc/jetty-pid.xml +++ b/jetty-core/jetty-util/src/main/config/etc/jetty-pid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java index 4b6f6bb0440..e89902917a8 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java @@ -1496,12 +1496,12 @@ public class LazyListTest 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://eclipse.dev/jetty/")); + uris.add(URI.create("https://jetty.org/")); // 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://eclipse.dev/jetty/", eclipseUri.toASCIIString()); + assertEquals("https://jetty.org/", eclipseUri.toASCIIString()); } /** diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java index 539c46f161b..f549cec2e67 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java @@ -82,7 +82,7 @@ public class RolloverFileOutputStreamTest } /** - * https://github.com/eclipse/jetty.project/issues/1507 + * https://github.com/jetty/jetty.project/issues/1507 */ @Test public void testMidnightRolloverCalcPDTIssue1507() diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java index 95fa0519d99..c3461efe7c3 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java @@ -82,7 +82,7 @@ public class Utf8LineParserTest public void testWildHttpRequestParse() { // Arbitrary Http Response Headers seen in the wild. - // Request URI -> https://eclipse.dev/jetty/ + // Request URI -> https://jetty.org/ 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-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java index 71e123548fb..2ae247437e0 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java @@ -100,7 +100,7 @@ public class FrameFlusherTest /** * Ensure that FrameFlusher honors the correct order of websocket frames. * - * @see eclipse/jetty.project#2491 + * @see eclipse/jetty.project#2491 */ @Test public void testLargeSmallText() throws ExecutionException, InterruptedException diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml index ac187555376..e49549ecbc6 100644 --- a/jetty-core/jetty-xml/pom.xml +++ b/jetty-core/jetty-xml/pom.xml @@ -45,6 +45,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + org.apache.maven.plugins maven-surefire-plugin diff --git a/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml b/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml index b55bd94fcfb..feac04e70a5 100644 --- a/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml +++ b/jetty-core/jetty-xml/src/main/resources/org/eclipse/jetty/xml/catalog-configure.xml @@ -8,6 +8,8 @@ + + @@ -40,6 +42,8 @@ + + @@ -55,6 +59,8 @@ + + @@ -68,4 +74,6 @@ + + diff --git a/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 6e1d8af8c78..23197c5507f 100644 --- a/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -1999,19 +1999,19 @@ public class XmlConfigurationTest 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", // version-less - "/jetty/configure_9_0.dtd", // 9.0 - "/jetty/configure_9_3.dtd", // 9.3 - "/jetty/configure_10_0.dtd"}; // 10. + String[] contexts = {"eclipse.org/jetty", "www.eclipse.org/jetty", "eclipse.dev/jetty", "www.eclipse.dev/jetty", "jetty.org"}; + String[] paths = {"configure.dtd", // version-less + "configure_9_0.dtd", // 9.0 + "configure_9_3.dtd", // 9.3 + "configure_10_0.dtd"}; // 10. for (String scheme: schemes) { - for (String host: hosts) + for (String host: contexts) { for (String path: paths) { - ids.add(Arguments.of(String.format("%s://%s%s", scheme, host, path))); + ids.add(Arguments.of(String.format("%s://%s/%s", scheme, host, path))); } } } diff --git a/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml b/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml index 5365761fc9d..90a5e604c02 100644 --- a/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml +++ b/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml @@ -1,5 +1,5 @@ - + name diff --git a/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml b/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml index 0a8d4fae305..e75f63b3498 100644 --- a/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml +++ b/jetty-core/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml @@ -1,5 +1,5 @@ - + org.eclipse.jetty.xml.ExampleConfiguration diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml index 189888d9d57..2386dad5189 100644 --- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml +++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java index a91e72cc94c..668602f931b 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee10/jspc/plugin/JspcMojo.java @@ -58,7 +58,7 @@ import org.eclipse.jetty.util.IO; * 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 + * See Usage Guide for * instructions on using this plugin. *

* Runs jspc compiler to produce .java and .class files diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml index 8a8f26b49f4..74605ebac98 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-combinedresource-it/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-combinedresource-it/src/config/jetty.xml index 343f5e7f99b..abdc1c41898 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-combinedresource-it/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-combinedresource-it/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml index ef0c9bcad93..a709c078f72 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml index 9857cb546ef..8954515cebb 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 343f5e7f99b..abdc1c41898 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml index 343f5e7f99b..abdc1c41898 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 343f5e7f99b..abdc1c41898 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml index 9857cb546ef..8954515cebb 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty-ee10.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/jetty-ee10-maven.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/jetty-ee10-maven.xml index b83be87a647..3ee3eeba51a 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/jetty-ee10-maven.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/jetty-ee10-maven.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml index ed1e4f3433e..322cd7db263 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-alpn.xml index 22eacf1cf38..bc73c4d1ffe 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-deploy.xml index e630c9a766e..aafc8fec148 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 030a2e46832..71b58edf4f0 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 82f0bb0841f..d558f458706 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml index e21afb24057..0f85ffc426a 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 1b1f7b8dbb1..163764abea1 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml index a1b677bc6ec..c506e1540e1 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index d5230f18f43..1b8421df4f3 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2-jdk9.xml index ad51713fd9c..4bf134cec4b 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2.xml index bd0226dd58d..a185f7fadca 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-https.xml index a71de579531..5e5df4ddaa7 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-testrealm.xml index 2ce036e69ec..0d90ab0259b 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/src/test/java/org/eclipse/jetty/ee10/cdi/tests/websocket/JavaxWebSocketCdiTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/src/test/java/org/eclipse/jetty/ee10/cdi/tests/websocket/JavaxWebSocketCdiTest.java index fcf205d91e9..9e6aab317a6 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/src/test/java/org/eclipse/jetty/ee10/cdi/tests/websocket/JavaxWebSocketCdiTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/src/test/java/org/eclipse/jetty/ee10/cdi/tests/websocket/JavaxWebSocketCdiTest.java @@ -164,7 +164,7 @@ public class JavaxWebSocketCdiTest } @Test - @Disabled("See issue https://github.com/eclipse/jetty.project/issues/6174") + @Disabled("See issue https://github.com/jetty/jetty.project/issues/6174") public void testHttpSessionInjection() throws Exception { start((servletContext, wsContainer) -> wsContainer.addEndpoint(CdiHttpSessionSocket.class)); diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/DefaultHandler.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/DefaultHandler.xml index 41695e90032..ab596d00f09 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/DefaultHandler.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/DefaultHandler.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttp.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttp.xml index 13f9ccca2dd..978d33449bb 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttp.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttps.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttps.xml index db2513ef8b9..69f126cd5c9 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttps.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/NIOHttps.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/RFC2616_Filters.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/RFC2616_Filters.xml index f540bf0f7c9..5808ac05342 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/RFC2616_Filters.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/RFC2616_Filters.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/basic-server.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/basic-server.xml index ea263cbb9d1..a0899fdd893 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/basic-server.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/basic-server.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/login-service.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/login-service.xml index ada7ed52e53..f90abbfba9e 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/login-service.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/login-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/ssl.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/ssl.xml index 88d6cf3e16f..f64e8a9d7cf 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/ssl.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/resources/ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml index 66aa233e619..ce9cb99c829 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml index 6e8e0b591b5..1a444716902 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/jetty-websocket-httpclient.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/jetty-websocket-httpclient.xml index 10037cbff03..7f25b7e1b13 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml index 4ba6b4cbaa4..c750444e6cb 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/demo.d/ee8-demo-jaas.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/demo.d/ee8-demo-jaas.xml index 9532bb9b735..dbbb4900473 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/demo.d/ee8-demo-jaas.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/src/main/config/modules/demo.d/ee8-demo-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/demo.d/ee8-demo-rewrite-rules.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/demo.d/ee8-demo-rewrite-rules.xml index ada0c69d580..d0fdd3dc293 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/demo.d/ee8-demo-rewrite-rules.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-webapp/src/main/config/modules/demo.d/ee8-demo-rewrite-rules.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-default.xml b/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-default.xml index 9699795ddab..ca8d3466582 100644 --- a/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-default.xml +++ b/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-demo.xml b/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-demo.xml index ad279d62d9f..3f363e25701 100644 --- a/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-demo.xml +++ b/jetty-ee8/jetty-ee8-jaspi/src/main/config/etc/jaspi/jetty-ee8-jaspi-demo.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml index 098b6c3c7cd..ed1cdde8710 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml index 098b6c3c7cd..ed1cdde8710 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/maven-ee8.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/maven-ee8.xml index c41d40d8304..dd4c39775b4 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/maven-ee8.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/maven-ee8.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee8/jetty-ee8-proxy/src/main/config/etc/jetty-ee8-proxy.xml b/jetty-ee8/jetty-ee8-proxy/src/main/config/etc/jetty-ee8-proxy.xml index 5ed1d5837eb..68822af241a 100644 --- a/jetty-ee8/jetty-ee8-proxy/src/main/config/etc/jetty-ee8-proxy.xml +++ b/jetty-ee8/jetty-ee8-proxy/src/main/config/etc/jetty-ee8-proxy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/etc/cdi/jetty-ee9-cdi.xml b/jetty-ee9/jetty-ee9-cdi/src/main/config/etc/cdi/jetty-ee9-cdi.xml index 64605baea42..e5ad8f0060a 100644 --- a/jetty-ee9/jetty-ee9-cdi/src/main/config/etc/cdi/jetty-ee9-cdi.xml +++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/etc/cdi/jetty-ee9-cdi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/exampleserver.xml index b7c4f29aad2..e3a0764cda5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/exampleserver.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 53661650468..857b10c0e6c 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml index 5ffadafa0d3..24051b0ddc2 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml @@ -1,5 +1,5 @@ - + /ee9-test-spec diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 926881d5d9a..e784f973a84 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index ff020966199..5fd85ae5980 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/test/jetty-plugin-env.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/test/jetty-plugin-env.xml index b1e24f37766..654cc6a3699 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/test/jetty-plugin-env.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/test/jetty-plugin-env.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index e1829d2a733..f37c1d74655 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -23,8 +23,8 @@ maven-plugin-tools-api - junit - junit + javax.annotation + javax.annotation-api diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index 47a4ec4b16a..b9e9e5b782c 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -26,6 +26,12 @@ org.apache.maven.plugin-tools maven-plugin-tools-api + + + javax.annotation + javax.annotation-api + + org.codehaus.plexus diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml index f5a53e28aff..d1dff565105 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-context.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-context.xml index 448578dd655..b100d754491 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-context.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-context.xml @@ -1,5 +1,5 @@ - + /embedder diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-jetty.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-jetty.xml index 064606b6b42..3b5dd9e2333 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-jetty.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/test/resources/embedder-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-quickstart/src/test/resources/context.xml b/jetty-ee9/jetty-ee9-quickstart/src/test/resources/context.xml index f4282b080f9..f15d7fe8e03 100644 --- a/jetty-ee9/jetty-ee9-quickstart/src/test/resources/context.xml +++ b/jetty-ee9/jetty-ee9-quickstart/src/test/resources/context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/add-jetty-test-webapp.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/add-jetty-test-webapp.xml index 0934688efae..6368c49656c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/add-jetty-test-webapp.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/add-jetty-test-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml index bd2c7671e21..8e138d69bfc 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml @@ -1,5 +1,5 @@ - + /badapp-uaf diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp.xml index fb038e29e6b..95be0a7ce00 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/resources/docroots/deployerror/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index ffe56a543a2..4b0f3e0ac1d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-jndi.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-jndi.xml index a924edf81b7..de368f8b7f4 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-jndi.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-jndi.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-spec.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-spec.xml index 7f7988dcb7f..2237ad26e3e 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-spec.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test-spec.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test.xml index e3045c62338..a07b1db150b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/src/test/resources/test.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/demo.d/jetty-demo-realm.xml b/jetty-home/src/main/resources/modules/demo.d/jetty-demo-realm.xml index e6328cdf244..3d1a8d2da64 100644 --- a/jetty-home/src/main/resources/modules/demo.d/jetty-demo-realm.xml +++ b/jetty-home/src/main/resources/modules/demo.d/jetty-demo-realm.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee10/badapp_throwonunavailable_true.xml b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee10/badapp_throwonunavailable_true.xml index 469062f28e3..e22d1fbbc4b 100644 --- a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee10/badapp_throwonunavailable_true.xml +++ b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee10/badapp_throwonunavailable_true.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_false.xml b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_false.xml index 6354926fea5..8d650ae6788 100644 --- a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_false.xml +++ b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_false.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_true.xml b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_true.xml index c5757229be4..f8a6de5e12a 100644 --- a/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_true.xml +++ b/tests/test-distribution/test-distribution-common/src/test/resources/badapp-ee9/badapp_throwonunavailable_true.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir one/test1.xml b/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir one/test1.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir one/test1.xml +++ b/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir one/test1.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir two/test2.xml b/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir two/test2.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir two/test2.xml +++ b/tests/test-distribution/test-distribution-common/src/test/resources/bases/spaces-with-conf/dir two/test2.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file