Fork me on GitHub

Submitting patches

Committers

Struts uses Git so you must install git client locally and then you can clone Struts repository:

git clone https://git-wip-us.apache.org/repos/asf/struts.git    

and done!

Please remember that master branch should be used only for small fast commits, if you are working on a large change it is better to do it on dedicated branch or even via GitHub (which is preferred).

Non-committers

If you aren’t a committer you must use this link below or mirror at GitHub

git clone git://git.apache.org/struts.git struts-copy

Security patches

Please read carefully, this is very important!

If you prepared a patch to solve security issue in the Apache Struts, in the first step contact us via Security Mailing List. Don’t publish any information about possible vulnerability. Thus will allow us coordinate the work and review if the information about issue can be disclosed publicly. We don’t want to inform hackers before we can protect our users :-)

Be responsible!!!

Contributing with GitHub

Using GitHub mirror is the simplest way to contribute to the Apache Struts if you are not a member of Struts Committers group.

First you must have an account created at GitHub to be able perform the next step. If you don’t, go ahead and create one just right now! Please remember to setup SSH keys and test them!

When ready go to https://github.com/apache/struts and click Fork button in top right corner. This will fork the Apache Struts’ repository and will create your private (but public) repository with the source code.

Next step is to clone your the original repo locally

git git@github.com:apache/struts.git

This will be an origin, you cannot push changes to the origin but don’t worry, you will use your fork.

Now is time to add your fork as a remote

git remote add fork git@github.com:myusername/struts.git 

Right now you should have two remotes defined for the repo, origin and fork, use below command to confirm that

git remote -v 

Now you are ready to work with the Apache Struts’ code base. Start with switching to master branch (if not already on it)

git checkout master

now is time to fetch any changes from remote repository

git fetch
git pull

you should create a branch to keep your changes and it must be done off the master branch

git checkout -b my-branch

Do your changes and commit them to my-branch, when you’re done you can push the changes to GitHub, to your fork.

git push -u fork my-branch

If you still need to change something, please remember to comit and push changes, but this time you can use just

git push

as my-branch was already connected with remote branch.

The final step is to open a Pull Request (short: PR) against the original Apache Struts repo. Go to the Apache Struts mirror, then to Pull request and hit New Pull Request button.

If not already selected, click on compare across forks. Right now you must select from the dropdowns on right your fork and branch to compare the differences with the Apache Struts’ master branch.

Finally hit Create Pull Request button and you are done!

After your PR got accepted and merged you must clean up your local repo, please witch branch to master

git checkout master

and fetch updates from remote

git fetch -p
git pull

and now you can delete your local branch

git branch -d my-branch

and you are ready to start working on another feature/issue.

How to merge Pull Requests

This section is for committers only who want to merge incoming Pull Requests. Please remember that the repo at GitHub is read-only, we (committers) have limited rights to it.

To merge PR please add GitHub as a new remote to your local copy

git remote add github git@github.com:apache/struts.git

then you can fetch the PR locally and put it under a branch

git fetch github pull/28/head:some-branch    

where

now you can switch to this branch and test, review it

git checkout some-branch

after reviewing, switch back to the master branch and merge

git checkout master
git merge some-branch -m "WW-XXXX Merges #28 which resolves ..."

using -m you can define your own merge message, it’s a good way to link merge commit with ticket in JIRA

git branch -d some-branch

remove the branch as it isn’t needed anymore

git push

after pushing changes, asfbot will close the PR at GitHub.

Further reading

Google’s Patch Reward program

During SFHTML5 Google announced that they adding the Apache Struts project to the Google’s Security Patch Reward Program.

What does it mean?

If you prepared a patch that eliminates a security vulnerability or improves existing security mechanism you can get a bounty :-) You will find more details on the Google’s blog or under the link above, just to give you a quick guideline how does it work:

NOTE

If you are concerned that your patch can disclose a security vulnerability, instead of submitting it as a ticket, send it directly to the Struts Security team. This will give us the possibility to prepare a new release with your patch in secret.

Have fun and code!