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/05/14 21:44:22 UTC
incubator-tinkerpop git commit: Update notice/license.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 05f5114fd -> 8d32b195d
Update notice/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/8d32b195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8d32b195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8d32b195
Branch: refs/heads/master
Commit: 8d32b195ddacf13746331594e60c2c9427dc4ea8
Parents: 05f5114
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 14 15:44:03 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 14 15:44:03 2015 -0400
----------------------------------------------------------------------
LICENSE | 11 ++++++++++-
NOTICE | 6 +++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8d32b195/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6adae58..50d3838 100644
--- a/LICENSE
+++ b/LICENSE
@@ -228,4 +228,13 @@ 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.
\ No newline at end of file
+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
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8d32b195/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b288d10..5fc4962 100644
--- a/NOTICE
+++ b/NOTICE
@@ -24,8 +24,8 @@ normalize.css
Copyright (c) Nicolas Gallagher and Jonathan Neal
------------------------------------------------------------------------
-GraphMLWriterHelper.DelegatingXMLStreamWriter
-GraphMLWriterHelper.IndentingXMLStreamWriter
+DelegatingXMLStreamWriter.java
+IndentingXMLStreamWriter.java
------------------------------------------------------------------------
-Taken from Activiti - Apache 2 License - https://github.com/Activiti/Activiti
+Incorporated from Activiti - Apache 2 License - https://github.com/Activiti/Activiti
Copyright 2010-2014 Alfresco Software, Ltd.
\ No newline at end of file