[GeoNetwork-devel] GeoNetwork branches proposal

GeoNetwork GeoNetwork Developer
1

Hi

I want to propose to promote 4.x developments as the master branch, so to have the following branches:

  • master: based on the current 4.0.x branch, with 4.1.x version numbering (for a future 4.2 release).

  • 3.12.x branch: based on the current master branch, for a last release of 3.x versions. master has no many changes from 3.10.x, but there are some features, like delete history and CMIS datastore that can be relevant for certain users that can’t upgrade to 4.0 version yet.

4.0.x branch and 3.12.x will be the stable branches for both versions and PR will require to be addressed to the master branch as usual.

I’m not really sure what happens with the current open pull requests to master, but probably before doing the proposed changes will require some review / merge of the current open pull requests.

Please check for any comments about these changes, thanks.

Regards,
Jose García

···

Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: +31 (0)318 416664

Please consider the environment before printing this email.

2

+1 for me, Jose.

Maybe those changes could also be an opportunity to rename master to main ?

So next steps would be:

  1. review pending PRs

  2. create main from 4.0.x

  3. merge master in main - future 4.2.x

  4. create 3.12.x from master
    ?

Cheers.

Francois

Le lun. 1 mars 2021 à 11:44, Jose Garcia <jose.garcia@anonymised.com> a écrit :

Hi

I want to propose to promote 4.x developments as the master branch, so to have the following branches:

  • master: based on the current 4.0.x branch, with 4.1.x version numbering (for a future 4.2 release).

  • 3.12.x branch: based on the current master branch, for a last release of 3.x versions. master has no many changes from 3.10.x, but there are some features, like delete history and CMIS datastore that can be relevant for certain users that can’t upgrade to 4.0 version yet.

4.0.x branch and 3.12.x will be the stable branches for both versions and PR will require to be addressed to the master branch as usual.

I’m not really sure what happens with the current open pull requests to master, but probably before doing the proposed changes will require some review / merge of the current open pull requests.

Please check for any comments about these changes, thanks.

Regards,
Jose García

Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: +31 (0)318 416664

Please consider the environment before printing this email.

GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork

3

Hi Jose,

+1

Would be a great step forward.

Best

···

camptocamp
INNOVATIVE SOLUTIONS
BY OPEN SOURCE EXPERTS

Florent Gravin
Technical Leader - Architect
+33 4 58 48 20 36

4

Jose:

GitHub has a new ability to rename branches, so it can be easier to do your activity without disrupting pull requests to master (they will change to be pull requests to 3.12.x). GitHub actually made the change so that projects can change from master → main branch out of respect for black-lives-mater social advocacy.

I would like to recommend:

rename master → 3.12.x - this will ensure all outstanding pull requests follow over to the 3.12.x branch

rename 4.0.x → main - any open pull requests for 4.0.x will change over to main branch
change reposity settings so the default branch is main (anyone attempting to check out the project will get this branch)

···

–
Jody Garnett