Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed references to jetty 9 & 10 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2020-09-28 14:15:56 +02:00
parent 5e583fa9f3
commit 665c42ffe8
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/demo-jetty-webapp/src/main/webapp/index.html
View File

@ -16,9 +16,9 @@
<hr/>
<center><span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span> </center>
<h1>Welcome to Jetty 10</h1>
<h1>Welcome to Jetty</h1>
<p>
This is the Test webapp for the Jetty 10 HTTP Server and Servlet Container.
This is the Test webapp for the Jetty HTTP Server and Servlet Container.
It is configured as a jetty base directory in $JETTY_HOME/demo_base.
</p>

4
demos/demo-jetty-webapp/src/main/webapp/remote.html
View File

@ -6,9 +6,9 @@
</HEAD>
<BODY>
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="jetty_banner.gif"></A>
<h1>Welcome to Jetty 9 - REMOTE ACCESS!!</h1>
<h1>Welcome to Jetty - REMOTE ACCESS!!</h1>
<p>
This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container.
This is the Test webapp for the Jetty HTTP Server and Servlet Container.
For more information about Jetty, please visit our
<a href="http://www.eclipse.org/jetty">website</a>
or <a href="http://www.eclipse.org/jetty/documentation/current/">documentation</a>.

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

@ -29,13 +29,14 @@ First we start with how to checkout and build Jetty, then on to our general codi
The https://github.com/eclipse/jetty.project[Eclipse Jetty project] is located at https://github.com[Github] under the Eclipse Foundation https://github.com/eclipse[parent project]. There are a number of branches that are generally of interest.
.Active Eclipse Jetty Branches
[cols="3"]
[cols="4"]
|===
| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Development Branch for Jetty 10 | Java 9+
| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | Maintenance Branch for Jetty 9.4 (default branch) | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-9.3.x[jetty-9.3.x] | Maintenance Branch for Jetty 9.3 | Java 8
| https://github.com/eclipse/jetty.project/tree/jetty-8.1.x[jetty-8.1.x] | Historical Branch for Jetty 8 | Java 7
https://github.com/eclipse/jetty.project/tree/jetty-7[jetty-7] | Historical Branch for Jetty 7 | Java 6
| 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-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
|===
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.

2
jetty-home/src/main/resources/modules/demo.d/root/index.html
View File

@ -3,7 +3,7 @@
<META http-equiv="Pragma" content="no-cache">
<META http-equiv="Cache-Control" content="no-cache,no-store">
<META HTTP-EQUIV="Content-Script-Type" CONTENT="text/javascript">
<title>Welcome to Jetty-9</title>
<title>Welcome to Jetty 10</title>
<style type="text/css" title="jetty">
@import url(jetty.css);
</style>