...
https://gitbox.apache.org/repos/asf/ofbiz-framework.git https://gitbox.apache.org/repos/asf/ofbiz-plugins.git https://gitbox.apache.org/repos/asf/ofbiz-site.git https://gitbox.apache.org/repos/asf/ofbiz-tools.git
Github (
...
official mirrors of the ASF Gitbox repositories)
Synced with Gitbox, can be forked, and PRs can be made
...
release16.11 and previous releases
...
- Communicate with ASF Infra team to enable write access in the above repositories.
- After successful migration to Git, mark the SVN repository as read-only
- PR can be asked but we have still to discuss if we want that to be used. I believe the Jira way should be still the official way. Clarification in progress, see
Jira server ASF JIRA columns key,summary,type,created,updated,due,assignee,reporter,priority,status,resolution serverId 5aa69414-a9e9-3523-82ec-879b028fb15b key OFBIZ-11301
Workflow
As nicely explained by Taher Alkhateeb in the mail thread, here details on workflow.
...
You do your work, diff it, and attach the patch to a JIRA and request a commit from one of the committers. As explained in Contributing via Git and Github - WIP
Large Features
For large features usually multiple people need to collaborate on a separate branch. Here is where git shines and the distributed model kicks in:
1. A JIRA is created for a large feature.
2. The team (not necessarily having a committer) creates a remote repository which itself may have many branches with the master branch having all the work agreed upon and merged (actually, rebased)
3. The collaboration for this branch happens in the JIRA including discussions, comments, and even links to the commits, etc ...
4. A request is made to the project, to make a pull request from the repository after reaching a certain milestone with consensus from the community of course.
5. Here, for extra safety, the branch model may have a trunk and a develop branches. Everything is pulled to the develop branch and trickles down to the master branch after thorough and proper testing.
The above workflow can also adhere to the now famous Vincent Driessen git branching model found here -> http://nvie.com/posts/a-successful-git-branching-model/
Buildbot configuration with Git (Build Scripts)
- We should make sure the buildbots are enabled on the commits for the above mentioned repositorygit repositories. I have created
for that. Addressed inJira server ASF JIRA serverId 5aa69414-a9e9-3523-82ec-879b028fb15b key INFRA-19443
Revert workflow
The git revert command can use be revert a commit, more details can be found here.
...
- All the releases are branches in the repository of Git, we can write similar script mergefromtrunk.sh(bat) and mergefromplugins.sh(bat) See
Jira server ASF JIRA columns key,summary,type,created,updated,due,assignee,reporter,priority,status,resolution serverId 5aa69414-a9e9-3523-82ec-879b028fb15b key OFBIZ-11297
Release management
We will have a branch for the release management, currently we have three branches in https://github.com/apache/ofbiz-framework/
...
- Update the information related to Git on OFBiz website. See
Jira server ASF JIRA columns key,summary,type,created,updated,due,assignee,reporter,priority,status,resolution serverId 5aa69414-a9e9-3523-82ec-879b028fb15b key OFBIZ-11269
https://ofbiz.apache.org/source-repositories.html - Update the information related to Git to OFBiz tutorials
OFBiz Tutorial - A Beginners Development Guide - Update https://projects.apache.org/project.html?ofbiz We now need to move from svnpubsub to gitpubsub
Jira server ASF JIRA serverId 5aa69414-a9e9-3523-82ec-879b028fb15b key OFBIZ-11268
...