svn commit: r1715797 - /incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html

[sp...@apache.org]

Author: spmallette
Date: Mon Nov 23 13:06:16 2015
New Revision: 1715797

URL: http://svn.apache.org/viewvc?rev=1715797&view=rev
Log:
Updated TinkerPop dev docs with revised license/notice info.

Modified:
    incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html

Modified: incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html
URL: http://svn.apache.org/viewvc/incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html?rev=1715797&r1=1715796&r2=1715797&view=diff
==============================================================================
--- incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html (original)
+++ incubator/tinkerpop/site/docs/3.1.1-SNAPSHOT/dev/developer/index.html Mon Nov 23 13:06:16 2015
@@ -821,6 +821,12 @@ span.line-numbers { border-right: 1px so
 </ul>
 </li>
 <li><a href="#dependencies">Dependencies</a></li>
+<li>
+<ul class="sectlevel3">
+<li><a href="#_source_license_and_notice">Source LICENSE and NOTICE</a></li>
+<li><a href="#_binary_license_and_notice">Binary LICENSE and NOTICE</a></li>
+</ul>
+</li>
 <li><a href="#documentation">Documentation</a></li>
 </ul>
 </li>
@@ -1556,15 +1562,27 @@ and its distribution.</p>
 </li>
 </ul>
 </div>
+<div class="sect3">
+<h4 id="_source_license_and_notice">Source LICENSE and NOTICE</h4>
 <div class="paragraph">
-<p>As we don&#8217;t usually include any dependencies in the source distribution (i.e. the source zip distribution), there is
+<p>As dependencies are not typically added to the source distribution (i.e. the source zip distribution), there is
 typically no need to edit source LICENSE/NOTICE when editing a TinkerPop <code>pom.xml</code>. These files only need to be edited
 if the distribution has a file added to it.  Such a situation may arise from several scenarios, but it would most
-likely come from the addition of a source file from another library. In that case, edit LICENSE to include this file
-following the pattern already present there. Refer to the
-<a href="http://www.apache.org/dev/licensing-howto.html#mod-notice">Modifications to Notice</a> section from the Apache
-"how-to" to determine if changes are necessary there.</p>
+likely come from the addition of a source file from another library.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If the file being bundled is Apache licensed, then add an entry to NOTICE.</p>
+</li>
+<li>
+<p>If the file being bundled is under a different approved license, then add an entry to LICENSE.</p>
+</li>
+</ul>
+</div>
 </div>
+<div class="sect3">
+<h4 id="_binary_license_and_notice">Binary LICENSE and NOTICE</h4>
 <div class="paragraph">
 <p>The binary LICENSE/NOTICE is perhaps most impacted by changes to the various <code>pom.xml</code> files. After altering the
 <code>pom.xml</code> file of any module, build both Gremlin Console and Gremlin Server and examine the contents of both binary
@@ -1581,14 +1599,33 @@ distributions, either:</p>
 </ul>
 </div>
 <div class="paragraph">
-<p>There is a <em>near</em> one-to-one mapping between the jar files in those distributions and their respective LICENSE files.
-It is described as "near" because the distributions include TinkerPop jars which don&#8217;t need to be represented there
-and there are entries in LICENSE that refer to libraries that are present, but shaded in the gremlin-shaded module.
-Everything else should be listed and present under the appropriate license section.</p>
+<p>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.</p>
 </div>
 <div class="paragraph">
-<p>There is also a good chance that the TinkerPop binary NOTICE should be updated. Check if the newly added dependency
-contains a NOTICE of its own. If so, include that NOTICE in the TinkerPop NOTICE.</p>
+<p>To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If the NOTICE of the file being bundled is NOT Apache licensed then there is no change to TinkerPop&#8217;s NOTICE.</p>
+</li>
+<li>
+<p>If the NOTICE of the file being bundled is Apache licensed then include the copyright notification in TinkerPop&#8217;s
+NOTICE.</p>
+</li>
+<li>
+<p>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&#8217;s NOTICE that is unrelated to the Apache boilerplate NOTICE.
+If there is no such portion that is different than the boilerplate then this NOTICE can be excluded (i.e. don&#8217;t
+alter TinkerPop&#8217;s NOTICE at all).</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Please refer to the <a href="http://www.apache.org/dev/licensing-howto.html#mod-notice">Modifications to Notice</a> section
+of the Apache "Licensing How-to" for more information.</p>
+</div>
 </div>
 </div>
 <div class="sect2">
@@ -2246,7 +2283,7 @@ roadmap:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-11-21 06:28:53 -05:00
+Last updated 2015-11-23 08:02:14 -05:00
 </div>
 </div>
 </body>