This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-2182
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/TINKERPOP-2182 by this push:
     new c756b1d  TINKERPOP-2182 Removed gperfutils dependencies in Console
c756b1d is described below

commit c756b1d34c500cac879956033530b3382ffcb4fa
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Apr 2 18:49:39 2019 -0400

    TINKERPOP-2182 Removed gperfutils dependencies in Console
---
 CHANGELOG.asciidoc                                 |  2 +-
 docs/src/upgrade/release-3.3.x.asciidoc            | 33 ++++++++++++++++
 gremlin-console/pom.xml                            | 10 -----
 .../console/jsr223/UtilitiesGremlinPlugin.java     | 46 +---------------------
 4 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 88df8ad..8f17a02 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,9 +23,9 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-3-7]]
 === TinkerPop 3.3.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Removed `gperfutils` dependencies from Gremlin Console.
 * Ensure `gremlin.sh` works when directories contain spaces
 
-
 [[release-3-3-6]]
 === TinkerPop 3.3.6 (Release Date: March 18, 2019)
 
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index c1911d3..2b5db1a 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -27,6 +27,39 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 Please see the 
link:https://github.com/apache/tinkerpop/blob/3.3.7/CHANGELOG.asciidoc#release-3-3-7[changelog]
 for a complete list of all the modifications that are part of this release.
 
+=== Upgrading for Users
+
+==== Removed gperfutils Dependency
+
+Gremlin Console included references to:
+
+[source,xml]
+----
+<dependency>
+    <groupId>org.gperfutils</groupId>
+    <artifactId>gbench</artifactId>
+</dependency>
+<dependency>
+    <groupId>org.gperfutils</groupId>
+    <artifactId>gprof</artifactId>
+</dependency
+----
+
+to provide some benchmarking and profiling tools for the Utilities Plugin. 
Neither project is well maintained at this
+point and given that TinkerPop has moved past the versions of Groovy that are 
supported by these tools it doesn't
+make sense to retain the dependencies. Users who wish to continue to use these 
tools can obviously do so still by
+manually adding the dependencies to the Gremlin Console or with the following 
command:
+
+[source,text]
+----
+gremlin> :install org.gperfutils gbench <version>
+gremlin> :install org.gperfutils gprof <version>
+----
+
+and then import the appropriate classes and methods to use.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2182[TINKERPOP-2182]
+
 == TinkerPop 3.3.6
 
 *Release Date: March 18, 2019*
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 52d1346..a3376a0 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -56,16 +56,6 @@ limitations under the License.
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.gperfutils</groupId>
-            <artifactId>gbench</artifactId>
-            <version>0.4.3-groovy-2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.gperfutils</groupId>
-            <artifactId>gprof</artifactId>
-            <version>0.3.1-groovy-2.4</version>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <optional>true</optional>
diff --git 
a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPlugin.java
 
b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPlugin.java
index 6b8f9d3..faa6227 100644
--- 
a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPlugin.java
+++ 
b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPlugin.java
@@ -18,11 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.console.jsr223;
 
-import groovyx.gprof.ProfileStaticExtension;
 import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
-import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
 import org.apache.tinkerpop.gremlin.jsr223.DefaultScriptCustomizer;
-import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
 import org.apache.tinkerpop.gremlin.jsr223.ScriptCustomizer;
 
 import java.io.BufferedReader;
@@ -30,8 +27,6 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -40,49 +35,10 @@ public class UtilitiesGremlinPlugin extends 
AbstractGremlinPlugin {
 
     private static final String NAME = "tinkerpop.utilities";
 
-    private static final ImportCustomizer imports;
-
     private static final ScriptCustomizer scripts;
 
     static {
         try {
-            imports = DefaultImportCustomizer.build()
-                    .addClassImports(groovyx.gbench.Benchmark.class,
-                            groovyx.gbench.BenchmarkBuilder.class,
-                            groovyx.gbench.BenchmarkConstants.class,
-                            groovyx.gbench.BenchmarkContext.class,
-                            groovyx.gbench.Benchmarker.class,
-                            groovyx.gbench.BenchmarkList.class,
-                            groovyx.gbench.BenchmarkLogger.class,
-                            groovyx.gbench.BenchmarkMath.class,
-                            groovyx.gbench.BenchmarkMeasure.class,
-                            groovyx.gbench.BenchmarkStaticExtension.class,
-                            groovyx.gbench.BenchmarkSystem.class,
-                            groovyx.gbench.BenchmarkTime.class,
-                            groovyx.gbench.BenchmarkWarmUp.class,
-                            groovyx.gprof.Profiler.class,
-                            groovyx.gprof.ProfileStaticExtension.class,
-                            groovyx.gprof.CallFilter.class,
-                            groovyx.gprof.CallInfo.class,
-                            groovyx.gprof.CallInterceptor.class,
-                            groovyx.gprof.CallMatcher.class,
-                            groovyx.gprof.CallTree.class,
-                            groovyx.gprof.MethodCallFilter.class,
-                            groovyx.gprof.MethodCallInfo.class,
-                            groovyx.gprof.MethodInfo.class,
-                            groovyx.gprof.ProfileMetaClass.class,
-                            groovyx.gprof.ProxyReport.class,
-                            groovyx.gprof.Report.class,
-                            groovyx.gprof.ReportElement.class,
-                            groovyx.gprof.ReportNormalizer.class,
-                            groovyx.gprof.ReportPrinter.class,
-                            groovyx.gprof.ThreadInfo.class,
-                            groovyx.gprof.ThreadRunFilter.class,
-                            groovyx.gprof.Utils.class)
-                    .addMethodImports(
-                            ProfileStaticExtension.class.getMethod("profile", 
Object.class, Callable.class),
-                            ProfileStaticExtension.class.getMethod("profile", 
Object.class, Map.class, Callable.class)).create();
-
             final BufferedReader reader = new BufferedReader(new 
InputStreamReader(UtilitiesGremlinPlugin.class.getResourceAsStream("UtilitiesGremlinPluginScript.groovy")));
             final List<String> lines = new ArrayList<>();
             String line;
@@ -98,6 +54,6 @@ public class UtilitiesGremlinPlugin extends 
AbstractGremlinPlugin {
     }
 
     public UtilitiesGremlinPlugin() {
-        super(NAME, imports, scripts);
+        super(NAME, scripts);
     }
 }

Reply via email to