diff --git a/.github/ISSUE_TEMPLATE/enhancement-template.md b/.github/ISSUE_TEMPLATE/enhancement-template.md index 87f5652cac6a..f8232ee6327b 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 98e009121fc6..bded56c38831 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/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index 0bdb16e450f4..0080b203e739 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -16,18 +16,18 @@ This release process will produce releases: - [x] Create the release(s) issue. - [ ] Update the target Jetty version(s) in the issue. - [ ] Update the target release date in the issue. -- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). +- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). - [ ] Assign this issue to a "release manager". -- [ ] Review [draft security advisories](https://github.com/eclipse/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. -- [ ] Update [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) +- [ ] Review [draft security advisories](https://github.com/jetty/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. +- [ ] Update [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) + [ ] Create new project for the next releases (not this release). + [ ] Ensure new project is public (not private) - + [ ] Freeze the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" - + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. -- [ ] Review dependabot status. [Manually](https://github.com/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. + + [ ] Freeze the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" + + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. +- [ ] Review dependabot status. [Manually](https://github.com/jetty/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. Such updates should only be included in the week before a release if there is a compelling security or stability reason to do so. - [ ] Wait 24 hours from last change to the issues/PRs included in FROZEN GitHub Project(s). -- [ ] Verify target [project(s)](https://github.com/eclipse/jetty.project/projects) are complete. +- [ ] Verify target [project(s)](https://github.com/jetty/jetty.project/projects) are complete. - [ ] 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/` to perform version specific release work from. @@ -35,9 +35,9 @@ This release process will produce releases: + [ ] Stage 9.4 release with Java 11. + [ ] Stage 10 release with Java 21. + [ ] Stage 11 release with Java 21. - + [ ] Push release branches `release/` to to https://github.com/eclipse/jetty.project - + [ ] Push release tags `jetty-` to https://github.com/eclipse/jetty.project - + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/eclipse/jetty.project/releases). Content is generated with the "changelog tool". + + [ ] Push release branches `release/` to to https://github.com/jetty/jetty.project + + [ ] Push release tags `jetty-` to https://github.com/jetty/jetty.project + + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/jetty/jetty.project/releases). Content is generated with the "changelog tool". - [ ] Assign issue to "test manager", who will oversee the testing of the staged releases. + [ ] Test [CometD](https://github.com/cometd/cometd). + [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient). @@ -58,7 +58,7 @@ This release process will produce releases: + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases. - [ ] Prepare release announcement for mailing lists. -- [ ] Publish any [security advisories](https://github.com/eclipse/jetty.project/security/advisories). +- [ ] Publish any [security advisories](https://github.com/jetty/jetty.project/security/advisories). + [ ] Edit `VERSION.txt` to include any actual CVE number next to correspondent issue. + [ ] Edit any issues for CVEs in github with their CVE number - [ ] Notify downstream maintainers. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38f9fb356457..afd1bc0e44a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Information regarding source code management, builds, coding standards, and more - [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) -The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have +The canonical Jetty git repository is located at [GitHub.](https://github.com/jetty/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. Eclipse Contributor Agreement @@ -43,13 +43,13 @@ Search for bugs ---------------- This project uses GitHub Issues to track ongoing development and issues. -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Create a new bug ----------------- Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome! -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Reporting Security Issues ----------------- diff --git a/Jenkinsfile-autobahn b/Jenkinsfile-autobahn index 3366e2d2ec03..620f9c45f45e 100644 --- a/Jenkinsfile-autobahn +++ b/Jenkinsfile-autobahn @@ -18,7 +18,7 @@ pipeline { stages { stage("Checkout Jetty Branch") { steps { - git url: 'https://github.com/eclipse/jetty.project/', branch: '${JETTY_BRANCH}' + git url: 'https://github.com/jetty/jetty.project/', branch: '${JETTY_BRANCH}' } } stage( "Build / Test - JDK11" ) { diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html index 3f2f70f517c3..ce1b3273cf26 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index dafbd88aa86e..dbaafe5a45ea 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index 607d8d381847..a0140e9d205a 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -6,7 +6,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html index 5870ec5904c3..57d6cf8e06b4 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html index 169cb794cf70..81bfdc4e1697 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html index 1f076c43dcab..7b1822787b33 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html index 416fd03cf1a0..0e85b8213e44 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 5f3a1addd047..c24f9e853e27 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index e0f0c99e34f2..709a38f50f1b 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index 0f4ac2a53c81..90e3e06b2fe6 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 9628c8783a8d..0b5debc6fc6b 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support 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 50edbfe9ba5d..0328bde4437d 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 f2523ab54600..d27142bbe651 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/source-build.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc index 96c6a246d73f..cfaa3fcf8304 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/jetty-xml/jetty-xml-config.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc index bc0793a93c19..926eafcf92bb 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc @@ -26,7 +26,7 @@ Not all Jetty features are configured in `jetty.xml`. There are several optional configuration files that share the same format as `jetty.xml` and, if specified, concatenate to it. -These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/eclipse/jetty.project/jetty-server/src/main/config/etc/[Github Repository]. +These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/jetty/jetty.project/jetty-server/src/main/config/etc/[Github Repository]. The selection of which configuration files to use is controlled by `start.jar` and the process of merging configuration is described in xref:jetty-xml-usage[]. [[root-element-jetty-xml]] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc index a50084ccfa62..ff801b6a270d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc @@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule An example webapp using JAAS can be found in the Jetty GitHub repository: -* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp] +* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/jetty/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp] 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 d0cc65d88036..cbf6624783a4 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 c8d9ba3aa36f..483bc9da9322 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-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index af5739c576da..8f76a9a2aad0 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -6,7 +6,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: * Servlet Container * Java HTTP & WebSocket Client -Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub]. +Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 28b06d176e8e..b9e8466f77e1 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -61,7 +61,7 @@

information

getting help

  • Mailing lists @ eclipse
    • -
  • Source @ github
    • +
  • Source @ github
  • Developer Advice
  • Custom Development
  • Production support
    • diff --git a/jetty-osgi/test-jetty-osgi/README.txt b/jetty-osgi/test-jetty-osgi/README.txt index 9811ae5018ae..58bc75e2f088 100644 --- a/jetty-osgi/test-jetty-osgi/README.txt +++ b/jetty-osgi/test-jetty-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java index c19bc4184fe5..a79251f04cc4 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java @@ -81,7 +81,7 @@ private void assertSequence(ZonedDateTime midnight, Object[][] expected) } /** - * https://github.com/eclipse/jetty.project/issues/1507 + * https://github.com/jetty/jetty.project/issues/1507 */ @Test public void testMidnightRolloverCalcPDTIssue1507() diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java index 2d89b3da7558..329e4aa5a88b 100644 --- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java +++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java @@ -100,7 +100,7 @@ public void testPostCloseFrameCallbacks() throws ExecutionException, Interrupted /** * 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/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java index e217e3454cca..dde298e75072 100644 --- a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java +++ b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java @@ -163,7 +163,7 @@ public void testEncoderDecoder() throws Exception } @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/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java index ad27c08b63cd..c04c7e6f9fd1 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java @@ -21,7 +21,7 @@ /** * A SCI that tosses an Error to intentionally to cause issues with the DeploymentManager * - * @see Issue #1602 + * @see Issue #1602 */ public class DeploymentErrorInitializer implements ServletContainerInitializer {