On Aug 30, 2023, at 8:47 AM, Markus Karg <markus@xxxxxxxxxxxxxxx> wrote:
Understood. Would it be correct to merge release-3.1.x into master or do you see problems with that?
There are some new commits on master. We would need to verify that these commits are acceptable/compatible in a future 3.1.x release. If not, those need to be moved to the 4.x branch.
— Santiago
-Markus
Von: Alwin Joseph [mailto:alwin.joseph@xxxxxxxxxx]
Gesendet: Mittwoch, 30. August 2023 13:59
An: Jakarta Rest project developer discussions; Santiago Pericasgeertsen
Cc: Markus Karg
Betreff: Re: [rest-dev] [External] : Removing outdated branches
Hi Markus,
The branch release-3.1.x is currently being used for TCK challenges, we already released TCKs 3.1.1, 3.1.2 and 3.1.3 from the branch.
Thanks & Regards,
Alwin Joseph
From: rest-dev <rest-dev-bounces@xxxxxxxxxxx> on behalf of Markus Karg via rest-dev <rest-dev@xxxxxxxxxxx>
Date: Wednesday, 30 August 2023 at 4:54 PM
To: Santiago Pericasgeertsen <santiago.pericasgeertsen@xxxxxxxxxx>, 'Jakarta Rest project developer discussions' <rest-dev@xxxxxxxxxxx>
Cc: Markus Karg <markus@xxxxxxxxxxxxxxx>
Subject: Re: [rest-dev] [External] : Removing outdated branches
Does anybody really need *the branch* (not the content of) release-3.1.x (i. e. do we really plan to release 3.1.1 eventually)? If not, we could simply merge the sole
commit of release-3.1.x into master and then drop the branch release-3.1.x.
-Markus
Von: Santiago Pericasgeertsen [mailto:santiago.pericasgeertsen@xxxxxxxxxx]
Gesendet: Donnerstag, 24. August 2023 17:03
An: Jakarta Rest project developer discussions
Cc: James Perkins; Markus Karg
Betreff: Re: [rest-dev] [External] : Removing outdated branches
- James is correct about the SNAPSHOT problem
- We should figure out how to merge master and release-3.1.x, hence my original question. Haven’t analyzed how this can be done correctly. There have been fixes to the TCKs.
- After that, we can make release-4.0 be master
On Aug 24, 2023, at 10:55 AM, Markus Karg via rest-dev <rest-dev@xxxxxxxxxxx> wrote:
Plase don't let us reinvent the wheel.
3.1.0-SNAPSHOT would be simply wrong, as 3.1.0 is already released. So it should be 3.1.1-SNAPSHOT.
Omitting master would be confusing, as every newcomer assumes there is a master and it is the way towards the next major release.
IMHO the best we could do is merge release-4.0 into master and in turn drop release-4.0 branch.
Von: James
Perkins [mailto:jperkins@xxxxxxxxxx]
Gesendet: Donnerstag, 24. August 2023 16:27
An: Jakarta Rest project developer discussions
Cc: Markus Karg
Betreff: Re: [rest-dev] [External] : Removing outdated branches
Along these lines, the master branch seems in an odd state to me. The version is set to 3.1.0 which is really not great if you build it locally as it pollutes your local Maven repository. Especially if it does include new features. At minimum, IMO, the version
should be set to 3.1.0-SNAPSHOT. It should likely be changed to something else, but SNAPSHOT is critical.
Should we just remove the master branch and use the release-$version branches?
I have removed all branches on Github other than master, release-4.0, release-3.1.x and gh-pages.
Von: Santiago
Pericasgeertsen [mailto:santiago.pericasgeertsen@xxxxxxxxxx]
Gesendet: Donnerstag, 24. August 2023 15:14
An: Markus Karg
Cc: Jakarta Rest project developer discussions
Betreff: Re: [External] : [rest-dev] Removing outdated branches
I noticed that we piled up several outdated branches.
If nobody objects, I'd like to remove all of them but just keep the following:
I was thinking about this yesterday, so no objections. Did you check how master and release-3.1.x differ BTW?
|