Merge branch 'TINKERPOP-741-master'
Conflicts:
CHANGELOG.asciidoc
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/ec115934
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec115934
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec115934
Branch: refs/heads/TINKERPOP-1698
Commit: ec1159340d771cee9c72999fd506f377d50eb1c8
Parents: 0551620 21bc4d8
Author: Stephen Mallette <[email protected]>
Authored: Wed Jun 28 13:33:51 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Wed Jun 28 13:33:51 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 1 +
.../gremlin/structure/Transaction.java | 216 -----------------
.../structure/util/AbstractTransaction.java | 9 -
.../gremlin/structure/TransactionTest.java | 242 +------------------
5 files changed, 12 insertions(+), 457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 3aee122,ddf3a83..e158be1
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -35,13 -32,7 +35,14 @@@ TinkerPop 3.3.0 (Release Date: NOT OFFI
* Added "attachment requisite" `VertexProperty.element()` and
`Property.element()` data in GraphSON serialization.
* GraphSON 3.0 is now the default serialization format in TinkerGraph and
Gremlin Server.
* Established the GraphSON 3.0 format.
+* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
+* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)`
constructor.
+* Removed previously deprecated `TinkerIoRegistry`.
+* Removed previously deprecated `getInstance()` methods on all TinkerPop
classes.
+* Removed previously deprecated
`VertexPropertyFeatures.supportsAddProperty()`.
+* Removed previously deprecated TinkerGraph configuration member variables.
+* Changed `ServerGremlinExecutor` to not use generics since there really is
no flexibility in the kind of `ScheduledExecutorService` that will be used.
+ * Removed previously deprecated `Transaction.submit(Function)`.
* Removed previously deprecated `OpSelectorHandler.errorMeter` and
`AbstractEvalOpProcessor.errorMeter` fields.
* Removed previously deprecated `AbstractEvalOpProcessor.validBindingName`
field.
* Removed previously deprecated
`SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 6fefe28,9507603..0f71714
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -208,9 -196,7 +208,10 @@@ The following deprecated classes, metho
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_COMPUTER`
**
`org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT`
**
`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.Transaction.submit(Function)`
+* `gremlin-driver`
+**
`org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)`
* `gremlin-groovy`
** `org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider`
** `org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec115934/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
----------------------------------------------------------------------
