Merge branch 'TINKERPOP-1789' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1cd042b6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1cd042b6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1cd042b6 Branch: refs/heads/tp32 Commit: 1cd042b61d0dea08d003a7ff9e57f175343c039c Parents: eb2585b 20d22db Author: Marko A. Rodriguez <[email protected]> Authored: Thu Sep 28 14:06:01 2017 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Thu Sep 28 14:06:01 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.2.x-incubating.asciidoc | 12 ++++++++++++ .../structure/util/reference/ReferenceEdge.java | 7 ------- .../util/reference/ReferenceElement.java | 20 ++++++++++++++++---- .../util/reference/ReferenceVertexProperty.java | 9 +-------- .../ser/GryoLiteMessageSerializerV1d0Test.java | 8 ++++---- .../server/GremlinResultSetIntegrateTest.java | 2 +- .../util/reference/ReferenceEdgeTest.java | 6 +++++- .../reference/ReferenceVertexPropertyTest.java | 8 +++++++- .../util/reference/ReferenceVertexTest.java | 5 ++++- 10 files changed, 51 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1cd042b6/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 7ae7dfa,795a3b0..e48dfb5 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -21,8 -23,10 +21,9 @@@ limitations under the License image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185] [[release-3-2-7]] -TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +=== TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET) + * `ReferenceVertex` was missing its `label()` string. `ReferenceElement` now supports all label handling. * Added `GraphHelper.cloneElements(Graph original, Graph clone)` to the `gremlin-test` module to quickly clone a graph. * Bump to GMavenPlus 1.6. * Added better error message for illegal use of `repeat()`-step. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1cd042b6/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/upgrade/release-3.2.x-incubating.asciidoc index 681631c,f35e990..732e29e --- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc +++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc @@@ -102,11 -95,26 +102,12 @@@ In `gremlin-test` there is a new `Graph the first graph to the second - `GraphHelper.cloneElements(Graph original, Graph clone)`. This helper method is primarily intended for use in tests. -Upgrading for Providers -~~~~~~~~~~~~~~~~~~~~~~~ +== TinkerPop 3.2.6 -ReferenceVertex Label -^^^^^^^^^^^^^^^^^^^^^ - -`ReferenceVertex.label()` was hard coded to return `EMPTY_STRING`. At some point, `ReferenceElements` were suppose to -return labels and `ReferenceVertex` was never updated as such. Note that `ReferenceEdge` and `ReferenceVertexProperty` -work as expected. However, given a general change at `ReferenceElement`, the Gryo serialization of `ReferenceXXX` is -different. If the vertex does not have a label `Vertex.DEFAULT_LABEL` is assumed. - -See: https://issues.apache.org/jira/browse/TINKERPOP-1789[TINKERPOP-1789] - -TinkerPop 3.2.6 ---------------- + *Release Date: August 21, 2017* -Upgrading for Users -~~~~~~~~~~~~~~~~~~~ +=== Upgrading for Users Please see the link:https://github.com/apache/tinkerpop/blob/3.2.6/CHANGELOG.asciidoc#release-3-2-6[changelog] for a complete list of all the modifications that are part of this release. @@@ -126,7 -136,8 +127,18 @@@ authentication for both protocols in co See: link:https://issues.apache.org/jira/browse/TINKERPOP-915[TINKERPOP-915] -TinkerPop 3.2.5 ---------------- ++=== Upgrading for Providers ++ ++==== ReferenceVertex Label ++ ++`ReferenceVertex.label()` was hard coded to return `EMPTY_STRING`. At some point, `ReferenceElements` were suppose to ++return labels and `ReferenceVertex` was never updated as such. Note that `ReferenceEdge` and `ReferenceVertexProperty` ++work as expected. However, given a general change at `ReferenceElement`, the Gryo serialization of `ReferenceXXX` is ++different. If the vertex does not have a label `Vertex.DEFAULT_LABEL` is assumed. ++ ++See: https://issues.apache.org/jira/browse/TINKERPOP-1789[TINKERPOP-1789] ++ +== TinkerPop 3.2.5 *Release Date: June 12, 2017*
