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 2015/11/22 15:21:10 UTC
[2/2] incubator-tinkerpop git commit: Moved Activit out of of source
LICENSE and updated NOTICE
Moved Activit out of of source LICENSE and updated NOTICE
Per http://www.apache.org/dev/licensing-howto.html#alv2-dep - didn't realize there was a NOTICE for this previously.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6e08d186
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6e08d186
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6e08d186
Branch: refs/heads/master
Commit: 6e08d186850457bab4e15ddf603f50fd16728f41
Parents: ed007b7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Nov 22 08:58:00 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Nov 22 08:58:41 2015 -0500
----------------------------------------------------------------------
LICENSE | 11 +----------
NOTICE | 26 +++++++++++++++++++++++++-
2 files changed, 26 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e08d186/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 50d3838..6adae58 100644
--- a/LICENSE
+++ b/LICENSE
@@ -228,13 +228,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-========================================================================
-Apache 2 Licenses
-========================================================================
-
-The Apache TinkerPop project bundles the following components under the Apache 2 License:
-
- DelegatingXMLStreamWriter.java (https://github.com/Activiti/Activiti)
- IndentingXMLStreamWriter.java (https://github.com/Activiti/Activiti)
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e08d186/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 31eae00..abfebfd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,4 +2,28 @@ Apache TinkerPop
Copyright 2015 The Apache Software Foundation.
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+=======================================================================
+
+Apache TinkerPop contains subcomponents with separate copyright notices and
+license terms. Your use of the source code for the these subcomponents
+is subject to the terms and conditions of their respective licenses.
+
+See the LICENSE file for a list of subcomponents and dependencies and
+their respective licenses.
+
+========================================================================
+ NOTICE files corresponding to section 4(d) of the Apache License,
+ for bundled components and dependencies
+========================================================================
+
+------------------------------------------------------------------------
+Activiti
+------------------------------------------------------------------------
+Activiti BPM Platform
+Copyright 2010-2014 Alfresco Software, Ltd.
+
+gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
+contains DelegatingXMLStreamWriter.java and IndentingXMLStreamWriter.java from
+modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/
\ No newline at end of file