You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/09/03 19:52:12 UTC

[45/50] [abbrv] incubator-tinkerpop git commit: Updates to binary LICENSE/NOTICE.

Updates to binary LICENSE/NOTICE.

Not sure why there were so many reference to libs that weren't actually bundled.  Also did some alphabetizing according to how file name in the binary distribution /lib directory.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/5a381391
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5a381391
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5a381391

Branch: refs/heads/blvp
Commit: 5a381391031c2756bf0927f4246e20e220306f8d
Parents: bce3e8b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 3 06:50:26 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 3 06:50:26 2015 -0400

----------------------------------------------------------------------
 gremlin-console/src/main/LICENSE | 36 ++++++--------
 gremlin-console/src/main/NOTICE  | 59 +++++++----------------
 gremlin-server/src/main/LICENSE  | 33 +++++--------
 gremlin-server/src/main/NOTICE   | 90 ++++++++---------------------------
 4 files changed, 62 insertions(+), 156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a381391/gremlin-console/src/main/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/LICENSE b/gremlin-console/src/main/LICENSE
index 7b7a146..e124a3a 100644
--- a/gremlin-console/src/main/LICENSE
+++ b/gremlin-console/src/main/LICENSE
@@ -207,35 +207,30 @@ Apache 2.0 Licenses
 
 The Apache TinkerPop project bundles the following components under the Apache 2.0 License:
 
