You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/13 13:31:13 UTC
[26/37] incubator-tinkerpop git commit: Update docs on LICENSE/NOTICE
to mention including copies of the license.
Update docs on LICENSE/NOTICE to mention including copies of the license.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d5d78c7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d5d78c7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d5d78c7c
Branch: refs/heads/master
Commit: d5d78c7ca8e4fc91c9d11d28be906503307f198c
Parents: d6f4645
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Feb 12 12:27:32 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Feb 12 12:27:32 2016 -0500
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d5d78c7c/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index b78af98..6186c51 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -386,7 +386,8 @@ if the distribution has a file added to it. Such a situation may arise from sev
likely come from the addition of a source file from another library.
* If the file being bundled is Apache licensed, then add an entry to NOTICE.
-* If the file being bundled is under a different approved license, then add an entry to LICENSE.
+* If the file being bundled is under a different approved license, then add an entry to LICENSE and include a copy of
+that LICENSE in the root `/deps` directory of the code repository.
Binary LICENSE and NOTICE
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -399,7 +400,8 @@ distributions, either:
* target/apache-gremlin-server-x.y.z-distribution.zip
Apache licensed software does not need to be included in LICENSE, but if the new dependency is an Apache-approved
-license (e.g. BSD, MIT) then it should be added in the pattern already defined.
+license (e.g. BSD, MIT) then it should be added in the pattern already defined. A copy of the LICENSE should be
+added to the `<project>/static/deps` directory of the code repository.
To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it (typically
found in `/META-INF` directory of the jar).