Skip to content

Commit

Permalink
Update github URL references to new location
Browse files Browse the repository at this point in the history
  • Loading branch information
joakime committed Jun 20, 2024
1 parent 6bebb2d commit 35903ae
Show file tree
Hide file tree
Showing 30 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
22 changes: 11 additions & 11 deletions .github/ISSUE_TEMPLATE/release-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ 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/<ver>` to perform version specific release work from.
+ [ ] 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.
+ [ ] Push release branches `release/<ver>` to to https://github.com/eclipse/jetty.project
+ [ ] Push release tags `jetty-<ver>` 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/<ver>` to to https://github.com/jetty/jetty.project
+ [ ] Push release tags `jetty-<ver>` 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).
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
-----------------
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile-autobahn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-async-rest">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-async-rest">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jaas-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jaas-webapp/src/main/webapp/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jaas-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jetty-webapp/src/main/webapp/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jetty-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jetty-webapp/src/main/webapp/remote.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jetty-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jndi-webapp/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jndi-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jndi-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-jsp-webapp/src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-jsp-webapp">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-jsp-webapp">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/demo-spec">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/demo-spec">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-template/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="topnav">
<a class="menu" href="http://localhost:8080/">Demo Home</a>
<!-- Change source to suit -->
<a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/demos/XXX">Source</a>
<a class="menu" href="https://github.com/jetty/jetty.project/tree/jetty-10.0.x/demos/XXX">Source</a>
<a class="menu" href="https://eclipse.dev/jetty/">Jetty Project Home</a>
<a class="menu" href="https://eclipse.dev/jetty/documentation/">Documentation</a>
<a class="menu" href="https://webtide.com">Commercial Support</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion jetty-home/src/main/resources/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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/[].

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h2>information</h2>
<h2>getting&nbsp;help</h2>
<ul>
<li><a href="https://accounts.eclipse.org/mailing-list/jetty-users">Mailing lists @ eclipse</a></li>
<li><a href="https://github.com/eclipse/jetty.project">Source @ github</a></li>
<li><a href="https://github.com/jetty/jetty.project">Source @ github</a></li>
<li><a href="https://www.webtide.com/advice/">Developer Advice</a></li>
<li><a href="https://www.webtide.com/development">Custom Development</a></li>
<li><a href="https://www.webtide.com/support">Production support</a></li>
Expand Down
2 changes: 1 addition & 1 deletion jetty-osgi/test-jetty-osgi/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Loading

0 comments on commit 35903ae

Please sign in to comment.