| [jaxrs-dev] Github Branches |
FYI - According to our discussion of last week: I have renamed the branch EE4J_8 to 2.1-Maintenance. I have created the branch 3.1-SNAPSHOT from the branch master . As master shall actually contain work towards 3.0-SNAPSHOT next I will cherry-pick changes from 2.1-Maintenance to master, and remove the Java SE Bootstrap API from it. Regards -Markus I agree with Bill and Christian - I would like to keep the branch around, but I am fine with renaming the branch to â2.1-Maintenanceâ as Markus proposed. Thanks, Andy On Sat, Dec 21, 2019 at 2:32 PM Bill Shannon <bill.shannon@xxxxxxxxxx> wrote: In my opinion, the simplest approach for most projects is to do the work for the currently under development release on the master branch, and reserve other branches for either work supporting previous releases (maintenance) or work for future releases. Markus KARG wrote on 12/21/19 4:38 AM: Yes that is possible, it is simply no technical problem, just time to invest to juggle with the commits. What do you try to reach? We certainly can do that, but what benefit do you expect from it? -Markus Von: Bill Shannon [mailto:bill.shannon@xxxxxxxxxx]  I'm not a git expert, but... Markus KARG wrote on 12/20/19 6:58 AM: (1) There is no need to actually keep a branch for that purpose, as you can easily reconstruct it from the corresponding tag (git checkout -b <NEW-BRANCH> 2.1.6), as branches are for active development, while tags are for archived streams. BTW, note that "-1" means that we MUST NOT remove that branch even if all other contributors would be +1 (e. g. due to that simple git trick), so I'd like to ask if you really mean "-1" or "0" (i. e. "I would like to keep it, but I do not stand in the way of the majority"). Thanks. -Markus  Von: jaxrs-dev-bounces@xxxxxxxxxxx [mailto:jaxrs-dev-bounces@xxxxxxxxxxx] Im Auftrag von Andy McCright  (1) -1  I would like to keep that branch around in case we need to do another point release. This should only mean very minor changes to the spec doc or javadoc, etc, but if we do need to make a correction, it will be a lot easier if the branch is still there.  (2) +1  Thanks!  On Fri, Dec 20, 2019 at 5:21 AM Markus KARG <markus@xxxxxxxxxxxxxxx> wrote: Committers,  (1) The EE4J PMC agreed that we may delete the EE4J_8 branch, as Jakarta EE 8 was published there is no more use of that branch. We need to take care that everything in that branch is also found in the master branch.  (2) As the master branch contains new features, it is targeting v3.1. As we need to provide a v3.0 for Jakarta EE 9, I propose we create a new branch "3.0-SNAPSHOT" for that purpose (we cannot call it "3.0" because it would interfer with tag names) as a branch off master and removing the new features manually.  If nobody objects, I will perform these changes in my X-mas holidays.  Vote, please. :-)  -Markus |