You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/13 17:54:28 UTC
[4/4] tinkerpop git commit: Merge branch 'TINKERPOP-1706'
Merge branch 'TINKERPOP-1706'
Conflicts:
docs/src/upgrade/release-3.3.x.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/06b47b18
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/06b47b18
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/06b47b18
Branch: refs/heads/master
Commit: 06b47b182ed4c0212fa0bb6d80a4ca0b0e3a102f
Parents: 3ce8069 d173af8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jul 13 13:54:16 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jul 13 13:54:16 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +
docs/src/upgrade/release-3.3.x.asciidoc | 17 +-
.../gremlin/jsr223/CoreGremlinPlugin.java | 6 +-
.../tinkerpop/gremlin/util/CoreImports.java | 292 -------------------
.../gremlin/util/ScriptEngineCache.java | 59 ----
.../gremlin/util/ScriptEngineCacheTest.java | 46 ---
.../jsr223/GremlinJythonScriptEngine.java | 28 --
7 files changed, 17 insertions(+), 435 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/06b47b18/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/06b47b18/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index d1f43e9,1591139..7d54669
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -248,7 -220,9 +249,10 @@@ The following deprecated classes, metho
** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT_INTEGRATE`
** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)`
** `org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder#embedTypes(boolean)`
+ ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
+** `org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge(Object,String,Map,Pair,Pair)`
+ ** `org.apache.tinkerpop.gremlin.util.CoreImports`
+ ** `org.apache.tinkerpop.gremlin.util.ScriptEngineCache`
* `gremlin-driver`
** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)`
** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)`
@@@ -311,18 -287,18 +317,22 @@@
Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to
understand how to resolve this breaking change.
--See: link:https://issues.apache.org/jira/browse/TINKERPOP-833[TINKERPOP-833],
++See: link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832],
++link:https://issues.apache.org/jira/browse/TINKERPOP-833[TINKERPOP-833],
++link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834],
link:https://issues.apache.org/jira/browse/TINKERPOP-999[TINKERPOP-999],
link:https://issues.apache.org/jira/browse/TINKERPOP-1010[TINKERPOP-1010],
link:https://issues.apache.org/jira/browse/TINKERPOP-1028[TINKERPOP-1028],
link:https://issues.apache.org/jira/browse/TINKERPOP-1040[TINKERPOP-1040],
link:https://issues.apache.org/jira/browse/TINKERPOP-1046[TINKERPOP-1046],
link:https://issues.apache.org/jira/browse/TINKERPOP-1049[TINKERPOP-1049],
++link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142],
link:https://issues.apache.org/jira/browse/TINKERPOP-1169[TINKERPOP-1169],
link:https://issues.apache.org/jira/browse/TINKERPOP-1171[TINKERPOP-1171],
link:https://issues.apache.org/jira/browse/TINKERPOP-1275[TINKERPOP-1275],
link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283],
link:https://issues.apache.org/jira/browse/TINKERPOP-1289[TINKERPOP-1289],
++link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291],
link:https://issues.apache.org/jira/browse/TINKERPOP-1420[TINKERPOP-1420],
link:https://issues.apache.org/jira/browse/TINKERPOP-1421[TINKERPOP-1421],
link:https://issues.apache.org/jira/browse/TINKERPOP-1465[TINKERPOP-1465],
@@@ -334,12 -310,7 +344,9 @@@ link:https://issues.apache.org/jira/bro
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
- link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142],
- link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291],
- link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832],
+ link:https://issues.apache.org/jira/browse/TINKERPOP-1706[TINKERPOP-1706]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
- link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719]
Gremlin-server.sh and Init Scripts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^