Repository: shiro Updated Branches: refs/heads/master 5a06be7f0 -> 12b599d41
Adding a CONTRIBUTING.md doc to the root This is based on the cloudstack contrib file: https://github.com/apache/cloudstack/commits/master/CONTRIBUTING.md Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/12b599d4 Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/12b599d4 Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/12b599d4 Branch: refs/heads/master Commit: 12b599d41eae969dd285bedc8e0b37fd5da086a2 Parents: 5a06be7 Author: bdemers <[email protected]> Authored: Wed Mar 16 20:20:45 2016 -0400 Committer: bdemers <[email protected]> Committed: Wed Mar 16 20:29:02 2016 -0400 ---------------------------------------------------------------------- CONTRIBUTING.md | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 2 + 2 files changed, 109 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/12b599d4/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..8f160e6 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,107 @@ +Contributing to Apache Shiro +======================================= + +Summary +------- +This document covers how to contribute to the ACS project. These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project and you will submit a Pull Request for your changes to be added. + +_Lets get started!!!_ + + +Fork the code +------------- + +In your browser, navigate to: [https://github.com/apache/shiro](https://github.com/apache/shiro) + +Fork the repository by clicking on the 'Fork' button on the top right hand side. The fork will happen and you will be taken to your own fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '**HTTPS** clone URL'. You will paste this URL when doing the following `git clone` command. + +On your computer, follow these steps to setup a local repository for working on ACS: + +``` bash +$ git clone https://github.com/YOUR_ACCOUNT/shiro.git +$ cd shiro +$ git remote add upstream https://github.com/apache/shiro.git +$ git checkout master +$ git fetch upstream +$ git rebase upstream/master +``` + + +Making changes +-------------- + +It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to rebase in changes from `upstream/master`). In this example I will assume you will be making your changes to a branch called `feature_x`. This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the ACS project. + +It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch. + +``` bash +$ git checkout -b feature_x + (make your changes) +$ git status +$ git add . +$ git commit -a -m "descriptive commit message for your changes" +``` + +> The `-b` specifies that you want to create a new branch called `feature_x`. You only specify `-b` the first time you checkout because you are creating a new branch. Once the `feature_x` branch exists, you can later switch to it with only `git checkout feature_x`. + + +Rebase `feature_x` to include updates from `upstream/master` +------------------------------------------------------------ + +It is important that you maintain an up-to-date `master` branch in your local repository. This is done by rebasing in the code changes from `upstream/master` (the official ACS project repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. I recommend you do this process periodically while you work to make sure you are working off the most recent project code. + +This process will do the following: + +1. Checkout your local `master` branch +2. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the project +3. Rebase the latest project code into your `feature_x` branch so it is up-to-date with the upstream code + +``` bash +$ git checkout master +$ git fetch upstream +$ git rebase upstream/master +$ git checkout feature_x +$ git rebase master +``` + +> Now your `feature_x` branch is up-to-date with all the code in `upstream/master`. + + +Make a GitHub Pull Request to contribute your changes +----------------------------------------------------- + +When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so. This is done by pushing your local changes to your forked repository (default remote name is `origin`) and then initiating a pull request on GitHub. + +> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/master` _before_ you do this. + +``` bash +$ git push origin master +$ git push origin feature_x +``` + +Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request. + +To initiate the pull request, do the following: + +1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/shiro](https://github.com/YOUR_ACCOUNT/shiro) +2. Click the new button called '**Compare & pull request**' that showed up just above the main area in your forked repository +3. Validate the pull request will be into the upstream `master` and will be from your `feature_x` branch +4. Enter a detailed description of the work you have done and then click '**Send pull request**' + +If you are requested to make modifications to your proposed changes, make the changes locally on your `feature_x` branch, re-push the `feature_x` branch to your fork. The existing pull request should automatically pick up the change and update accordingly. + + +Cleaning up after a successful pull request +------------------------------------------- + +Once the `feature_x` branch has been committed into the `upstream/master` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed. If you want to make additional changes, restart the process with a new branch. + +> **IMPORTANT:** Make sure that your changes are in `upstream/master` before you delete your `feature_x` and `origin/feature_x` branches! + +You can delete these deprecated branches with the following: + +``` bash +$ git checkout master +$ git branch -D feature_x +$ git push origin :feature_x +``` \ No newline at end of file http://git-wip-us.apache.org/repos/asf/shiro/blob/12b599d4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fb13002..9396980 100644 --- a/pom.xml +++ b/pom.xml @@ -243,6 +243,7 @@ <exclude>**/infinitest.filters</exclude> <!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ --> <exclude>velocity.log</exclude> + <exclude>CONTRIBUTING.md</exclude> </excludes> </configuration> </plugin> @@ -1049,6 +1050,7 @@ <exclude>**/infinitest.filters</exclude> <!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ --> <exclude>velocity.log</exclude> + <exclude>CONTRIBUTING.md</exclude> </excludes> </configuration> </plugin>
