Merge branch 'jetty-12.0.x' into error-page-buff-size

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
  - name: Jetty Security Reports
- url: https://eclipse.dev/jetty/security_reports.php
+ url: https://jetty.org/security.html
  about: Please raise security issues here.

.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:/eclipse/jetty.project/issues/7958)_
+_[Jetty 9.x is now at End of Community Support](https:/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:/eclipse/jetty.project/issues/7958) -->
+<!--[Jetty 9.x is now at End of Community Support](https:/jetty/jetty.project/issues/7958) -->
 
 **Jetty Environment**
 <!-- Applicable for jetty-12 only, choose: core, ee8, ee9, ee10 -->
@@ -18,7 +18,7 @@ labels: Bug
 **OS type/version**
 
 **Description**
-<!-- Do not report security issues here! See [Jetty Security Reports](https://eclipse.dev/jetty/security_reports.php) -->
+<!-- Do not report security issues here! See [Jetty Security Reports](https://jetty.org/security.html) -->
 
 **How to reproduce?**
 

.github/ISSUE_TEMPLATE/release-template.md

@@ -1,7 +1,7 @@
 ---
 name: 'Release Process'
 about: 'COMMITTER ONLY: Managing the Jetty release process'
-title: 'Jetty Releases 9.4.x, 10.0.y, 11.0.y'
+title: 'Jetty Releases 9.4.x, 10.0.y, 11.0.y, 12.0.y'
 assignees: ''
 labels: Build
 
@@ -31,10 +31,12 @@ This release process will produce releases:
 - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`.
 - [ ] Assign issue to "build manager", who will stage the releases.
  + [ ] Create and use branches `release/<ver>` to perform version specific release work from.
+ + [ ] Ensure `git fetch --tags` (as we potentially rewrite tag when re staging local tag can be out of sync and this command will fail and so fail the release script)
  + [ ] Ensure `VERSION.txt` additions for each release will be meaningful, descriptive, correct text.
  + [ ] Stage 9.4 release with Java 11.
  + [ ] Stage 10 release with Java 21.
  + [ ] Stage 11 release with Java 21.
+ + [ ] Stage 12 release with Java 22. 
  + [ ] Push release branches `release/<ver>` to to https:/eclipse/jetty.project
  + [ ] Push release tags `jetty-<ver>` to https:/eclipse/jetty.project
  + [ ] Edit a draft release (for each Jetty release) in GitHub (https:/eclipse/jetty.project/releases). Content is generated with the "changelog tool".
@@ -54,7 +56,7 @@ This release process will produce releases:
 - [ ] Merge release branches back to main branches and delete release branches.
 - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD.
 - [ ] Update Jetty versions on the website ( follow instructions in [jetty-website](https:/eclipse/jetty-website/blob/master/README.md) ).
- + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated.
+ + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated.
  + [ ] Update (or check) documentation page(s) are updated.
 - [ ] Publish GitHub Releases.
 - [ ] Prepare release announcement for mailing lists.

.github/dependabot.yml

@@ -212,6 +212,7 @@ updates:
  versions: [ ">=12" ]
  - dependency-name: "com.hazelcast:*"
  - dependency-name: "org.apache.directory*"
+ - dependency-name: "org.apache.maven.plugin-tools:*"
  - dependency-name: "org.apache.felix:*"
  versions: [ ">=4" ]
  - dependency-name: "org.jboss.weld.servlet:*"

.gitignore

@@ -52,3 +52,5 @@ bin/
 
 # reports
 reports/
+
+.launchable

.mvn/maven-build-cache-config.xml

@@ -1,5 +1,5 @@
-<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
+<cache xmlns="https://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0 https://maven.apache.org/xsd/build-cache-config-1.2.0.xsd">
  <configuration>
  <hashAlgorithm>XXMM</hashAlgorithm>
  <enabled>true</enabled>
@@ -19,10 +19,18 @@
  </scanProfiles>
  </discovery>
  </multiModule>
+ <attachedOutputs>
+ <dirNames>
+ <dirName>jetty-home</dirName>
+ </dirNames>
+ </attachedOutputs>
  </configuration>
  <input>
  <global>
  <glob>{*.java,*.xml,*.properties,*.mod,*.adoc}</glob>
+ <includes>
+ <include glob="{*.xml,*.properties,*.jsp,*.css}">src/main/webapp</include>
+ </includes>
  <excludes>
  <exclude glob="*Jenkinsfile*" />
  <exclude glob="./idea/*" />

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:/jetty/jetty.project) Jetty's canonical git repository is located on GitHub at https:/jetty/jetty.project.
 
 * [**Mailing list.**](https://accounts.eclipse.org/mailing-list/jetty-users) The [`[email protected]`](mailto:[email protected]) mailing list is a forum for technical discussion.
 
-* [**Issue tracking.**](https:/jetty/jetty.project/issues) We use [GitHub Issues](https:/eclipse/jetty.project/issues) to track ongoing development and issues.
+* [**Issue tracking.**](https:/jetty/jetty.project/issues) We use [GitHub Issues](https:/jetty/jetty.project/issues) to track ongoing development and issues.
 
 
 ## Eclipse Contributor Agreement

Jenkinsfile

@@ -9,6 +9,9 @@ pipeline {
  buildDiscarder logRotator( numToKeepStr: '60' )
  disableRestartFromStage()
  }
+ environment {
+ LAUNCHABLE_TOKEN = credentials('launchable-token')
+ }
  stages {
  stage("Parallel Stage") {
  parallel {
@@ -62,6 +65,10 @@ pipeline {
  }
  fixed {
  slackNotif()
+ websiteBuild()
+ }
+ success {
+ websiteBuild()
  }
  }
 }
@@ -118,6 +125,8 @@ def mavenBuild(jdk, cmdline, mvnName) {
  extraArgs = " -Dmaven.test.failure.ignore=true "
  }
  }
+ runLaunchable ("verify")
+ runLaunchable ("record build --name jetty-12.0.x")
  sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -U $cmdline"
  if(saveHome()) {
  archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false
@@ -127,7 +136,9 @@ def mavenBuild(jdk, cmdline, mvnName) {
  }
  finally
  {
- junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
+ junit testDataPublishers: [[$class: 'JUnitFlakyTestDataPublisher']], testResults: '**/target/surefire-reports/**/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
+ echo "Launchable record tests"
+ runLaunchable ("record tests --build jetty-12.0.x maven '**/target/surefire-reports/**/*.xml' '**/target/invoker-reports/TEST*.xml'")
  }
  }
 }
@@ -153,4 +164,29 @@ def saveHome() {
  return false;
 }
 
+def websiteBuild() {
+ script {
+ try {
+ if (env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x') {
+ build(job: 'website/jetty.website/main', propagate: false, wait: false)
+ }
+ } catch (Exception e) {
+ e.printStackTrace()
+ echo "skip website build triggering: " + e.getMessage()
+ }
+ }
+}
+/**
+ * run launchable with args and ignore any errors
+ * @param args
+ */
+def runLaunchable(args) {
+ try {
+ sh "launchable $args"
+ } catch (Exception e) {
+ e.printStackTrace()
+ echo "skip failure running Launchable: " + e.getMessage()
+ }
+}
+
 // vim: et:ts=2:sw=2:ft=groovy

KEYS.txt

@@ -1,9 +1,10 @@
 # GPG Release Key Fingerprints
-Jan Bartel <[email protected]> AED5 EE6C 45D0 FE8D 5D1B 164F 27DE D4BF 6216 DB8F
-Jesse McConnell <[email protected]> 2A68 4B57 436A 81FA 8706 B53C 61C3 351A 438A 3B7D
-Joakim Erdfelt <[email protected]> 5989 BAF7 6217 B843 D66B E55B 2D0E 1FB8 FE4B 68B4
-Joakim Erdfelt <[email protected]> B59B 67FD 7904 9843 67F9 3180 0818 D9D6 8FB6 7BAC
-Joakim Erdfelt <[email protected]> BFBB 21C2 46D7 7768 3628 7A48 A04E 0C74 ABB3 5FEA
-Simone Bordet <[email protected]> 8B09 6546 B1A8 F026 56B1 5D3B 1677 D141 BCF3 584D
-Olivier Lamy <[email protected]> F254 B356 17DC 255D 9344 BCFA 873A 8E86 B437 2146
-Ludovic Orban <[email protected]> CD38 A1DA DA34 13BE 96DF 547F 3D14 6A4A 1C58 367E
+Jan Bartel <[email protected]> AED5 EE6C 45D0 FE8D 5D1B 164F 27DE D4BF 6216 DB8F
+Jesse McConnell <[email protected]> 2A68 4B57 436A 81FA 8706 B53C 61C3 351A 438A 3B7D
+Joakim Erdfelt <[email protected]> 5989 BAF7 6217 B843 D66B E55B 2D0E 1FB8 FE4B 68B4
+Joakim Erdfelt <[email protected]> B59B 67FD 7904 9843 67F9 3180 0818 D9D6 8FB6 7BAC
+Joakim Erdfelt <[email protected]> BFBB 21C2 46D7 7768 3628 7A48 A04E 0C74 ABB3 5FEA
+Simone Bordet <[email protected]> 8B09 6546 B1A8 F026 56B1 5D3B 1677 D141 BCF3 584D
+Olivier Lamy <[email protected]> F254 B356 17DC 255D 9344 BCFA 873A 8E86 B437 2146
+Ludovic Orban <[email protected]> CD38 A1DA DA34 13BE 96DF 547F 3D14 6A4A 1C58 367E
+Lachlan Roberts <[email protected]> 75DE 085F 73C1 2232 6066 3C24 5663 FB7A 8FF7 E348

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

@@ -4,7 +4,7 @@ Eclipse Jetty is a lightweight, highly scalable, Java-based web server and Servl
 Jetty's goal is to support web protocols (HTTP/1, HTTP/2, HTTP/3, WebSocket, etc.) in a high volume low latency way that provides maximum performance while retaining the ease of use and compatibility with years of Servlet development.
 Jetty is a modern fully asynchronous web server that has a long history as a component oriented technology, and can be easily embedded into applications while still offering a solid traditional distribution for webapp deployment.
 
-- https://eclipse.dev/jetty/
+- https://jetty.org
 - https://projects.eclipse.org/projects/rt.jetty
 
 ## Webapp Example
@@ -48,26 +48,26 @@ server.start();
 ## Building Jetty from Source
 
 ```shell
-$ git clone https:/eclipse/jetty.project.git
+$ git clone https:/jetty/jetty.project.git
 $ cd jetty.project
 $ mvn -Pfast clean install # fast build bypasses tests and other checks
 ```
 
-For more detailed information on building and contributing to the Jetty project, please see the [Contribution Guide](https://eclipse.dev/jetty/documentation/contribution-guide/index.html).
+For more detailed information on building and contributing to the Jetty project, please see the [Contribution Guide](https://jetty.org/docs/contribution-guide/index.html).
 
 # Documentation
 
-[Jetty's documentation](https://eclipse.dev/jetty/documentation) is available on the Eclipse Jetty website.
+[Jetty's documentation](https://jetty.org/docs) is available on the Eclipse Jetty website.
 
 The documentation is divided into three guides, based on use case:
 
-* The [Operations Guide](https://eclipse.dev/jetty/documentation/jetty-12/operations-guide/index.html) targets sysops, devops, and developers who want to install Eclipse Jetty as a standalone server to deploy web applications.
+* The [Operations Guide](https://jetty.org/docs/jetty/12/operations-guide/index.html) targets sysops, devops, and developers who want to install Eclipse Jetty as a standalone server to deploy web applications.
 
-* The [Programming Guide](https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html) 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.
+* The [Programming Guide](https://jetty.org/docs/jetty/12/programming-guide/index.html) 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.
 
-* The [Contribution Guide](https://eclipse.dev/jetty/documentation/contribution-guide/index.html) targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements.
+* The [Contribution Guide](https://jetty.org/docs/contribution-guide/index.html) targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements.
 
 
 # Commercial Support
 
-Expert advice and production support of Jetty are provided by [Webtide](https://webtide.com).
+Expert advice and production support of Jetty are provided by [Webtide](https://webtide.com).

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 [email protected] 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 [email protected] 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.
@@ -20,9 +20,9 @@ The [following checklist](https://eclipse.dev/jetty/security_processes.php) is u
 - [ ] If the vulnerability cannot be confirmed then close the security advisory, else continue.
 - [ ] Generate a CVE score and add it to the advisory description.
 - [ ] Identify a CWE Definition and add it to the advisory description.
-- [ ] Identify vulnerable version(s), including current and past versions that are affected (e.g. 9.4.0 through 9.4.35, and 10.0.0.alpha1 through 10.0.0.beta3…​etc.)
+- [ ] Identify vulnerable version(s), including current and past versions that are affected (e.g. 9.4.0 through 9.4.35, and 10.0.0.alpha1 through 10.0.0.beta3 etc.)
 - [ ] Identify and document workaround(s), if applicable, in the comments of the security advisory.
-- [ ] Open an [Gitlab@Eclipse EMO CVE issue](https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/new?issuable_template=cve) to have a CVE allocated. 
+- [ ] Open an [Gitlab@Eclipse CVE Assignment](https://gitlab.eclipse.org/security/cve-assignement/-/issues/new) to have a CVE allocated. 
  The issue should be opened under the "Eclipse Foundation" > "EMO Team" > "EMO" section as a "cve" description, with the "This issue is confidential" checkbox checked. 
  Follow the template for what details are necessary to file for a CVE.
 - [ ] Once the CVE is allocated update the Security Advisory with the number