Merge pull request #461 from gchq/gh-460-move-to-gaffer-tools

Gh 460 move to gaffer tools
gchq · Oct 13, 2016 · fece95b · fece95b
2 parents dc523b9 + 29c13ad
commit fece95b
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 4,211 deletions.
diff --git a/NOTICES b/NOTICES
@@ -16,9 +16,6 @@ Gaffer contains code which is a modified version of code from Apache Hadoop:
 (org.apache.hadoop.io.WritableUtils) which is licensed under the Apache 2 license, Copyright 2011-2015 The Apache
 Software Foundation.
 
-The Gaffer implementation of TinkerPop was originally based on several classes from TinkerGraph.
-These classes were copied and adjusted to integrate with Gaffer.
-
 Gaffer is built using maven. This process will automatically pull in dependencies. We list Gaffer2's dependencies,
  and their licenses, below. For information on the dependencies of these dependencies, see the websites of the
  projects below.
@@ -143,11 +140,6 @@ FindBugs Annotations (com.google.code.findbugs:annotations:3.0.1):
 - GNU Lesser Public License
 
 
-TinkerPop (org.apache.tinkerpop:gremlin-core,gremlin-groovy,gremlin-driver:3.2.0-incubating):
-
-- Apache License, Version 2.0
-
-
 ------------------------------------------------------------------------------------------------
 
 The Gaffer rest-api and ui modules contain the following javascript dependencies:

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,6 @@
         <module>gaffer-integration-tests</module>
         <module>example-rest</module>
         <module>ui</module>
-        <module>tinkerpop</module>
     </modules>
 
     <properties>

diff --git a/python-shell/README.md b/python-shell/README.md
diff --git a/python-shell/src/main/python/__init__.py b/python-shell/src/main/python/__init__.py
diff --git a/python-shell/src/main/python/example.py b/python-shell/src/main/python/example.py
diff --git a/python-shell/src/main/python/examplePki.py b/python-shell/src/main/python/examplePki.py