From 263784fc377deab38304cbfb1952fdd2a19b50e7 Mon Sep 17 00:00:00 2001
From: David Robinson <drobin1437@gmail.com>
Date: Fri, 5 Jun 2015 18:35:42 -0400
Subject: [PATCH 1/2] remove groovy-console from the project

---
 gremlin-driver/pom.xml | 14 +++++++++++++-
 gremlin-groovy/pom.xml | 25 +++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index e89e8cd3e77..aad4d0a2778 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -41,7 +41,19 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+            <classifier>indy</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
+            <version>${groovy.version}</version>
+            <classifier>indy</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-sql</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
         </dependency>
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 9f01527a04c..8641d604803 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -38,15 +38,28 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
             <version>${groovy.version}</version>
             <classifier>indy</classifier>
         </dependency>
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.11</version>
-        </dependency>
+       <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-groovysh</artifactId>
+            <version>${groovy.version}</version>
+            <classifier>indy</classifier>
+       </dependency>
+       <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
+            <version>${groovy.version}</version>
+            <classifier>indy</classifier>
+       </dependency>
+       <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+            <version>${groovy.version}</version>
+            <classifier>indy</classifier>
+       </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

From c67bb2c8b81b2c83da69ab988925964193529db1 Mon Sep 17 00:00:00 2001
From: David Robinson <drobin1437@gmail.com>
Date: Mon, 8 Jun 2015 10:45:54 -0400
Subject: [PATCH 2/2] remove jsr305 jar from hadoop assemblies

---
 hadoop-gremlin/src/assembly/hadoop-job.xml | 3 ++-
 hadoop-gremlin/src/assembly/standalone.xml | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hadoop-gremlin/src/assembly/hadoop-job.xml b/hadoop-gremlin/src/assembly/hadoop-job.xml
index 30930169cc1..d32534778ac 100644
--- a/hadoop-gremlin/src/assembly/hadoop-job.xml
+++ b/hadoop-gremlin/src/assembly/hadoop-job.xml
@@ -27,6 +27,7 @@ limitations under the License.
             <outputDirectory>lib</outputDirectory>
             <excludes>
                 <exclude>${groupId}:${artifactId}</exclude>
+                <exclude>com.google.code.findbugs:jsr305</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
@@ -36,4 +37,4 @@ limitations under the License.
             </includes>
         </dependencySet>
     </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/hadoop-gremlin/src/assembly/standalone.xml b/hadoop-gremlin/src/assembly/standalone.xml
index bad18a02785..7a2aae91b90 100644
--- a/hadoop-gremlin/src/assembly/standalone.xml
+++ b/hadoop-gremlin/src/assembly/standalone.xml
@@ -38,6 +38,9 @@ limitations under the License.
             <outputDirectory>/lib</outputDirectory>
             <unpack>false</unpack>
             <scope>compile</scope>
+            <excludes>
+               <exclude>com.google.code.findbugs:jsr305</exclude>
+            </excludes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/lib</outputDirectory>
@@ -45,4 +48,4 @@ limitations under the License.
             <scope>provided</scope>
         </dependencySet>
     </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>