| 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] IMO: - 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 — Santiago 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. -Markus Von: James Perkins [mailto:jperkins@xxxxxxxxxx] 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? On Thu, Aug 24, 2023 at 7:23 AM Markus Karg via rest-dev <rest-dev@xxxxxxxxxxx> wrote:
-- James R. Perkins JBoss by Red Hat _______________________________________________ |