Hi,
The proposed changes sound good to me. Regarding the "release-5.0"
branch, it depends more on whether we have the development there and keep the main branch for a possible (4.0.1) service release if needed, or we create the service release branch from 4.0.0 tag and have the main for 5.0. Both options look equally good.
-
The release branch has some special rules, but those may not be needed for 5.0, yet as there is plenty of time
-
The main for the 5.0 might be more intuitive for the community
Thanks,
Jan
From: rest-dev <rest-dev-bounces@xxxxxxxxxxx> on behalf of Jim Krueger via rest-dev <rest-dev@xxxxxxxxxxx>
Sent: Monday, May 6, 2024 3:12 PM
To: Santiago Pericasgeertsen <santiago.pericasgeertsen@xxxxxxxxxx>
Cc: Jim Krueger <jckofbyron@xxxxxxxxx>; Jakarta Rest project developer discussions <rest-dev@xxxxxxxxxxx>
Subject: Re: [rest-dev] [External] : Moving forward from Jakarta Rest 4.0 (vote/opinions wanted)
Thanks, Here is an updated plan for our branches. Any other comments/suggestions?
- main: To be updated with release and version commits (Arjan, is this something you wouldn’t mind doing?) Branch to be used for forward development.
- 4.0.0: To be renamed 4.0.x-RELEASE per Arjan’s suggestion.
- release-5.0: To be determined if it is needed as a working branch for @Context deprecation. Potentially all changes could be moved to main going forward.
- Release-4.0: To be renamed to release-4.0-relic and potentially removed in near future.
Branches to be removed:
On May 6, 2024, at 7:45 AM, Santiago Pericasgeertsen <santiago.pericasgeertsen@xxxxxxxxxx> wrote:
Jim,
On May 3, 2024, at 10:30 AM, Jim Krueger via rest-dev <rest-dev@xxxxxxxxxxx> wrote:
Hi,
First a big thanks to everyone who helped to get Jakarta Rest 4.0 out for EE11!!
Yes, indeed!
Now that most everything is done it is time to move on. Here is a tentative plan for our branches. Do others agree or have other suggestions?
Current Branches:
- main (currently used for 4.0 release, with no updates since)
- 4.0.0 (This branch was apparently automatically created by eclipse when the release went to ballot? I assume it is to be used as a service branch for 4.0? )
Yes.
- release-4.0 (Was the original branch used when the plan was to remove @Context injection and is now obsolete)
- 4.0.0-M1 (an attempt made by me back in December and never delivered or made official)
- 4.0.0-M2 (another attempt by me and never delivered or made official)
- release-5.0 (working branch containing the start of work to deprecate @Context and other items for Jakarta Rest 5.0)
Option for moving forward:
- main (to be used for forward development)
- 4.0.0 (This is presumably the service release branch)
- 4.0.0-M1 (remove)
- 4.0.0-M2 (remove)
- release-4.0 (Rename to “release-4.0-relic”: Likely none of the content in this branch is useful at this point, but probably good to retain for a while in case)
- release-5.0 (move relevant changes to main branch and remove, avoiding dual maintenance with main)
I agree. We should do this ASAP and redirect any relevant PRs in flight to the new branches, if necessary.
— Santiago
|