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.

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

migrate documentation to Antora (jetty-11.0.x) #11738

Merged
merged 1 commit into from May 20, 2024

Conversation

mojavelinux
Copy link
Contributor

No description provided.

@olamy
Copy link
Member

olamy commented May 7, 2024

we might not need this as it's already done with #11739
we usually merge jetty-10.0.x to jetty-11.0.x

@mojavelinux
Copy link
Contributor Author

I strongly advise that you do not try to merge across branches in this case. There are subtleties in the migration of the content that cannot be captured by forward porting the PR. It will introduce irreversible and difficult to track problems. Each PR needs to be merged independently.

@joakime
Copy link
Contributor

joakime commented May 7, 2024

That's not how we do things.
Jetty 10 gets merged to 11.
11 gets merged to 12.0.0
And soon 12.0.0 to 12.1.0

@sbordet sbordet self-requested a review May 7, 2024 16:49
@mojavelinux
Copy link
Contributor Author

Well, it's asking for trouble. That's because this isn't a normal code change. We are taking files in a branch, migrating them to a different structure and rewriting references, then putting them back into the branch in the new location. If you want to try to merge across branches, I can't stand in the way, but I also can't be responsible for the result.

@joakime
Copy link
Contributor

joakime commented May 7, 2024

I'm totally on board with "be careful" (the "don't do it" option isn't even on the table IMO)

@mojavelinux
Copy link
Contributor Author

Sorry, but you are just not understanding.

@mojavelinux mojavelinux force-pushed the jetty-11.0.x-for-antora branch 3 times, most recently from dfe2f82 to 15c0cb0 Compare May 13, 2024 19:36
@mojavelinux mojavelinux force-pushed the jetty-11.0.x-for-antora branch 3 times, most recently from 4297d3d to 631670d Compare May 16, 2024 22:38
@sbordet sbordet marked this pull request as ready for review May 20, 2024 22:25
@sbordet sbordet merged commit 3c6379b into jetty:jetty-11.0.x May 20, 2024
6 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants