diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 74f6a59bb1e..91a40558f02 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -37,8 +37,7 @@ limitations under the License.
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.15</version>
-            <type>jar</type>
+            <version>${snakeyaml.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javatuples</groupId>
@@ -53,7 +52,7 @@ limitations under the License.
         <dependency>
             <groupId>com.jcabi</groupId>
             <artifactId>jcabi-manifests</artifactId>
-            <version>1.1</version>
+            <version>${jcabi.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CachedGremlinScriptEngineManager.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CachedGremlinScriptEngineManager.java
index 5798e1c8c96..8fb34cd4505 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CachedGremlinScriptEngineManager.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CachedGremlinScriptEngineManager.java
@@ -34,14 +34,14 @@ public class CachedGremlinScriptEngineManager extends DefaultGremlinScriptEngine
     private final ConcurrentHashMap<String,String> mimeToName = new ConcurrentHashMap<>();
 
     /**
-     * {@inheritDoc}
+     * @see DefaultGremlinScriptEngineManager#DefaultGremlinScriptEngineManager()
      */
     public CachedGremlinScriptEngineManager() {
         super();
     }
 
     /**
-     * {@inheritDoc}
+     * @see DefaultGremlinScriptEngineManager#DefaultGremlinScriptEngineManager(ClassLoader loader)
      */
     public CachedGremlinScriptEngineManager(final ClassLoader loader) {
         super(loader);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
index 8fd8c998d50..d20ce106626 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
@@ -63,7 +63,7 @@ public interface TraversalSource extends Cloneable, AutoCloseable {
     public TraversalStrategies getStrategies();
 
     /**
-     * Get the {@link Graph) associated with this traversal source.
+     * Get the {@link Graph} associated with this traversal source.
      *
      * @return the graph of the traversal source
      */
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index ac26a10ee21..feb4f96ccfa 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -25,9 +25,6 @@ limitations under the License.
     </parent>
     <artifactId>gremlin-driver</artifactId>
     <name>Apache TinkerPop :: Gremlin Driver</name>
-    <properties>
-        <netty.version>4.0.42.Final</netty.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 528f6b147df..3da86637714 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -738,7 +738,7 @@ public synchronized CompletableFuture<Void> closeAsync() {
     }
 
     /**
-     * Settings given to {@link Cluster#connect(Settings)} that configures how a {@link Client} will behave.
+     * Settings given to {@link Cluster#connect(Client.Settings)} that configures how a {@link Client} will behave.
      */
     public static class Settings {
         private final Optional<SessionSettings> session;
@@ -874,7 +874,7 @@ public Builder sessionId(final String sessionId) {
              * decided how to proceed with those orphaned transactions. Setting this to {@code true} tends to lead to
              * faster close operation which can be desirable if Gremlin Server has a long session timeout and a long
              * script evaluation timeout as attempts to close long run jobs can occur more rapidly. By default, this
-             * value is {@link false}.
+             * value is {@code false}.
              */
             public Builder forceClosed(final boolean forced) {
                 this.forceClosed = forced;
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index dfda50a2426..70fbe969bc2 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -68,7 +68,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.1</version>
+            <version>${commons.lang3.version}</version>
         </dependency>
         <!-- TEST -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 94787f20128..8f6c922c551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,15 +134,22 @@ limitations under the License.
     </scm>
     <properties>
         <commons.configuration.version>1.10</commons.configuration.version>
+        <commons.lang.version>2.6</commons.lang.version>
+        <commons.lang3.version>3.3.1</commons.lang3.version>
         <groovy.version>2.4.8</groovy.version>
+        <hadoop.version>2.7.2</hadoop.version>
+        <java.tuples.version>1.2</java.tuples.version>
+        <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
+        <jcabi.version>1.1</jcabi.version>
         <metrics.version>3.0.2</metrics.version>
+        <netty.version>4.0.42.Final</netty.version>
+        <slf4j.version>1.7.21</slf4j.version>
+        <snakeyaml.version>1.15</snakeyaml.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipIntegrationTests>true</skipIntegrationTests>
-        <slf4j.version>1.7.21</slf4j.version>
-        <hadoop.version>2.7.2</hadoop.version>
-        <java.tuples.version>1.2</java.tuples.version>
-        <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
+        <skipPerformanceTests>true</skipPerformanceTests>
 
         <!--
         This file will come from the root of each modules test/resources/ directories. log4j-silent.properties will
@@ -461,7 +468,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.3.1</version>
+                <version>${commons.lang3.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
@@ -1098,6 +1105,48 @@ limitations under the License.
                                             <artifactId>gremlin-shaded</artifactId>
                                             <version>${project.version}</version>
                                         </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>org.codehaus.groovy</groupId>
+                                            <artifactId>groovy-groovysh</artifactId>
+                                            <version>${groovy.version}</version>
+                                            <classifier>indy</classifier>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>org.codehaus.groovy</groupId>
+                                            <artifactId>groovy-json</artifactId>
+                                            <version>${groovy.version}</version>
+                                            <classifier>indy</classifier>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>org.apache.commons</groupId>
+                                            <artifactId>commons-lang3</artifactId>
+                                            <version>${commons.lang3.version}</version>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>commons-lang</groupId>
+                                            <artifactId>commons-lang</artifactId>
+                                            <version>${commons.lang.version}</version>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>org.slf4j</groupId>
+                                            <artifactId>slf4j-api</artifactId>
+                                            <version>${slf4j.version}</version>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>io.netty</groupId>
+                                            <artifactId>netty-all</artifactId>
+                                            <version>${netty.version}</version>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>org.yaml</groupId>
+                                            <artifactId>snakeyaml</artifactId>
+                                            <version>${snakeyaml.version}</version>
+                                        </additionalDependency>
+                                        <additionalDependency>
+                                            <groupId>com.jcabi</groupId>
+                                            <artifactId>jcabi-manifests</artifactId>
+                                            <version>${jcabi.version}</version>
+                                        </additionalDependency>
                                     </additionalDependencies>
                                 </configuration>
                             </execution>
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index a08fdfd0d4d..0782f385f1f 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -247,7 +247,7 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <version>${commons.lang.version}</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.paranamer</groupId>
@@ -426,4 +426,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>