Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating various old/moved URL references found across project (jetty-10.0.x) #10098

Merged
merged 13 commits into from
Jul 14, 2023
Merged

Updating various old/moved URL references found across project (jetty-10.0.x) #10098

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dae7d62
Now that the migration of `https://eclipse.org/jetty/` to `https://ec…
joakime Jul 11, 2023
4a02e22
Updating text in *.mod files
joakime Jul 12, 2023
97befa1
Revert "Updating text in *.mod files"
joakime Jul 12, 2023
e904a9e
Updating text in *.mod files
joakime Jul 12, 2023
7f0d3d9
More www.eclipse.org to eclipse.dev changes
joakime Jul 13, 2023
6a6ace9
Applying changes from review
joakime Jul 13, 2023
dfd85d5
Removing `/current/` from path `/jetty/documentation/current/`
joakime Jul 13, 2023
3406817
Fixing mailing list URL
joakime Jul 13, 2023
17d69ee
Revert change back to javadoc/jetty-10
joakime Jul 13, 2023
50eaa81
Use jetty-10 references
joakime Jul 13, 2023
25d1b3a
Updating 3-source.adoc
joakime Jul 13, 2023
d5ba4de
Updates from review
joakime Jul 14, 2023
1c28500
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/10.0.x/ne…
joakime Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions ...entation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located a
.Active Eclipse Jetty Branches
[cols="4"]
|===
| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development | Servlet 6.0 | Java 17+
| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Development | Servlet 5.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development (default branch) | Servlet 4.0 | Java 11+
| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance | Servlet 3.1 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance | Servlet 3.0 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical | Servlet 2.0 | Java 7
| https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Mythical | Servlet 1.0 | Java 6
| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | End of Community Support | Servlet 3.1 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | End of Life | Servlet 3.1 | Java 8
| jetty-8 | Historical | Servlet 3.1 | Java 6
| jetty-7 | Mythical | Servlet 2.5 | Java 5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The title of this table is "Active Eclipse Jetty Branches".

I don't think jetty-8 and jetty-7 make the grade for this table.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And even jetty-9.3.x isn't considered "Active" anymore.

|===

If you are planning on working with a specific issue within Jetty it is important to target the correct branch for a pull request. Pull requests that are targeted at Maintenance Branches are typically merged forward into subsequent branches while historical branches are left alone merge wise. Depending on the nature of an issue a historical branch may have an issue cherrypicked forward, but maintenance releases are merged wholesale forward as a matter of project policy.
Expand All @@ -52,8 +53,6 @@ Administrative pom.xml file::
https://github.com/eclipse/jetty.parent
Build related artifacts that release separately, common assembly descriptors, remote resources, etc.::
https://github.com/eclipse/jetty.toolchain
Files associated with the development of Jetty -- code styles, formatting, iplogs, etc.::
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git

[[cg-contributing-build]]
=== Maven Build
Expand Down Expand Up @@ -90,15 +89,13 @@ Jetty uses number of conventions for its source code. The developers of Jetty us

==== Intelli-J

The suggested configuration for Intelli-J when working with Jetty is available here: http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/idea-jetty-codestyle-settings.jar[Intelli-J Codestyle]
The suggested configuration for Intelli-J when working with Jetty is available in the code tree
`/build-resources/jetty-codestyle-intellij.xml`

==== Eclipse

The Eclipse format configuration can be found here:
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-java-format.xml[Eclipse Java Formatting]

There are also some templates available for Eclipse here:
http://git.eclipse.org/c/jetty/org.eclipse.jetty.admin.git/tree/jetty-eclipse-codetemplates.xml[Eclipse Code Templates]
The Eclipse format configuration can be found in the code tree
`/build-resources/jetty-codestyle-eclipse-ide.xml`

==== Code Conventions

Expand Down