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/02 13:40:37 UTC
incubator-tinkerpop git commit: Minor adjustments to license/notice
dev docs.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp31 93234dfc8 -> 94ca07411
Minor adjustments to license/notice dev docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/94ca0741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/94ca0741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/94ca0741
Branch: refs/heads/tp31
Commit: 94ca07411293d6d23afaebc86a183fa2868f329a
Parents: 93234df
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 2 07:40:07 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 2 07:40:07 2016 -0500
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94ca0741/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 3b1f949..8e65ed5 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -398,13 +398,14 @@ 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 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.
-To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it.
+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).
-* If the bundled file does not have a NOTICE then no changes to TinkerPop's NOTICE are required.
-* If the NOTICE of the file being bundled is NOT Apache licensed then there is no change to TinkerPop's NOTICE.
-* If the NOTICE of the file being bundled is Apache licensed then include the copyright notification in TinkerPop's
+* If the bundled file does not have a NOTICE, then no changes to TinkerPop's NOTICE are required.
+* If the NOTICE of the file being bundled is NOT Apache licensed, then there is no change to TinkerPop's NOTICE.
+* If the NOTICE of the file being bundled is Apache licensed, then include the copyright notification in TinkerPop's
NOTICE.
* If the NOTICE of the file being bundled is Apache licensed AND is an Apache Software Foundation project, then
ONLY include the portion of that NOTICE in TinkerPop's NOTICE that is unrelated to the Apache boilerplate NOTICE.