Hey Rob,
I stole that line from:
https://github.com/apache/spark/blob/master/CONTRIBUTING.md
Just stole Spark's assuming that was the Apache's words.
Can you point me to a CONTRIBUTING file that is appropriate and I will update?
Thanks,
Marko.
http://markorodriguez.com
On Feb 6, 2015, at 1:24 PM, Rob Vesse <[email protected]> wrote:
> Not sure if some of the wording here is necessary/accurate
>
> The Apache License Version 2.0 under which ASF software is licensed
> explicitly includes a Contributions clause (Clause 5):
>
> "Unless You explicitly state otherwise, any Contribution intentionally
> submitted for inclusion in the Work by You to the Licensor shall be under
> the terms and conditions of this License, without any additional terms or
> conditions. Notwithstanding the above, nothing herein shall supersede or
> modify the terms of any separate license agreement you may have executed
> with Licensor regarding such Contributions."
>
>
> See http://apache.org/licenses/LICENSE-2.0.html#contributions
>
> Which is kinda the opposite of what you've written, contributions to
> software intentionally submitted e.g. via pull request are assumed to be
> OK for inclusion unless the author explicitly states otherwise
>
> So it may be better to simply highlight this point and link to the Apache
> license in your Contributing docs
>
> Also most projects simply point to the official ASF ICLA link when
> necessary rather than replicating it in their own source tress:
>
> http://www.apache.org/licenses/#clas
>
> One of the advantages of being an Apache project is that you get to
> leverage the central infrastructure where appropriate
>
> Hope this helps,
>
> Rob
>
> On 06/02/2015 11:27, "[email protected]" <[email protected]> wrote:
>
>> Repository: incubator-tinkerpop
>> Updated Branches:
>> refs/heads/master a35f4bc22 -> 9414d4f33
>>
>>
>> updated more of the policy,txt,etc. files to reflect Apache Software
>> Foundation.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9414d4f3
>> Tree:
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9414d4f3
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9414d4f3
>>
>> Branch: refs/heads/master
>> Commit: 9414d4f33ec6b7c84e4ae810da7cd5e7d827071d
>> Parents: a35f4bc
>> Author: Marko A. Rodriguez <[email protected]>
>> Authored: Fri Feb 6 12:27:15 2015 -0700
>> Committer: Marko A. Rodriguez <[email protected]>
>> Committed: Fri Feb 6 12:27:15 2015 -0700
>>
>> ----------------------------------------------------------------------
>> .travis.yml | 2 +-
>> CLA.markdown | 31 ----------
>> CLA.txt | 138 +++++++++++++++++++++++++++++++++++++++++++++
>> CONTRIBUTING.asciidoc | 13 +++--
>> NOTICE.txt | 4 +-
>> 5 files changed, 149 insertions(+), 39 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9414d4f3/.
>> travis.yml
>> ----------------------------------------------------------------------
>> diff --git a/.travis.yml b/.travis.yml
>> index c84c87e..82c66bd 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -1,7 +1,7 @@
>> language: java
>> notifications:
>> email:
>> - - [email protected]
>> + - [email protected]
>> - [email protected]
>> - [email protected]
>> - [email protected]
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9414d4f3/C
>> LA.markdown
>> ----------------------------------------------------------------------
>> diff --git a/CLA.markdown b/CLA.markdown
>> deleted file mode 100644
>> index 786bdd8..0000000
>> --- a/CLA.markdown
>> +++ /dev/null
>> @@ -1,31 +0,0 @@
>> -# TinkerPop3
>> -
>> -## Contributor License Agreement (╲Agreement╡)
>> -
>> -Thank you for your interest in [TinkerPop](http://tinkerpop.com). In
>> order to clarify the intellectual property license granted with
>> Contributions from any person or entity, TinkerPop must have a
>> Contributor License Agreement ("CLA") on file that has been signed by
>> each Contributor, indicating agreement to the license terms below. This
>> license is for your protection as a Contributor as well as the protection
>> of TinkerPop and its users; it does not change your rights to use your
>> own Contributions for any other purpose.
>> -
>> -If you have questions about these terms, please contact us at
>> [Gremlin-Users](https://groups.google.com/forum/#!forum/gremlin-users).
>> -
>> -### Corporate Contributions:
>> -
>> -If you are employed as a software engineer, or if your employer is in
>> the business of developing software, or otherwise may claim rights in the
>> Contributions, please provide information about your employerâ•˙s policy
>> on contributing to open source projects, including the name of the
>> supervisor to contact in connection with such contributions. If no such
>> corporate entity exists, simply state "none."
>> -
>> -### You and TinkerPop agree:
>> -
>> -You accept and agree to the following terms and conditions for Your
>> present and future Contributions submitted to TinkerPop. Except for the
>> license granted herein to TinkerPop and recipients of software
>> distributed by TinkerPop, You reserve all right, title, and interest in
>> and to Your Contributions.
>> -
>> -1. Definitions. "You" (or "Your") shall mean the copyright owner or
>> legal entity authorized by the copyright owner that is making this
>> Agreement with TinkerPop. For legal entities, the entity making a
>> Contribution and all other entities that control, are controlled by, or
>> are under common control with that entity are considered to be a single
>> Contributor. For the purposes of this definition, "control" means (i) the
>> power, direct or indirect, to cause the direction or management of such
>> entity, whether by contract or otherwise, or (ii) ownership of fifty
>> percent (50%) or more of the outstanding shares, or (iii) beneficial
>> ownership of such entity. "Contribution" shall mean any original work of
>> authorship, including any modifications or additions to an existing work,
>> that is intentionally submitted by You to TinkerPop for inclusion in, or
>> documentation of, any of the products owned or managed by TinkerPop (the
>> "Work"). For the purposes of this definition, "submitted" means any form
>> of
>> electronic, verbal, or written communication sent to TinkerPop or its
>> representatives, including but not limited to communication on electronic
>> mailing lists, source code control systems, and issue tracking systems
>> that are managed by, or on behalf of, TinkerPop for the purpose of
>> discussing and improving the Work, but excluding communication that is
>> conspicuously marked or otherwise designated in writing by You as "Not a
>> Contribution."
>> -
>> -2. Grant of Copyright License. Subject to the terms and conditions of
>> this Agreement, You hereby grant to TinkerPop and to recipients of
>> software distributed by TinkerPop a perpetual, worldwide, non-exclusive,
>> no-charge, royalty-free, irrevocable copyright license to reproduce,
>> prepare derivative works of, publicly display, publicly perform,
>> sublicense, and distribute Your Contributions and such derivative works.
>> -
>> -3. Grant of Patent License. Subject to the terms and conditions of this
>> Agreement, You hereby grant to TinkerPop and to recipients of software
>> distributed by TinkerPop a perpetual, worldwide, non-exclusive,
>> no-charge, royalty-free, irrevocable (except as stated in this section)
>> patent license to make, have made, use, offer to sell, sell, import, and
>> otherwise transfer the Work, where such license applies only to those
>> patent claims licensable by You that are necessarily infringed by Your
>> Contribution(s) alone or by combination of Your Contribution(s) with the
>> Work to which such Contribution(s) was submitted. If any entity
>> institutes patent litigation against You or any other entity (including a
>> cross-claim or counterclaim in a lawsuit) alleging that your
>> Contribution, or the Work to which you have contributed, constitutes
>> direct or contributory patent infringement, then any patent licenses
>> granted to that entity under this Agreement for that Contribution or Work
>> shall terminate as o
>> f the date such litigation is filed.
>> -
>> -4. You represent that you are legally entitled to grant the above
>> license. If your employer(s) has rights to intellectual property that you
>> create that includes your Contributions, you represent that you have
>> received permission to make Contributions on behalf of that employer,
>> that your employer has waived such rights for your Contributions to
>> TinkerPop, or that your employer has executed a separate Corporate CLA
>> with TinkerPop.
>> -
>> -5. You represent that each of Your Contributions is Your original
>> creation (see section 7 for submissions on behalf of others). You
>> represent that Your Contribution submissions include complete details of
>> any third-party license or other restriction (including, but not limited
>> to, related patents and trademarks) of which you are personally aware and
>> which are associated with any part of Your Contributions.
>> -
>> -6. You are not expected to provide support for Your Contributions,
>> except to the extent You desire to provide support. You may provide
>> support for free, for a fee, or not at all. Unless required by applicable
>> law or agreed to in writing, You provide Your Contributions on an "AS IS"
>> BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>> implied, including, without limitation, any warranties or conditions of
>> TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR
>> PURPOSE.
>> -
>> -7. Should You wish to submit work that is not Your original creation,
>> You may submit it to TinkerPop separately from any Contribution,
>> identifying the complete details of its source and of any license or
>> other restriction (including, but not limited to, related patents,
>> trademarks, and license agreements) of which you are personally aware,
>> and conspicuously marking the work as "Submitted on behalf of a
>> third-party: [named here]".
>> -
>> -8. You agree to notify TinkerPop of any facts or circumstances of which
>> you become aware that would make these representations inaccurate in any
>> respect.
>> \ No newline at end of file
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9414d4f3/C
>> LA.txt
>> ----------------------------------------------------------------------
>> diff --git a/CLA.txt b/CLA.txt
>> new file mode 100644
>> index 0000000..28a899c
>> --- /dev/null
>> +++ b/CLA.txt
>> @@ -0,0 +1,138 @@
>> + The Apache Software Foundation
>> + Individual Contributor License Agreement ("Agreement") V2.0
>> + http://www.apache.org/licenses/
>> +
>> +Thank you for your interest in The Apache Software Foundation (the
>> +"Foundation"). In order to clarify the intellectual property license
>> +granted with Contributions from any person or entity, the Foundation
>> +must have a Contributor License Agreement ("CLA") on file that has
>> +been signed by each Contributor, indicating agreement to the license
>> +terms below. This license is for your protection as a Contributor as
>> +well as the protection of the Foundation and its users; it does not
>> +change your rights to use your own Contributions for any other purpose.
>> +If you have not already done so, please complete and sign, then scan
>> +and email a pdf file of this Agreement to [email protected].
>> +Alternatively, you may send it by facsimile to the Foundation at
>> ++1-919-573-9199. If necessary, send an original signed Agreement to
>> +The Apache Software Foundation, Dept. 9660, Los Angeles,
>> +CA 90084-9660, U.S.A. Please read this document carefully before
>> +signing and keep a copy for your records.
>> +
>> + Full name: ______________________________________________________
>> +
>> + (optional) Public name: _________________________________________
>> +
>> + Mailing Address: ________________________________________________
>> +
>> + ________________________________________________
>> +
>> + Country: ______________________________________________________
>> +
>> + Telephone: ______________________________________________________
>> +
>> + E-Mail: ______________________________________________________
>> +
>> + (optional) preferred Apache id(s): ______________________________
>> +
>> + (optional) notify project: ______________________________________
>> +
>> +You accept and agree to the following terms and conditions for Your
>> +present and future Contributions submitted to the Foundation. In
>> +return, the Foundation shall not use Your Contributions in a way that
>> +is contrary to the public benefit or inconsistent with its nonprofit
>> +status and bylaws in effect at the time of the Contribution. Except
>> +for the license granted herein to the Foundation and recipients of
>> +software distributed by the Foundation, You reserve all right, title,
>> +and interest in and to Your Contributions.
>> +
>> +1. Definitions.
>> +
>> + "You" (or "Your") shall mean the copyright owner or legal entity
>> + authorized by the copyright owner that is making this Agreement
>> + with the Foundation. For legal entities, the entity making a
>> + Contribution and all other entities that control, are controlled
>> + by, or are under common control with that entity are considered to
>> + be a single Contributor. For the purposes of this definition,
>> + "control" means (i) the power, direct or indirect, to cause the
>> + direction or management of such entity, whether by contract or
>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>> + outstanding shares, or (iii) beneficial ownership of such entity.
>> +
>> + "Contribution" shall mean any original work of authorship,
>> + including any modifications or additions to an existing work, that
>> + is intentionally submitted by You to the Foundation for inclusion
>> + in, or documentation of, any of the products owned or managed by
>> + the Foundation (the "Work"). For the purposes of this definition,
>> + "submitted" means any form of electronic, verbal, or written
>> + communication sent to the Foundation or its representatives,
>> + including but not limited to communication on electronic mailing
>> + lists, source code control systems, and issue tracking systems that
>> + are managed by, or on behalf of, the Foundation for the purpose of
>> + discussing and improving the Work, but excluding communication that
>> + is conspicuously marked or otherwise designated in writing by You
>> + as "Not a Contribution."
>> +
>> +2. Grant of Copyright License. Subject to the terms and conditions of
>> + this Agreement, You hereby grant to the Foundation and to
>> + recipients of software distributed by the Foundation a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + copyright license to reproduce, prepare derivative works of,
>> + publicly display, publicly perform, sublicense, and distribute Your
>> + Contributions and such derivative works.
>> +
>> +3. Grant of Patent License. Subject to the terms and conditions of
>> + this Agreement, You hereby grant to the Foundation and to
>> + recipients of software distributed by the Foundation a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + (except as stated in this section) patent license to make, have
>> + made, use, offer to sell, sell, import, and otherwise transfer the
>> + Work, where such license applies only to those patent claims
>> + licensable by You that are necessarily infringed by Your
>> + Contribution(s) alone or by combination of Your Contribution(s)
>> + with the Work to which such Contribution(s) was submitted. If any
>> + entity institutes patent litigation against You or any other entity
>> + (including a cross-claim or counterclaim in a lawsuit) alleging
>> + that your Contribution, or the Work to which you have contributed,
>> + constitutes direct or contributory patent infringement, then any
>> + patent licenses granted to that entity under this Agreement for
>> + that Contribution or Work shall terminate as of the date such
>> + litigation is filed.
>> +
>> +4. You represent that you are legally entitled to grant the above
>> + license. If your employer(s) has rights to intellectual property
>> + that you create that includes your Contributions, you represent
>> + that you have received permission to make Contributions on behalf
>> + of that employer, that your employer has waived such rights for
>> + your Contributions to the Foundation, or that your employer has
>> + executed a separate Corporate CLA with the Foundation.
>> +
>> +5. You represent that each of Your Contributions is Your original
>> + creation (see section 7 for submissions on behalf of others). You
>> + represent that Your Contribution submissions include complete
>> + details of any third-party license or other restriction (including,
>> + but not limited to, related patents and trademarks) of which you
>> + are personally aware and which are associated with any part of Your
>> + Contributions.
>> +
>> +6. You are not expected to provide support for Your Contributions,
>> + except to the extent You desire to provide support. You may provide
>> + support for free, for a fee, or not at all. Unless required by
>> + applicable law or agreed to in writing, You provide Your
>> + Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
>> + OF ANY KIND, either express or implied, including, without
>> + limitation, any warranties or conditions of TITLE, NON-
>> + INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
>> +
>> +7. Should You wish to submit work that is not Your original creation,
>> + You may submit it to the Foundation separately from any
>> + Contribution, identifying the complete details of its source and of
>> + any license or other restriction (including, but not limited to,
>> + related patents, trademarks, and license agreements) of which you
>> + are personally aware, and conspicuously marking the work as
>> + "Submitted on behalf of a third-party: [named here]".
>> +
>> +8. You agree to notify the Foundation of any facts or circumstances of
>> + which you become aware that would make these representations
>> + inaccurate in any respect.
>> +
>> +Please sign: __________________________________ Date: ________________
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9414d4f3/C
>> ONTRIBUTING.asciidoc
>> ----------------------------------------------------------------------
>> diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc
>> index 4d240a8..b19d9fa 100644
>> --- a/CONTRIBUTING.asciidoc
>> +++ b/CONTRIBUTING.asciidoc
>> @@ -1,6 +1,9 @@
>> -TinkerPop3 Contributors
>> ------------------------
>> +## Contributing to Apache TinkerPop
>>
>> -image:https://raw.githubusercontent.com/tinkerpop/tinkerpop3/master/docs/
>> static/images/tinkerpop-character.png[width=100,float=left]
>> -
>> -In order to contribute issues and pull requests, please sign TinkerPop's
>> link:https://www.clahub.com/agreements/tinkerpop/tinkerpop3[Contributor
>> License Agreement]. The purpose of this agreement is to protect users of
>> this codebase by ensuring that all code is free to use under the
>> stipulations of the
>> link:http://www.apache.org/licenses/LICENSE-2.0.html[Apache2 license].
>> +Contributions via GitHub pull requests are gladly accepted from their
>> original
>> +author. Along with any pull requests, please state that the contribution
>> is
>> +your original work and that you license the work to the project under the
>> +project's open source license. Whether or not you state this explicitly,
>> by
>> +submitting any copyrighted material via pull request, email, or other
>> means
>> +you agree to license the material under the project's open source
>> license and
>> +warrant that you have the legal authority to do so.
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9414d4f3/N
>> OTICE.txt
>> ----------------------------------------------------------------------
>> diff --git a/NOTICE.txt b/NOTICE.txt
>> index cd8a003..4dd3b23 100644
>> --- a/NOTICE.txt
>> +++ b/NOTICE.txt
>> @@ -1,5 +1,5 @@
>> -TinkerPop: A Graph Computing Framework
>> - http://tinkerpop.com
>> +Apache TinkerPop: A Graph Computing Framework
>> + http://tinkerpop.incubator.apache.org/
>>
>> TinkerPop3 directly depends on the following open source projects:
>>
>>
>
>
>
>
