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 2017/02/27 12:05:06 UTC
[1/3] tinkerpop git commit: Update NOTICE copyright year to 2017 CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master c5b9680e7 -> 2e64a9521
Update NOTICE copyright year to 2017 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a20df21
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a20df21
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a20df21
Branch: refs/heads/master
Commit: 6a20df21a26cd0700eafd7a3bb76c6b2e48bc578
Parents: 2e62809
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Feb 27 07:04:02 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Feb 27 07:04:02 2017 -0500
----------------------------------------------------------------------
NOTICE | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a20df21/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 38cc440..4285c37 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache TinkerPop (incubating)
-Copyright 2015-2016 The Apache Software Foundation.
+Copyright 2015-2017 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a20df21/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index da608d0..b536369 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -1,5 +1,5 @@
Apache TinkerPop (incubating)
-Copyright 2015-2016 The Apache Software Foundation.
+Copyright 2015-2017 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a20df21/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index 4833ad5..32463ff 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -1,5 +1,5 @@
Apache TinkerPop (incubating)
-Copyright 2015-2016 The Apache Software Foundation.
+Copyright 2015-2017 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[3/3] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2e64a952
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2e64a952
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2e64a952
Branch: refs/heads/master
Commit: 2e64a95219150169e91757e13f005bac3b7297d0
Parents: c5b9680 de38c6d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Feb 27 07:04:57 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Feb 27 07:04:57 2017 -0500
----------------------------------------------------------------------
NOTICE | 4 ++--
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e64a952/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index 81ee6a5,4285c37..ea814f4
--- a/NOTICE
+++ b/NOTICE
@@@ -12,14 -12,4 +12,14 @@@ Copyright 2010-2014 Alfresco Software,
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/
+https://github.com/Activiti/Activiti/tree/activiti-5.16/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter
+
+------------------------------------------------------------------------
+Apache Kerby
+------------------------------------------------------------------------
+Apache Kerby
+Copyright 2015-2016 The Apache Software Foundation
+
+gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
+from
- https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
++https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0-RC2/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
[2/3] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by sp...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de38c6d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de38c6d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de38c6d0
Branch: refs/heads/master
Commit: de38c6d085259414c5551053d12fa7ea40bddba4
Parents: d62495b 6a20df2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Feb 27 07:04:42 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Feb 27 07:04:42 2017 -0500
----------------------------------------------------------------------
NOTICE | 2 +-
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de38c6d0/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de38c6d0/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------