Merge branch 'tp34'
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 234e1b5..dee54d0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -534,6 +534,7 @@
* Bump to Tornado 5.x for gremlin-python.
* Deprecated `TraversalStrategies.applyStrategies()`.
+* Deprecated Jython support in `gremlin-python`.
* Reverted: Modified Java driver to use IP address rather than hostname to create connections.
[[release-3-3-9]]
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index f0627d4..5abe1cd 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -784,6 +784,9 @@
instance created, it will help to fully define the closure in the lambda expression - so rather than
`lambda: ("it.get().value("name')","gremlin-groovy")`, prefer `lambda: ("x -> x.get().value("name"),"gremlin-groovy")`.
+WARNING: Jython support has been deprecated as for 3.3.10 and will be removed in 3.5.0. Gremlin-Python will at that
+point default to Groovy for lambda processing and Python lambdas will not be supported.
+
Finally, Gremlin `Bytecode` that includes lambdas requires that the traversal be processed by the
`ScriptEngine`. To avoid continued recompilation costs, it supports the encoding of bindings, which allow a remote
engine to to cache traversals that will be reused over and over again save that some parameterization may change. Thus,
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 3b7ae90..466cdd9 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -21,6 +21,23 @@
*Gremlin Symphony #40 in G Minor*
+== TinkerPop 3.3.10
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.3.10/CHANGELOG.asciidoc#release-3-3-10[changelog] for a complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== Deprecated Jython Support
+
+Jython support in `gremlin-python` has been deprecated to focus on native Python 3.x support for 3.5.0 where Jython
+support will be wholly removed. This change does mean that TinkerPop will no longer support the ability to submit
+lambdas as native Python scripts. They will need to be submitted as Groovy and the library will be defaulted to do as
+such.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2322[TINKERPOP-2322]
+
== TinkerPop 3.3.9
*Release Date: October 14, 2019*
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
index faea0fa..1b95e7a 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
@@ -44,9 +44,12 @@
import java.util.stream.Collectors;
/**
+ * @deprecated As of release 3.3.10, not replaced - see TINKERPOP-2317
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@Deprecated
public class GremlinJythonScriptEngine implements GremlinScriptEngine {
private final PyScriptEngine pyScriptEngine;
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineFactory.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineFactory.java
index 34978a7..f3cafc1 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineFactory.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineFactory.java
@@ -34,8 +34,11 @@
import java.util.Set;
/**
+ * @deprecated As of release 3.3.10, not replaced - see TINKERPOP-2317
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@Deprecated
public class GremlinJythonScriptEngineFactory extends PyScriptEngineFactory implements GremlinScriptEngineFactory {
private static final String GREMLIN_JYTHON = "gremlin-jython";
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
index d5816af..03d3068 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
@@ -24,9 +24,12 @@
import org.apache.tinkerpop.gremlin.util.function.Lambda;
/**
+ * @deprecated As of release 3.3.10, not replaced - see TINKERPOP-2317
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@Deprecated
public final class JythonTranslator extends PythonTranslator {
private JythonTranslator(final String traversalSource, final boolean importStatics) {
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
index b6cc0fe..d307f88 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
@@ -57,9 +57,12 @@
import java.util.stream.Stream;
/**
+ * @deprecated As of release 3.3.10, not replaced - see TINKERPOP-2317
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@Deprecated
public class PythonTranslator implements Translator.ScriptTranslator {
private static final Set<String> STEP_NAMES = Stream.of(GraphTraversal.class.getMethods()).filter(method -> Traversal.class.isAssignableFrom(method.getReturnType())).map(Method::getName).collect(Collectors.toSet());
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/SymbolHelper.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/SymbolHelper.java
index 6a7564b..54cd5b3 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/SymbolHelper.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/SymbolHelper.java
@@ -23,8 +23,11 @@
import java.util.Map;
/**
+ * @deprecated As of release 3.3.10, not replaced - see TINKERPOP-2317
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@Deprecated
public final class SymbolHelper {
private final static Map<String, String> TO_PYTHON_MAP = new HashMap<>();
