Merge branch 'TINKERPOP-1004'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/77c0477f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/77c0477f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/77c0477f
Branch: refs/heads/TINKERPOP-1698
Commit: 77c0477f539c41cf48da2936fee85f7ab003b517
Parents: 685d1ed eb0eddc
Author: Stephen Mallette <[email protected]>
Authored: Mon Jun 26 10:15:57 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Jun 26 10:15:57 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 66 +++++++++++---------
.../gremlin/structure/Transaction.java | 9 ++-
.../structure/util/AbstractTransaction.java | 34 ++--------
.../structure/util/TransactionException.java | 42 +++++++++++++
.../gremlin/neo4j/structure/Neo4jGraph.java | 1 +
6 files changed, 93 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77c0477f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index f6fcfff,610cf7e..4e4844c
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Graphite and Ganglia are no longer packaged with the Gremlin Server
distribution.
+ * `TransactionException` is no longer a class of `AbstractTransaction` and it
extends `RuntimeException`.
* Renamed `RangeByIsCountStrategy` to `CountStrategy`.
* Added more specific typing to various `__` traversal steps. E.g.
`<A,Vertex>out()` is `<Vertex,Vertex>out()`.
* Updated Docker build scripts to include Python dependencies (NOTE: users
should remove any previously generated TinkerPop Docker images).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77c0477f/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 20a29de,ea8be1b..6fefe28
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -341,3 -294,41 +313,41 @@@ spark.serializer=org.apache.tinkerpop.g
```
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1389
+
+ Upgrading for Providers
+ ~~~~~~~~~~~~~~~~~~~~~~~
+
+ Graph Database Providers
+ ^^^^^^^^^^^^^^^^^^^^^^^^
+
+ Test Suite Removal
+ ++++++++++++++++++
+
+ A number of test suites that were previously deprecated have been removed
which should reduce the burden on graph
+ providers who are implementing TinkerPop. Test suites related to perfrmance
based on `junit-benchmarks` have been
+ removed as have the suites in `gremlin-groovy-test` (in fact, this entire
module has been removed). Specifically,
+ providers should be concerned with breaking changes related to the removal of:
+
+ * `StructurePerformanceSuite`
+ * `ProcessPerformanceSuite`
+ * `GroovyEnvironmentPerformanceSuite`
+ * `GroovyProcessStandardSuite`
+ * `GroovyProcessComputerSuite`
+ * `GroovyEnvironmentSuite`
+ * `GroovyEnvironmentIntegrateSuite`
+
+ Those graph providers who relied on these tests should simply remove them
from their respective test suites. Beware of
+ `OptOut` annotations that reference tests in these suites as test failure
will occur if those references are not
+ removed.
+
+ See:
link:https://issues.apache.org/jira/browse/TINKERPOP-1235[TINKERPOP-1235],
link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612]
+
+ TransactionException
+ ++++++++++++++++++++
+
+ The `AbstractTransaction.TransactionException` class is now just
`TransactionException` which extends `RuntimeExcetpion`
+ rather than `Exception`. Providers should consider using this exception to
wrap their own on calls to
+ `Transaction.commit()` or `Transaction.rollback()`. By throwing this
exception, the TinkerPop stack can better respond
+ to transaction problems and it allows for more common, generalized error
handling for users.
+
-See: link:https://issues.apache.org/jira/browse/TINKERPOP-1004[TINKERPOP-1004]
++See: link:https://issues.apache.org/jira/browse/TINKERPOP-1004[TINKERPOP-1004]
