Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-…

…ResourceServlet

.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**
 

.github/ISSUE_TEMPLATE/issue-template.md

@@ -8,7 +8,7 @@ labels: Bug
 ---
 
 **Jetty version(s)**
-<!--[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958) -->
+<!--[Jetty 9.x is now at End of Community Support](https://github.com/jetty/jetty.project/issues/7958) -->
 
 **Jetty Environment**
 <!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10 -->

CONTRIBUTING.md

@@ -1,15 +1,15 @@
 # Contributing to Jetty
 
 Contributions are always welcome!
-Please see our [Contribution Guide](https://eclipse.dev/jetty/documentation/contribution-guide/index.html) for instructions on how to set up your development environment, as well as information on our processes and coding standards.
+Please see our [Contribution Guide](https://jetty.org/docs/contribution-guide/index.html) for instructions on how to set up your development environment, as well as information on our processes and coding standards.
 
 Here are some quick links to other useful resources:
 
 * [**Source code.**](https://github.com/jetty/jetty.project) Jetty's canonical git repository is located on GitHub at https://github.com/jetty/jetty.project.
 
 * [**Mailing list.**](https://accounts.eclipse.org/mailing-list/jetty-users) The [`jetty-users@eclipse.org`](mailto:jetty-users@eclipse.org) mailing list is a forum for technical discussion.
 
-* [**Issue tracking.**](https://github.com/jetty/jetty.project/issues) We use [GitHub Issues](https://github.com/eclipse/jetty.project/issues) to track ongoing development and issues.
+* [**Issue tracking.**](https://github.com/jetty/jetty.project/issues) We use [GitHub Issues](https://github.com/jetty/jetty.project/issues) to track ongoing development and issues.
 
 
 ## Eclipse Contributor Agreement

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
 ----------

README.md

@@ -48,7 +48,7 @@ server.start();
 ## Building Jetty from Source
 
 ```shell
-$ git clone https://github.com/eclipse/jetty.project.git
+$ git clone https://github.com/jetty/jetty.project.git
 $ cd jetty.project
 $ mvn -Pfast clean install # fast build bypasses tests and other checks
 ```

SECURITY.md

@@ -2,15 +2,15 @@
 
 ## 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
 
 Do not open a public issue to report a security vulnerability.  Please send a message to security@webtide.com and we will create a private issue in which the issue can be triaged and handled.
 
 ## Handling a Vulnerability
 
-The [following checklist](https://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.

VERSION.txt

@@ -1,4 +1,26 @@
-jetty-12.0.11-SNAPSHOT
+jetty-12.0.12-SNAPSHOT
+
+jetty-12.0.11 - 27 June 2024
+ + 11803 Follow Reactive Stream TCK for ContentSourcePublisher implementation
+ + 11811 getHeaderNames should return header name once also when request has it
+   in different case
+ + 11847 replacement for GlobalWebappConfigBinding
+ + 11873 Server resources are not found if the server is subclassed in a
+   different package
+ + 11892 mtls not working with http/3
+ + 11902 Un-deprecate WebAppClassLoading.addHiddenClasses(Attributes
+   attributes, String... patterns) method
+ + 11909 Start throws ConcurrentModificationException if an `eeX-webapp.ini`
+   exists in `start.d` with a command line like: `java -jar
+   ../jetty-home/start.jar --module=server,http,ee8-webapp,ee8-deploy`
+ + 11911 11 -> 12 Migration guide wrongly suggests Request.getHttpURI as
+   replacement for HttpServletRequest.getRequestURL
+ + 11917 Update XML configure.dtd locations to new jetty.org website
+ + 11925 java.lang.NullPointerException: Cannot invoke
+   "String.startsWith(String)" because "etag" is null
+ + 11932 Review HttpSender.ContentSender (and other ICB) to remove overridden
+   succeeded method
+ + 11944 Jetty Part#delete() implementation throws IOException
 
 jetty-12.0.10 - 30 May 2024
  + 1470 Replace Timer use with Jetty Scheduler
@@ -19,9 +41,9 @@ jetty-12.0.10 - 30 May 2024
    request, causing NPE
  + 11761 Update documentation for #10077
  + 11763 Race condition in QoSHandler
- + 11766 Ensure ReadListener is nulled out when AsyncContext is completed.
+ + 11766 Ensure ReadListener is nulled out when AsyncContext is completed
  + 11767 Backward compat API WebAppContext.getServerClassMatcher() is not
-   updating the WebAppClassloader 
+   updating the WebAppClassloader
  + 11776 NPE from `org.eclipse.jetty.ee8.nested.Request.getRequestURL`
  + 11778 jetty-http-spi does not properly provide SPI for modules
  + 11791 How to configure Jetty Server v12 ee10 for serving multiple static
@@ -414,6 +436,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

build/build-resources/pom.xml

@@ -8,7 +8,7 @@
     -->
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>build-resources</artifactId>
-  <version>12.0.11-SNAPSHOT</version>
+  <version>12.0.12-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Build :: Resources</name>
 

build/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>12.0.11-SNAPSHOT</version>
+    <version>12.0.12-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jetty.build</groupId>
   <artifactId>build</artifactId>

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc

@@ -36,15 +36,15 @@ In particular, the https://stackoverflow.com/questions/tagged/jetty[`jetty`] and
 [[cg-intro-filing-issues]]
 === Filing Issues
 
-You can flag potential bugs or suggest new Jetty features on our https://github.com/eclipse/jetty.project/issues[issue tracker].
+You can flag potential bugs or suggest new Jetty features on our https://github.com/jetty/jetty.project/issues[issue tracker].
 
-Before filing a new issue, https://github.com/eclipse/jetty.project/issues[check the tracker] to see if it's already been filed by someone else.
+Before filing a new issue, https://github.com/jetty/jetty.project/issues[check the tracker] to see if it's already been filed by someone else.
 If you do file an issue, make sure to label it appropriately, as this will help the development team (and other users) find it more easily.
 
 
 [[cg-intro-help-wanted]]
 === Help Wanted
-If you want to contribute to Jetty but don't have a specific task or goal in mind, consider looking through our https://github.com/eclipse/jetty.project/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22["Help Wanted" issue backlog].
+If you want to contribute to Jetty but don't have a specific task or goal in mind, consider looking through our https://github.com/jetty/jetty.project/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22["Help Wanted" issue backlog].
 These tasks range from the simple to the complex, but they're all ones we've identified as being particularly well-suited for new contributors to tackle.
 
 

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc

@@ -14,18 +14,18 @@
 [[cg-source]]
 == Getting the source code
 
-Jetty's source is maintained on GitHub at https://github.com/eclipse/jetty.project, where it is managed by the http://github.com/eclipse/[Eclipse Foundation].
+Jetty's source is maintained on GitHub at https://github.com/jetty/jetty.project, where it is managed by the http://github.com/eclipse/[Eclipse Foundation].
 
 You can clone a copy of the Jetty repo onto your local machine by running:
 
 ----
-git clone https://github.com/eclipse/jetty.project.git
+git clone https://github.com/jetty/jetty.project.git
 ----
 
 [[cg-source-repositories]]
 === Related repositories
 
-In addition to the https://github.com/eclipse/jetty.project[Jetty code repository], we maintain a number of related repositories:
+In addition to the https://github.com/jetty/jetty.project[Jetty code repository], we maintain a number of related repositories:
 
 Non-Eclipse Jetty Repositories:: https://github.com/jetty-project
 Build Toolchain:: https://github.com/eclipse/jetty.toolchain
@@ -37,10 +37,10 @@ If you plan to work on a specific issue within Jetty, make sure to target the co
 .Active Jetty branches
 [cols="4"]
 |===
-| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development (default branch) | Servlet 6.0 | Java 17+
-| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Maintenance | Servlet 5.0 | Java 11+
-| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Maintenance | Servlet 4.0 | Java 11+
-| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | link:https://github.com/eclipse/jetty.project/issues/7958[End of Community Support] | Servlet 3.1 | Java 8+
+| https://github.com/jetty/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development (default branch) | Servlet 6.0 | Java 17+
+| https://github.com/jetty/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Maintenance | Servlet 5.0 | Java 11+
+| https://github.com/jetty/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Maintenance | Servlet 4.0 | Java 11+
+| https://github.com/jetty/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | link:https://github.com/jetty/jetty.project/issues/7958[End of Community Support] | Servlet 3.1 | Java 8+
 |===
 
 Maintenance branches are periodically merged into active development branches.

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/4-build.adoc

@@ -69,7 +69,7 @@ $ ulimit -n [new_value]
 .Flagging flaky tests
 ====
 Not all test cases are as timing independent as they should be, which can result in intermittent test failures.
-You can help us track these flaky tests by opening an https://github.com/eclipse/jetty.project/issues[issue] when you come across one.
+You can help us track these flaky tests by opening an https://github.com/jetty/jetty.project/issues[issue] when you come across one.
 ====
 
 [[cg-build-cache]]

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/5-code-standards.adoc

@@ -20,13 +20,13 @@ This section outlines the various coding conventions and standards we use throug
 
 IntelliJ IDE::
 An IntelliJ code style XML file is available in the source repo at
-https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-intellij.xml[`/build-resources/jetty-codestyle-intellij.xml`]
+https://github.com/jetty/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-intellij.xml[`/build-resources/jetty-codestyle-intellij.xml`]
 // TODO: The above link points to the jetty-10.0.x branch, but it doesn't look like there's a `build-resources` directory for jetty-12.0.x.
 Follow https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes[IntelliJ's documentation] to import these settings into your IDE.
 
 Eclipse IDE::
 An Eclipse code style XML file is available in the source repo at
-https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-eclipse-ide.xml[`/build-resources/jetty-codestyle-eclipse-ide.xml`].
+https://github.com/jetty/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-eclipse-ide.xml[`/build-resources/jetty-codestyle-eclipse-ide.xml`].
 
 [[cg-code-standards-java]]
 === Java conventions

documentation/jetty-documentation/src/main/asciidoc/contribution-guide/6-documentation.adoc

@@ -32,7 +32,7 @@ Targets developers and writers who want to make contributions to the Jetty proje
 [[cg-documentation-toolchain]]
 === The documentation toolchain
 Jetty follows a https://www.writethedocs.org/guide/docs-as-code/["docs as code"] philosophy, meaning *we use the same tools to write and build our code and docs*.
-As such, the docs are maintained directly within the Jetty codebase at https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc[`documentation/jetty-documentation/src/main/asciidoc/`].
+As such, the docs are maintained directly within the Jetty codebase at https://github.com/jetty/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc[`documentation/jetty-documentation/src/main/asciidoc/`].
 
 [[cg-documentation-asciidoc]]
 ==== AsciiDoc
@@ -83,13 +83,13 @@ When the build completes, you can view the generated docs in your preferred web
 [[cg-documentation-build-structure]]
 ==== Documentation project structure
 
-The documentation root is https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation[`documentation/jetty-documentation/`].
+The documentation root is https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation[`documentation/jetty-documentation/`].
 Within this root directory are some files and subdirectories of note:
 
-https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc[`src/main/asciidoc`]::
+https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc[`src/main/asciidoc`]::
 The primary root for all documentation content.
 
-https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc/config.adoc[`src/main/asciidoc/config.adoc`]::
+https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc/config.adoc[`src/main/asciidoc/config.adoc`]::
 This file contains metadata and global variables shared across all the xref:cg-documentation-guides[documentation guides].
 This configuration is used by Asciidoctor to correctly render the final docs.
 

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.
 

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

documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc

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

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]
 

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.

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 <version> number from step 2, then these builds will use the same release version number.
 It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number.
 ____

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