Index: xdocs/legal/drafts/process-draft.xml =================================================================== --- xdocs/legal/drafts/process-draft.xml (revision 676819) +++ xdocs/legal/drafts/process-draft.xml (working copy) @@ -31,14 +31,26 @@ intended for those who are interested as to what the ASF do to manage the ownership of their products.

+
Contributions +

+Contributions are covered by the Apache License. See its clear +Definitions of the terms +"Contribution" and "Contributor" and the condition +"Submission of Contributions". +As explained there, if a submission is intended to be "Not a Contribution", then +it needs to be conspicuously marked as such and the issue trackers provide a +mechanism. +

+
+
Incoming code

Source code enters the foundation in one of the following ways:

  1. An existing third party project joining Apache
  2. A large one off code contribution
  3. Repeated contributions applied directly to the source
  4. -
  5. Patches applied to issue trackers
  6. -
  7. Small patches submitted to the mailing list
  8. +
  9. Patches contributed via the issue trackers
  10. +
  11. Small patches contributed via the mailing lists.

Each of these methods has its own process:

    @@ -49,8 +61,8 @@ IP Clearance page.
  1. Individuals who want to directly contribute to the project sign a Individual Contributor License Agreement (CLA). Sometimes they and their employer will also want to sign a separte Corporate CLA with the ASF, depending on the situation. Usually these contributions take the effect of commits to the source code repository, another example is for access to updating the website through a content management system.
  2. -
  3. Patches to the JIRA issue trackers contain a checkbox that users must check to 'Grant license to ASF for inclusion in ASF works'. Developers using the Bugzilla issue tracker have to check for this .
  4. -
  5. Mailing list patches are applied and expected to be simple. The same applies for inline comments in the issue trackers, or any other form of conversation. None of these tools easily support complex patches.
  6. +
  7. Patches provided via the JIRA issue trackers contain a checkbox that users must check to 'Grant license to ASF for inclusion in ASF works'. Developers using the Bugzilla issue tracker have to check for this.
  8. +
  9. Patches contributed via mailing lists are expected to be simple. The same applies for inline comments in the issue trackers, or any other form of conversation. None of these tools easily support complex patches.

No matter how the code gets in, when it hits the source code repository an email is sent out to the mailing list in charge of that repository detailing the change. At which point the relevant Project Management Committee (PMC) are able to review the code. In some rare cases review-then-commit is used instead of commit-then-review and the patch has already been reviewed prior to committing.