-     HPPC Collections (com.carrotsearch:hppc - http://labs.carrotsearch.com/hppc.html/hppc)
-     JUnitBenchmarks (com.carrotsearch:junit-benchmarks - http://labs.carrotsearch.com/junit-benchmarks.html)
-     Metrics Core (com.codahale.metrics:metrics-core - http://metrics.codahale.com/metrics-core/)
-     Ganglia Integration for Metrics (com.codahale.metrics:metrics-ganglia - http://metrics.codahale.com/metrics-ganglia/)
-     Graphite Integration for Metrics (com.codahale.metrics:metrics-graphite - http://metrics.codahale.com/metrics-graphite/)
-     Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations - http://wiki.fasterxml.com/JacksonHome)
-     Jackson-core (com.fasterxml.jackson.core:jackson-core - http://wiki.fasterxml.com/JacksonHome)
-     jackson-databind (com.fasterxml.jackson.core:jackson-databind - http://wiki.fasterxml.com/JacksonHome)
      Commons BeanUtils (commons-beanutils:commons-beanutils - http://commons.apache.org/beanutils/)
      Commons Codec (commons-codec:commons-codec - http://commons.apache.org/codec/)
      Commons Collections (commons-collections:commons-collections - http://commons.apache.org/collections/)
      Apache Commons Configuration (commons-configuration:commons-configuration - http://commons.apache.org/configuration/)
-     Commons IO (commons-io:commons-io - http://commons.apache.org/io/)
      Commons Lang (commons-lang:commons-lang - http://commons.apache.org/lang/)
+     Apache Commons Lang (org.apache.commons:commons-lang3 - http://commons.apache.org/proper/commons-lang/)
      Commons Logging (commons-logging:commons-logging - http://commons.apache.org/logging)
-     Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
-     Apache Log4j (log4j:log4j - http://logging.apache.org/log4j/1.2/)
      ezmorph (net.sf.ezmorph:ezmorph - http://ezmorph.sourceforge.net)
-     json-lib (net.sf.json-lib:json-lib - http://json-lib.sourceforge.net)
-     Neko HTML (net.sourceforge.nekohtml:nekohtml - http://nekohtml.sourceforge.net/)
-     Apache Commons Lang (org.apache.commons:commons-lang3 - http://commons.apache.org/proper/commons-lang/)
+     GBench (org.gperfutils:gbench - https://github.com/gperfutils/gbench)
+     GProf (org.gperfutils:gprof - https://github.com/gperfutils/gprof)
+     Groovy (org.codehaus.groovy:groovy-all - http://groovy.codehaus.org/)
+     HPPC Collections (com.carrotsearch:hppc - http://labs.carrotsearch.com/hppc.html/hppc)
      HttpClient (org.apache.httpcomponents:httpclient - http://hc.apache.org/httpcomponents-client)
      HttpCore (org.apache.httpcomponents:httpcore - http://hc.apache.org/httpcomponents-core-ga)
-     Apache Ivy (org.apache.ivy:ivy - http://ant.apache.org/ivy/)
-     Groovy (org.codehaus.groovy:groovy-all - http://groovy.codehaus.org/)
      HTTP client framework for Groovy (org.codehaus.groovy.modules.http-builder:http-builder - http://groovy.codehaus.org/modules/http-builder/)
-     GBench (org.gperfutils:gbench - https://github.com/gperfutils/gbench)
-     GProf (org.gperfutils:gprof - https://github.com/gperfutils/gprof)
+     Apache Ivy (org.apache.ivy:ivy - http://ant.apache.org/ivy/)
+     Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations - http://wiki.fasterxml.com/JacksonHome)
+     Jackson-core (com.fasterxml.jackson.core:jackson-core - http://wiki.fasterxml.com/JacksonHome)
+     jackson-databind (com.fasterxml.jackson.core:jackson-databind - http://wiki.fasterxml.com/JacksonHome)
      javatuples (org.javatuples:javatuples - http://www.javatuples.org)
+     json-lib (net.sf.json-lib:json-lib - http://json-lib.sourceforge.net)
+     Apache Log4j (log4j:log4j - http://logging.apache.org/log4j/1.2/)
+     Neko HTML (net.sourceforge.nekohtml:nekohtml - http://nekohtml.sourceforge.net/)
+     Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
      SnakeYAML (org.yaml:snakeyaml - http://www.snakeyaml.org)
      Xerces2 Java Parser (xerces:xercesImpl - http://xerces.apache.org/xerces2-j)
      XML Commons External Components XML APIs (xml-apis:xml-apis - http://xml.apache.org/commons/components/external/)
@@ -247,8 +242,7 @@ BSD-style Licenses
 
 The Apache TinkerPop project bundles the following components under the BSD License:
 
-     Hamcrest All (org.hamcrest:hamcrest-all - https://github.com/hamcrest/JavaHamcrest/hamcrest-all)
-     Hamcrest Core (org.hamcrest:hamcrest-core - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
+     jBCrypt (org.mindrot:jbcrypt - https://github.com/jeremyh/jBCrypt)
      jcabi-log (com.jcabi:jcabi-log - http://www.jcabi.com/jcabi-log)
      jcabi-manifests (com.jcabi:jcabi-manifests - http://www.jcabi.com/jcabi-manifests)
      JLine (jline:jline - http://nexus.sonatype.org/oss-repository-hosting.html/jline)
@@ -286,11 +280,9 @@ MIT Licenses
 
 The Apache TinkerPop project bundles the following components under the MIT License:
 
-     Mockito (org.mockito:mockito-all - http://www.mockito.org)
      JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j - http://www.slf4j.org)
      SLF4J API Module (org.slf4j:slf4j-api - http://www.slf4j.org)
      SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12 - http://www.slf4j.org)
-     gmetric4j (info.ganglia.gmetric4j:gmetric4j - http://github.com/ganglia/gmetric4j)
 
 All rights reserved.
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a381391/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index c9a45e7..9900dd7 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -67,15 +67,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------
-Commons IO
-------------------------------------------------------------------------
-Apache Commons IO
-Copyright 2002-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-------------------------------------------------------------------------
 Commons Lang
 ------------------------------------------------------------------------
 Apache Commons Lang
@@ -97,6 +88,17 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------
+Groovy
+------------------------------------------------------------------------
+Groovy Language
+Copyright 2003-2015 The respective authors and developers
+Developers and Contributors are listed in the project POM file
+and Gradle build file
+
+This product includes software developed by
+The Groovy community (http://groovy.codehaus.org/).
+
+------------------------------------------------------------------------
 Http Components Client
 ------------------------------------------------------------------------
 Apache HttpComponents Client
@@ -118,17 +120,6 @@ This project contains annotations derived from JCIP-ANNOTATIONS
 Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
 
 ------------------------------------------------------------------------
-Groovy
-------------------------------------------------------------------------
-Groovy Language
-Copyright 2003-2015 The respective authors and developers
-Developers and Contributors are listed in the project POM file
-and Gradle build file
-
-This product includes software developed by
-The Groovy community (http://groovy.codehaus.org/).
-
-------------------------------------------------------------------------
 Java Tuples
 ------------------------------------------------------------------------
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
@@ -146,12 +137,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 ------------------------------------------------------------------------
-Hamcrest
-------------------------------------------------------------------------
-Copyright (c) 2000-2015 www.hamcrest.org
-All rights reserved.
-
-------------------------------------------------------------------------
 Log4j
 ------------------------------------------------------------------------
 This product includes software developed by
@@ -195,23 +180,17 @@ Copyright (c) 2002-2012, the original author or authors.
 All rights reserved.
 
 ------------------------------------------------------------------------
-Mockito
-------------------------------------------------------------------------
-Copyright (c) 2007 Mockito contributors
-
-------------------------------------------------------------------------
-gmetric4j
-------------------------------------------------------------------------
-Copyright (C) 2010-2015 Daniel Pocock <da...@pocock.com.au>
-Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
-
-------------------------------------------------------------------------
 SLF4j
 ------------------------------------------------------------------------
 Copyright (c) 2004-2007 QOS.ch
 All rights reserved.
 
 ------------------------------------------------------------------------
+jBCrypt
+------------------------------------------------------------------------
+Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
+
+------------------------------------------------------------------------
 Xerces
 ------------------------------------------------------------------------
 Apache Xerces Java
@@ -435,8 +414,4 @@ Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
        * LICENSE:
          * license/LICENSE.aalto-xml.txt (Apache License 2.0)
        * HOMEPAGE:
-         * http://wiki.fasterxml.com/AaltoHome
-
-
-
-
+         * http://wiki.fasterxml.com/AaltoHome
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a381391/gremlin-server/src/main/LICENSE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/LICENSE b/gremlin-server/src/main/LICENSE
index 1d41e61..e4e5bca 100644
--- a/gremlin-server/src/main/LICENSE
+++ b/gremlin-server/src/main/LICENSE
@@ -207,28 +207,22 @@ Apache 2.0 Licenses
 
 The Apache TinkerPop project bundles the following components under the Apache 2.0 License:
 
-     HPPC Collections (com.carrotsearch:hppc - http://labs.carrotsearch.com/hppc.html/hppc)
-     JUnitBenchmarks (com.carrotsearch:junit-benchmarks - http://labs.carrotsearch.com/junit-benchmarks.html)
-     Metrics Core (com.codahale.metrics:metrics-core - http://metrics.codahale.com/metrics-core/)
-     Ganglia Integration for Metrics (com.codahale.metrics:metrics-ganglia - http://metrics.codahale.com/metrics-ganglia/)
-     Graphite Integration for Metrics (com.codahale.metrics:metrics-graphite - http://metrics.codahale.com/metrics-graphite/)
-     Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations - http://wiki.fasterxml.com/JacksonHome)
-     Jackson-core (com.fasterxml.jackson.core:jackson-core - http://wiki.fasterxml.com/JacksonHome)
-     jackson-databind (com.fasterxml.jackson.core:jackson-databind - http://wiki.fasterxml.com/JacksonHome)
-     Commons Codec (commons-codec:commons-codec - http://commons.apache.org/codec/)
      Commons Collections (commons-collections:commons-collections - http://commons.apache.org/collections/)
      Apache Commons Configuration (commons-configuration:commons-configuration - http://commons.apache.org/configuration/)
-     Commons IO (commons-io:commons-io - http://commons.apache.org/io/)
      Commons Lang (commons-lang:commons-lang - http://commons.apache.org/lang/)
-     Commons Logging (commons-logging:commons-logging - http://commons.apache.org/logging)
-     Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
-     Apache Log4j (log4j:log4j - http://logging.apache.org/log4j/1.2/)
      Apache Commons Lang (org.apache.commons:commons-lang3 - http://commons.apache.org/proper/commons-lang/)
-     HttpClient (org.apache.httpcomponents:httpclient - http://hc.apache.org/httpcomponents-client)
-     HttpCore (org.apache.httpcomponents:httpcore - http://hc.apache.org/httpcomponents-core-ga)
-     Apache Ivy (org.apache.ivy:ivy - http://ant.apache.org/ivy/)
      Groovy (org.codehaus.groovy:groovy-all - http://groovy.codehaus.org/)
+     HPPC Collections (com.carrotsearch:hppc - http://labs.carrotsearch.com/hppc.html/hppc)
+     Apache Ivy (org.apache.ivy:ivy - http://ant.apache.org/ivy/)
+     Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations - http://wiki.fasterxml.com/JacksonHome)
+     Jackson-core (com.fasterxml.jackson.core:jackson-core - http://wiki.fasterxml.com/JacksonHome)
+     jackson-databind (com.fasterxml.jackson.core:jackson-databind - http://wiki.fasterxml.com/JacksonHome)
      javatuples (org.javatuples:javatuples - http://www.javatuples.org)
+     Apache Log4j (log4j:log4j - http://logging.apache.org/log4j/1.2/)
+     Metrics Core (com.codahale.metrics:metrics-core - http://metrics.codahale.com/metrics-core/)
+     Ganglia Integration for Metrics (com.codahale.metrics:metrics-ganglia - http://metrics.codahale.com/metrics-ganglia/)
+     Graphite Integration for Metrics (com.codahale.metrics:metrics-graphite - http://metrics.codahale.com/metrics-graphite/)
+     Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
      SnakeYAML (org.yaml:snakeyaml - http://www.snakeyaml.org)
 
 ========================================================================
@@ -237,12 +231,10 @@ BSD-style Licenses
 
 The Apache TinkerPop project bundles the following components under the BSD License:
 
-     Hamcrest All (org.hamcrest:hamcrest-all - https://github.com/hamcrest/JavaHamcrest/hamcrest-all)
-     Hamcrest Core (org.hamcrest:hamcrest-core - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
+     jBCrypt (org.mindrot:jbcrypt - https://github.com/jeremyh/jBCrypt)
      jcabi-log (com.jcabi:jcabi-log - http://www.jcabi.com/jcabi-log)
      jcabi-manifests (com.jcabi:jcabi-manifests - http://www.jcabi.com/jcabi-manifests)
      JLine (jline:jline - http://nexus.sonatype.org/oss-repository-hosting.html/jline)
-     jBCrypt (org.mindrot:jbcrypt - https://github.com/jeremyh/jBCrypt)
 
 All rights reserved.
 
@@ -277,11 +269,10 @@ MIT Licenses
 
 The Apache TinkerPop project bundles the following components under the MIT License:
 
-     Mockito (org.mockito:mockito-all - http://www.mockito.org)
+     gmetric4j (info.ganglia.gmetric4j:gmetric4j - http://github.com/ganglia/gmetric4j)
      JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j - http://www.slf4j.org)
      SLF4J API Module (org.slf4j:slf4j-api - http://www.slf4j.org)
      SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12 - http://www.slf4j.org)
-     gmetric4j (info.ganglia.gmetric4j:gmetric4j - http://github.com/ganglia/gmetric4j)
 
 All rights reserved.
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5a381391/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index cb533dd..4ad5e46 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -19,36 +19,6 @@ their respective licenses.
 ========================================================================
 
 ------------------------------------------------------------------------
-commons-beanutils
-------------------------------------------------------------------------
-Apache Commons BeanUtils
-Copyright 2000-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-------------------------------------------------------------------------
-commons-codec
-------------------------------------------------------------------------
-Apache Commons Codec
-Copyright 2002-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-
-------------------------------------------------------------------------
 Commons Collections
 ------------------------------------------------------------------------
 Apache Commons Collections
@@ -67,15 +37,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------
-Commons IO
-------------------------------------------------------------------------
-Apache Commons IO
-Copyright 2002-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-------------------------------------------------------------------------
 Commons Lang
 ------------------------------------------------------------------------
 Apache Commons Lang
@@ -97,27 +58,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------
-Http Components Client
-------------------------------------------------------------------------
-Apache HttpComponents Client
-Copyright 1999-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-------------------------------------------------------------------------
-Http Components Core
-------------------------------------------------------------------------
-Apache HttpComponents Core
-Copyright 2005-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-
-------------------------------------------------------------------------
 Groovy
 ------------------------------------------------------------------------
 Groovy Language
@@ -146,12 +86,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 ------------------------------------------------------------------------
-Hamcrest
-------------------------------------------------------------------------
-Copyright (c) 2000-2015 www.hamcrest.org
-All rights reserved.
-
-------------------------------------------------------------------------
 Log4j
 ------------------------------------------------------------------------
 This product includes software developed by
@@ -163,6 +97,25 @@ Programmer's Guide and Specification" and freely available
 to the public at http://java.sun.com/docs/books/jni.
 
 ------------------------------------------------------------------------
+Metrics
+------------------------------------------------------------------------
+Copyright 2010-2013 Coda Hale and Yammer, Inc., 2014-2015 Dropwizard Team
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
+
+------------------------------------------------------------------------
+jBCrypt
+------------------------------------------------------------------------
+Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
+
+------------------------------------------------------------------------
 jcabi-log
 ------------------------------------------------------------------------
 Copyright (c) 2012-2014, jcabi.com
@@ -181,11 +134,6 @@ Copyright (c) 2002-2012, the original author or authors.
 All rights reserved.
 
 ------------------------------------------------------------------------
-Mockito
-------------------------------------------------------------------------
-Copyright (c) 2007 Mockito contributors
-
-------------------------------------------------------------------------
 gmetric4j
 ------------------------------------------------------------------------
 Copyright (C) 2010-2015 Daniel Pocock <da...@pocock.com.au>