Merge jetty-11.0.x into jetty-12.0.x - July 14
#10108
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…y-10.0.x`) (#10098) * Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project + Updated URLs in poms + Added more URIs to XmlConfiguration + Updated URLs in module files + Updated URLs in documentation + Updated URLs in HTML + Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`) + Updating text in *.mod files + Removing `/current/` from path `/jetty/documentation/current/` + Fixing mailing list URL --------- Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
reviewed
Jul 14, 2023
jetty-core/jetty-util/src/main/config/modules/console-capture.mod
Outdated
Show resolved
Hide resolved
jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
Outdated
Show resolved
Hide resolved
| <a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp">Source</a> | ||
| <a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a> | ||
| <a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a> | ||
| <a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/demos/demo-jsp-webapp">Source</a> |
There was a problem hiding this comment.
Is this change correct? It lost ee10 references.
There was a problem hiding this comment.
Still missing the ee10 reference.
joakime
commented
Jul 14, 2023
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html
Outdated
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html
Outdated
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/remote.html
Outdated
Show resolved
Hide resolved
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/rewrite/info.html
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/rewrite/info.html
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html
Outdated
Show resolved
Hide resolved
sbordet
reviewed
Jul 14, 2023
jetty-core/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlParser.java
Outdated
Show resolved
Hide resolved
...e9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java
Outdated
Show resolved
Hide resolved
sbordet
requested changes
Jul 14, 2023
| <a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp">Source</a> | ||
| <a class="menu" href="https://www.eclipse.org/jetty/">Jetty Project Home</a> | ||
| <a class="menu" href="https://www.eclipse.org/jetty/documentation/current/">Documentation</a> | ||
| <a class="menu" href="https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/demos/demo-jsp-webapp">Source</a> |
There was a problem hiding this comment.
Still missing the ee10 reference.
sbordet
approved these changes
Jul 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a merge from
jetty-11.0.xintojetty-12.0.x.This merge has to be a PR as now branch
jetty-12.0.xis protected from direct push.